The branch main has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=a49621c1d02509fe9121b76e76656cd3a349f0b9
commit a49621c1d02509fe9121b76e76656cd3a349f0b9
Author: Ed Maste <ema...@freebsd.org>
AuthorDate: 2025-05-14 19:39:53 +0000
Commit: Ed Maste <ema...@freebsd.org>
CommitDate: 2025-05-27 19:54:07 +0000
release: Move -DNO_ROOT and -DDB_FROM_SRC into ${IMAKE}
All invocations specified -DNO_ROOT, so simplify by moving -DNO_ROOT
directly into ${IMAKE}.
Do the same for -DDB_FROM_SRC. Although it was not previously passed
for all targets it is appropriate for all release artifact builds.
Reviewed by: brooks
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D50356
---
release/Makefile | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/release/Makefile b/release/Makefile
index a9a8d0f04605..a7549284ac35 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -53,7 +53,8 @@ TARGET_ARCH= ${MACHINE_ARCH}
TARGET_ARCH= ${TARGET}
.endif
.endif
-IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
+IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} \
+ -DNO_ROOT -DDB_FROM_SRC
DISTDIR= dist
# Define OSRELEASE by using newvers.sh
@@ -137,7 +138,7 @@ clean: beforeclean
#
base.txz: # Also (if enabled) tests, compat libs, and -dbg variants for all.
mkdir -p ${DISTDIR}
- ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT distributeworld
DISTDIR=${.OBJDIR}/${DISTDIR} )
+ ( cd ${WORLDDIR} && ${IMAKE} distributeworld
DISTDIR=${.OBJDIR}/${DISTDIR} )
# Bootstrap etcupdate(8) database.
sh ${WORLDDIR}/usr.sbin/etcupdate/etcupdate.sh extract -B \
-m "${MAKE}" -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \
@@ -149,13 +150,13 @@ base.txz: # Also (if enabled) tests, compat libs, and
-dbg variants for all.
env -i LC_COLLATE=C sort >> ${.OBJDIR}/${DISTDIR}/base.meta
rm ${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate/current/METALOG
# Package all components
- ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT packageworld
DISTDIR=${.OBJDIR}/${DISTDIR} )
+ ( cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${.OBJDIR}/${DISTDIR}
)
mv ${DISTDIR}/*.txz .
kernel.txz: # Also (if enabled) kernel-dbg.txz.
mkdir -p ${DISTDIR}
- ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT distributekernel
DISTDIR=${.OBJDIR}/${DISTDIR} )
- ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT packagekernel
DISTDIR=${.OBJDIR}/${DISTDIR} )
+ ( cd ${WORLDDIR} && ${IMAKE} distributekernel
DISTDIR=${.OBJDIR}/${DISTDIR} )
+ ( cd ${WORLDDIR} && ${IMAKE} packagekernel
DISTDIR=${.OBJDIR}/${DISTDIR} )
mv ${DISTDIR}/kernel*.txz .
src.txz:
@@ -196,8 +197,7 @@ disc1: packagesystem ${PKGBASE_REPO}
${_ALL_LIBCOMPATS:@v@MK_LIB$v=no@} \
MK_TOOLCHAIN=no \
MK_RESCUE=no MK_DICT=no \
- MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \
- -DDB_FROM_SRC -DNO_ROOT)
+ MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no)
.if defined(PKGBASE)
# Create offline pkgbase repo on release media
mkdir -p ${.TARGET}/usr/freebsd-packages/repos/
@@ -258,8 +258,7 @@ bootonly: packagesystem
${_ALL_LIBCOMPATS:@v@MK_LIB$v=no@} \
MK_TOOLCHAIN=no \
MK_RESCUE=no MK_DICT=no \
- MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \
- -DDB_FROM_SRC -DNO_ROOT)
+ MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no)
# Copy manifest only (no distfiles) to get checksums
mkdir -p ${.TARGET}/usr/freebsd-dist
cp MANIFEST ${.TARGET}/usr/freebsd-dist
@@ -290,8 +289,7 @@ dvd: packagesystem ${PKGBASE_REPO}
mkdir -p ${.TARGET}
( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \
DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no
\
- MK_TESTS=no MK_DEBUG_FILES=no \
- -DDB_FROM_SRC -DNO_ROOT)
+ MK_TESTS=no MK_DEBUG_FILES=no)
.if defined(PKGBASE)
# Create offline pkgbase repo on release media
mkdir -p ${.TARGET}/usr/freebsd-packages/repos/
