build: skip the database check when generating install media
There are several scripts and targets solely used to generate install media, make sure DB_FROM_SRC is used in that case in order to prevent checking the host database, which is irrelevant when generating install binaries. Sponsored by: Citrix Systems R&D PR: 230459 Reviewed by: gjb Differential revision: https://reviews.freebsd.org/D16638
This commit is contained in:
parent
9ebbebe4f7
commit
2502c66bbd
@ -833,7 +833,7 @@ IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP}
|
||||
|
||||
# When generating install media, do not allow user and group information from
|
||||
# the build host to affect the contents of the distribution.
|
||||
.if make(distributeworld)
|
||||
.if make(distributeworld) || make(distrib-dirs) || make(distribution)
|
||||
DB_FROM_SRC= yes
|
||||
.endif
|
||||
|
||||
|
@ -185,7 +185,8 @@ disc1: packagesystem
|
||||
MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \
|
||||
MK_NCP=no MK_TOOLCHAIN=no MK_PROFILE=no \
|
||||
MK_RESCUE=no MK_DICT=no \
|
||||
MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no
|
||||
MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \
|
||||
-DDB_FROM_SRC
|
||||
# Copy distfiles
|
||||
mkdir -p ${.TARGET}/usr/freebsd-dist
|
||||
for dist in MANIFEST $$(ls *.txz | grep -vE -- '(base|lib32)-dbg'); \
|
||||
@ -213,7 +214,8 @@ bootonly: packagesystem
|
||||
MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \
|
||||
MK_NCP=no MK_TOOLCHAIN=no MK_PROFILE=no \
|
||||
MK_RESCUE=no MK_DICT=no \
|
||||
MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no
|
||||
MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \
|
||||
-DDB_FROM_SRC
|
||||
# Copy manifest only (no distfiles) to get checksums
|
||||
mkdir -p ${.TARGET}/usr/freebsd-dist
|
||||
cp MANIFEST ${.TARGET}/usr/freebsd-dist
|
||||
@ -234,7 +236,8 @@ dvd: packagesystem
|
||||
mkdir -p ${.TARGET}
|
||||
cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
|
||||
DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no \
|
||||
MK_TESTS=no MK_DEBUG_FILES=no
|
||||
MK_TESTS=no MK_DEBUG_FILES=no \
|
||||
-DDB_FROM_SRC
|
||||
# Copy distfiles
|
||||
mkdir -p ${.TARGET}/usr/freebsd-dist
|
||||
for dist in MANIFEST $$(ls *.txz | grep -v -- '(base|lib32)-dbg'); \
|
||||
|
@ -81,7 +81,7 @@ if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a \
|
||||
fi
|
||||
|
||||
# Setup make to use system files from SOURCEDIR
|
||||
MM_MAKE="make ${ARCHSTRING} ${MM_MAKE_ARGS} -m ${SOURCEDIR}/share/mk"
|
||||
MM_MAKE="make ${ARCHSTRING} ${MM_MAKE_ARGS} -m ${SOURCEDIR}/share/mk -DDB_FROM_SRC"
|
||||
|
||||
delete_temproot () {
|
||||
rm -rf "${TEMPROOT}" 2>/dev/null
|
||||
|
Loading…
Reference in New Issue
Block a user