aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Pau Monné <royger@FreeBSD.org>2018-08-17 07:27:15 +0000
committerRoger Pau Monné <royger@FreeBSD.org>2018-08-17 07:27:15 +0000
commit2502c66bbdaefbe6299ad7288a6a3150546123aa (patch)
tree00aeea9321d3bacd7325e6138cfc4f206a936b64
parent9ebbebe4f763addd4e6269a2b4b76688f5f2fb04 (diff)
downloadsrc-2502c66bbdaefbe6299ad7288a6a3150546123aa.tar.gz
src-2502c66bbdaefbe6299ad7288a6a3150546123aa.zip
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
Notes
Notes: svn path=/head/; revision=337960
-rw-r--r--Makefile.inc12
-rw-r--r--release/Makefile9
-rwxr-xr-xrelease/scripts/mm-mtree.sh2
3 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 50774edeafef..621f1bfc5eac 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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
diff --git a/release/Makefile b/release/Makefile
index 385bba52eb99..79d53b4cbb61 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -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'); \
diff --git a/release/scripts/mm-mtree.sh b/release/scripts/mm-mtree.sh
index 45c47be4f16e..790154595798 100755
--- a/release/scripts/mm-mtree.sh
+++ b/release/scripts/mm-mtree.sh
@@ -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