git: b4435119eca4 - stable/14 - release: distributekernel before packagekernel
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 17 Apr 2024 05:43:52 UTC
The branch stable/14 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=b4435119eca4e8e5f3d6e3114d62b3469cc544e7
commit b4435119eca4e8e5f3d6e3114d62b3469cc544e7
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-04-10 03:26:51 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
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: