Page MenuHomeFreeBSD
Files F135174251

D16638.id46446.diff
No OneTemporary
Actions

D16638.id46446.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -833,7 +833,7 @@
# 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
Index: release/Makefile
===================================================================
--- release/Makefile
+++ release/Makefile
@@ -185,7 +185,8 @@
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 @@
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 @@
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'); \
Index: release/scripts/mm-mtree.sh
===================================================================
--- release/scripts/mm-mtree.sh
+++ release/scripts/mm-mtree.sh
@@ -81,7 +81,7 @@
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

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 8, 4:09 AM (1 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25025933
Default Alt Text
D16638.id46446.diff (2 KB)

Event Timeline