From nobody Wed Apr 17 05:43:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK8wT029Wz5HvJ1; Wed, 17 Apr 2024 05:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VK8wS5L00z4lR2; Wed, 17 Apr 2024 05:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713332632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n+XYhSo5Rid3GsXdTTnlt54nT5e+5bwnrR0hs8XAWHE=; b=yNElMWRf0RLhMH7RJ2d4Wl0Qsv6IjXgDXht/sjwcwzHnN5ARoYTCIiDI+4Jn+897F997km Fl9BBcEbWM3PpAZTQyGJWjjTJm8ioBBrEOMI42HAQ94/HjHbbM0xlqXuFjF++y4rv21+du M4N80hz0UGcCrSBHwtJk21gx1oJD1dET0ueLxGe9+UkeMwWtJc1ezvuy0LimSuLZifott4 q/C35rmNWs7HKorsLKj/0xmdmDsda9iKk4OloSIsA3Qc3vePRnWELSX3GBOubgQqhgtfTl lZWTH3xf4Ngm8Q6h0T/EBOjFJBP6yJcfC4UT7ae65LrkVHAe2wsgMccA2Cy5jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713332632; a=rsa-sha256; cv=none; b=mMUbQahrnvObS3t2kmLMQsr1xjfZAHd+EcjpbkQ6Wus3idQQ/SGPKlgROCyVLIrv2s9QT+ Scq7irxORtVENv6TI7+eZpHt6G1HsbDBnKcWIR0ZAg5HE+VzsrjVAeRz17Pi3zu/QHSjkO 8lZUZIPyFKpZoPVC6xiUaDGgPmUV2YD6JeJKLnN0buQgsIkUdr/dDCkNHiyJqJqyUw6bdt 63cVS/Xk2nLrxd4RMv80bNfpUhyROZLXJ9bxmFQZfCWFDSz6JJetbdz/lLfvAhEig/NpYA Y4SOc+E9jQm15aUdZTTk18Dsm+S7qzOIcHMgH14RJyz7wemn+uOM34cYNxExFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713332632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n+XYhSo5Rid3GsXdTTnlt54nT5e+5bwnrR0hs8XAWHE=; b=K2axu8FHlVImbgPiV13Wlucv6Iw4QH4jzf0IE8ZzWiSOsqcy1Q2Fl0e/RX5IwKDlmzQlAX ALJt9+WWFRgQZcele1TY9G2xhuFXp/GRZKQYkYXWp+r6KL9aCc33ff/UlcCM1mQUG1L0Ov 0Yr3Jki9wx9TJxP7tczi4ISs9Rsb1qh4QIcxYm6oMtVvl10Uynwe8iKuKr9+XHeVIu25mM 9NVNlCTHjUZmn2/0zMSyrwjVvx947opPC2/JkrgbbInD0Ww/D5uSXBruk3QlzdaGSzgKXb OmJRyGbDY4na3MMtpwdgZ5d12zDeVbRCYFELdw9B+pvJmHy8h/waNdBHEe3ThQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK8wS4ykgzDx0; Wed, 17 Apr 2024 05:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43H5hqOi006623; Wed, 17 Apr 2024 05:43:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H5hqvF006620; Wed, 17 Apr 2024 05:43:52 GMT (envelope-from git) Date: Wed, 17 Apr 2024 05:43:52 GMT Message-Id: <202404170543.43H5hqvF006620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b4435119eca4 - stable/14 - release: distributekernel before packagekernel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b4435119eca4e8e5f3d6e3114d62b3469cc544e7 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b4435119eca4e8e5f3d6e3114d62b3469cc544e7 commit b4435119eca4e8e5f3d6e3114d62b3469cc544e7 Author: Colin Percival AuthorDate: 2024-04-10 03:26:51 +0000 Commit: Colin Percival CommitDate: 2024-04-17 05:43:26 +0000 release: distributekernel before packagekernel With these as a single make command, `make -j` breaks when it tries to package up a kernel which hasn't been distributed yet. MFC after: 1 week (cherry picked from commit 65c603ed65c700d6eacdf9e1e94dc42fd70fb0b7) --- release/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 90937c53cabf..6c391c9c661d 100644 --- a/release/Makefile +++ b/release/Makefile @@ -141,7 +141,8 @@ base.txz: kernel.txz: mkdir -p ${DISTDIR} - ( cd ${WORLDDIR} && ${IMAKE} distributekernel packagekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} distributekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} packagekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) mv ${DISTDIR}/kernel*.txz . src.txz: