Page MenuHomeFreeBSD
Files F112056741

D26617.diff
No OneTemporary
Actions

D26617.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -477,7 +477,7 @@
.endif
LOCAL_TOOL_DIRS?=
-PACKAGEDIR?= ${DESTDIR}/${DISTDIR}
+PACKAGEDIR?= ${DESTDIR}/${RELDISTDIR}
.if empty(SHELL:M*csh*)
BUILDENV_SHELL?=${SHELL}
@@ -919,10 +919,10 @@
INSTALLFLAGS+= -N ${.CURDIR}/etc
MTREEFLAGS+= -N ${.CURDIR}/etc
.endif
-_INSTALL_DDIR= ${DESTDIR}/${DISTDIR}
+_INSTALL_DDIR= ${DESTDIR}/${RELDISTDIR}
INSTALL_DDIR= ${_INSTALL_DDIR:S://:/:g:C:/$::}
.if defined(NO_ROOT)
-METALOG?= ${DESTDIR}/${DISTDIR}/METALOG
+METALOG?= ${DESTDIR}/${RELDISTDIR}/METALOG
METALOG:= ${METALOG:C,//+,/,g}
IMAKE+= -DNO_ROOT METALOG=${METALOG}
METALOG_INSTALLFLAGS= -U -M ${METALOG} -D ${INSTALL_DDIR}
@@ -938,7 +938,7 @@
IMAKE_MTREE= MTREE_CMD="${MTREE_CMD} ${MTREEFLAGS}"
.endif
.if make(distributeworld)
-CERTCTLDESTDIR= ${DESTDIR}/${DISTDIR}/base
+CERTCTLDESTDIR= ${DESTDIR}/${RELDISTDIR}/base
.else
CERTCTLDESTDIR= ${DESTDIR}
.endif
@@ -1373,32 +1373,32 @@
.endif
.if make(distributeworld)
.for dist in ${EXTRA_DISTRIBUTIONS}
- -mkdir ${DESTDIR}/${DISTDIR}/${dist}
+ -mkdir ${DESTDIR}/${RELDISTDIR}/${dist}
${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.root.dist \
- -p ${DESTDIR}/${DISTDIR}/${dist} >/dev/null
+ -p ${DESTDIR}/${RELDISTDIR}/${dist} >/dev/null
${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
- -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
+ -p ${DESTDIR}/${RELDISTDIR}/${dist}/usr >/dev/null
${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \
- -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null
+ -p ${DESTDIR}/${RELDISTDIR}/${dist}/usr/include >/dev/null
.if ${MK_DEBUG_FILES} != "no"
${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
- -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null
+ -p ${DESTDIR}/${RELDISTDIR}/${dist}/usr/lib >/dev/null
.endif
.if defined(_LIBCOMPAT)
${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
- -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
+ -p ${DESTDIR}/${RELDISTDIR}/${dist}/usr >/dev/null
.if ${MK_DEBUG_FILES} != "no"
${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
- -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/usr >/dev/null
+ -p ${DESTDIR}/${RELDISTDIR}/${dist}/usr/lib/debug/usr >/dev/null
.endif
.endif
.if ${MK_TESTS} != "no" && ${dist} == "tests"
- -mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE}
+ -mkdir -p ${DESTDIR}/${RELDISTDIR}/${dist}${TESTSBASE}
${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
- -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} >/dev/null
+ -p ${DESTDIR}/${RELDISTDIR}/${dist}${TESTSBASE} >/dev/null
.if ${MK_DEBUG_FILES} != "no"
${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
- -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/${TESTSBASE} >/dev/null
+ -p ${DESTDIR}/${RELDISTDIR}/${dist}/usr/lib/debug/${TESTSBASE} >/dev/null
.endif
.endif
.if defined(NO_ROOT)
@@ -1414,10 +1414,10 @@
.endif
.endif
.endfor
- -mkdir ${DESTDIR}/${DISTDIR}/base
+ -mkdir ${DESTDIR}/${RELDISTDIR}/base
${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \
- DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \
+ DISTBASE=/base DESTDIR=${DESTDIR}/${RELDISTDIR}/base \
LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs
${INSTALL_SYMLINK} ${INSTALLFLAGS} usr/src/sys ${INSTALL_DDIR}/base/sys
.endif # make(distributeworld)
@@ -1425,7 +1425,7 @@
${IMAKEENV} rm -rf ${INSTALLTMP}
.if make(distributeworld)
.for dist in ${EXTRA_DISTRIBUTIONS}
- find ${DESTDIR}/${DISTDIR}/${dist} -mindepth 1 -type d -empty -delete
+ find ${DESTDIR}/${RELDISTDIR}/${dist} -mindepth 1 -type d -empty -delete
.endfor
.if defined(NO_ROOT)
.for dist in base ${EXTRA_DISTRIBUTIONS}
@@ -1433,20 +1433,20 @@
@# line from the METALOG. This relies on the fact that
@# a line containing only the filename will sort immediately before
@# the relevant mtree line.
- cd ${DESTDIR}/${DISTDIR}; \
+ cd ${DESTDIR}/${RELDISTDIR}; \
find ./${dist} | sort -u ${METALOG} - | \
awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \
- ${DESTDIR}/${DISTDIR}/${dist}.meta
+ ${DESTDIR}/${RELDISTDIR}/${dist}.meta
.endfor
.for dist in ${DEBUG_DISTRIBUTIONS}
@# For each file that exists in this dist, print the corresponding
@# line from the METALOG. This relies on the fact that
@# a line containing only the filename will sort immediately before
@# the relevant mtree line.
- cd ${DESTDIR}/${DISTDIR}; \
+ cd ${DESTDIR}/${RELDISTDIR}; \
find ./${dist}/usr/lib/debug | sort -u ${METALOG} - | \
awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \
- ${DESTDIR}/${DISTDIR}/${dist}.debug.meta
+ ${DESTDIR}/${RELDISTDIR}/${dist}.debug.meta
.endfor
.endif
.endif # make(distributeworld)
@@ -1462,12 +1462,12 @@
packageworld: .PHONY
.for dist in base ${EXTRA_DISTRIBUTIONS}
.if defined(NO_ROOT)
- ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
+ ${_+_}cd ${DESTDIR}/${RELDISTDIR}/${dist}; \
tar cvf - --exclude usr/lib/debug \
- @${DESTDIR}/${DISTDIR}/${dist}.meta | \
+ @${DESTDIR}/${RELDISTDIR}/${dist}.meta | \
${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz
.else
- ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
+ ${_+_}cd ${DESTDIR}/${RELDISTDIR}/${dist}; \
tar cvf - --exclude usr/lib/debug . | \
${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz
.endif
@@ -1475,11 +1475,11 @@
.for dist in ${DEBUG_DISTRIBUTIONS}
. if defined(NO_ROOT)
- ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
- tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \
+ ${_+_}cd ${DESTDIR}/${RELDISTDIR}/${dist}; \
+ tar cvf - @${DESTDIR}/${RELDISTDIR}/${dist}.debug.meta | \
${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz
. else
- ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
+ ${_+_}cd ${DESTDIR}/${RELDISTDIR}/${dist}; \
tar cvLf - usr/lib/debug | \
${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz
. endif
@@ -1748,9 +1748,9 @@
@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
false
.endif
- mkdir -p ${DESTDIR}/${DISTDIR}
+ mkdir -p ${DESTDIR}/${RELDISTDIR}
.if defined(NO_ROOT)
- @echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.premeta
+ @echo "#${MTREE_MAGIC}" > ${DESTDIR}/${RELDISTDIR}/kernel.premeta
.endif
${_+_}cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.premeta/} \
@@ -1758,14 +1758,14 @@
DESTDIR=${INSTALL_DDIR}/kernel \
${.TARGET:S/distributekernel/install/}
.if defined(NO_ROOT)
- @sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
- ${DESTDIR}/${DISTDIR}/kernel.meta
+ @sed -e 's|^./kernel|.|' ${DESTDIR}/${RELDISTDIR}/kernel.premeta > \
+ ${DESTDIR}/${RELDISTDIR}/kernel.meta
.endif
.endif
.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
.for _kernel in ${BUILDKERNELS:[2..-1]}
.if defined(NO_ROOT)
- @echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
+ @echo "#${MTREE_MAGIC}" > ${DESTDIR}/${RELDISTDIR}/kernel.${_kernel}.premeta
.endif
${_+_}cd ${KRNLOBJDIR}/${_kernel}; \
${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \
@@ -1775,8 +1775,8 @@
${.TARGET:S/distributekernel/install/}
.if defined(NO_ROOT)
@sed -e "s|^./kernel.${_kernel}|.|" \
- ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \
- ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
+ ${DESTDIR}/${RELDISTDIR}/kernel.${_kernel}.premeta > \
+ ${DESTDIR}/${RELDISTDIR}/kernel.${_kernel}.meta
.endif
.endfor
.endif
@@ -1784,51 +1784,51 @@
packagekernel: .PHONY
.if defined(NO_ROOT)
.if !defined(NO_INSTALLKERNEL)
- cd ${DESTDIR}/${DISTDIR}/kernel; \
+ cd ${DESTDIR}/${RELDISTDIR}/kernel; \
tar cvf - --exclude '*.debug' \
- @${DESTDIR}/${DISTDIR}/kernel.meta | \
+ @${DESTDIR}/${RELDISTDIR}/kernel.meta | \
${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
.endif
.if ${MK_DEBUG_FILES} != "no"
- cd ${DESTDIR}/${DISTDIR}/kernel; \
+ cd ${DESTDIR}/${RELDISTDIR}/kernel; \
tar cvf - --include '*/*/*.debug' \
- @${DESTDIR}/${DISTDIR}/kernel.meta | \
- ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz
+ @${DESTDIR}/${RELDISTDIR}/kernel.meta | \
+ ${XZ_CMD} > ${DESTDIR}/${RELDISTDIR}/kernel-dbg.txz
.endif
.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
.for _kernel in ${BUILDKERNELS:[2..-1]}
- cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
+ cd ${DESTDIR}/${RELDISTDIR}/kernel.${_kernel}; \
tar cvf - --exclude '*.debug' \
- @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
+ @${DESTDIR}/${RELDISTDIR}/kernel.${_kernel}.meta | \
${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz
.if ${MK_DEBUG_FILES} != "no"
- cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
+ cd ${DESTDIR}/${RELDISTDIR}/kernel.${_kernel}; \
tar cvf - --include '*/*/*.debug' \
- @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
- ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz
+ @${DESTDIR}/${RELDISTDIR}/kernel.${_kernel}.meta | \
+ ${XZ_CMD} > ${DESTDIR}/${RELDISTDIR}/kernel.${_kernel}-dbg.txz
.endif
.endfor
.endif
.else
.if !defined(NO_INSTALLKERNEL)
- cd ${DESTDIR}/${DISTDIR}/kernel; \
+ cd ${DESTDIR}/${RELDISTDIR}/kernel; \
tar cvf - --exclude '*.debug' . | \
${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
.endif
.if ${MK_DEBUG_FILES} != "no"
- cd ${DESTDIR}/${DISTDIR}/kernel; \
+ cd ${DESTDIR}/${RELDISTDIR}/kernel; \
tar cvf - --include '*/*/*.debug' $$(eval find .) | \
- ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz
+ ${XZ_CMD} > ${DESTDIR}/${RELDISTDIR}/kernel-dbg.txz
.endif
.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
.for _kernel in ${BUILDKERNELS:[2..-1]}
- cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
+ cd ${DESTDIR}/${RELDISTDIR}/kernel.${_kernel}; \
tar cvf - --exclude '*.debug' . | \
${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz
.if ${MK_DEBUG_FILES} != "no"
- cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
+ cd ${DESTDIR}/${RELDISTDIR}/kernel.${_kernel}; \
tar cvf - --include '*/*/*.debug' $$(eval find .) | \
- ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz
+ ${XZ_CMD} > ${DESTDIR}/${RELDISTDIR}/kernel.${_kernel}-dbg.txz
.endif
.endfor
.endif
@@ -1892,7 +1892,7 @@
${_+_}@cd ${.CURDIR}; \
${MAKE} -f Makefile.inc1 \
DESTDIR=${KSTAGEDIR} \
- PKG_VERSION=${PKG_VERSION} DISTDIR=kernel \
+ PKG_VERSION=${PKG_VERSION} RELDISTDIR=kernel \
SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \
create-kernel-packages
@@ -1901,7 +1901,7 @@
create-world-packages: _pkgbootstrap .PHONY
@rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || :
@cd ${WSTAGEDIR} ; \
- env -i LC_COLLATE=C sort ${WSTAGEDIR}/${DISTDIR}/METALOG | \
+ env -i LC_COLLATE=C sort ${WSTAGEDIR}/${RELDISTDIR}/METALOG | \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk
@for plist in ${WSTAGEDIR}/*.plist; do \
plist=$${plist##*/} ; \
@@ -1950,7 +1950,7 @@
. for flavor in "" ${_debug}
create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}
create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap .PHONY
- @cd ${KSTAGEDIR}/${DISTDIR} ; \
+ @cd ${KSTAGEDIR}/${RELDISTDIR} ; \
env -i LC_COLLATE=C sort ${KSTAGEDIR}/kernel.meta | \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
-v kernel=yes -v _kernconf=${INSTALLKERNEL} ; \
@@ -1964,16 +1964,16 @@
-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
-e "s|%PKG_WWW%|${PKG_WWW}|" \
${SRCDIR}/release/packages/kernel.ucl \
- > ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
+ > ${KSTAGEDIR}/${RELDISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
awk -F\" ' \
/name/ { printf("===> Creating %s-", $$2); next } \
/version/ {print $$2; next } ' \
- ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
+ ${KSTAGEDIR}/${RELDISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \
create -f ${PKG_FORMAT} \
- -M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \
- -p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \
- -r ${KSTAGEDIR}/${DISTDIR} \
+ -M ${KSTAGEDIR}/${RELDISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \
+ -p ${KSTAGEDIR}/${RELDISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \
+ -r ${KSTAGEDIR}/${RELDISTDIR} \
-o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR}
. endfor
.endif
Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -26,6 +26,12 @@
world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20201001:
+ Users who build their own release should now use RELDISTDIR make
+ variable in place of DISTDIR (if used). This change aims for avoiding
+ conflict between DISTDIR variable that is used in ports(7) and DISTDIR
+ used by build(7).
+
20200824:
OpenZFS support has been integrated. Do not upgrade root pools until
the loader is updated to support zstd. Furthermore, we caution against
Index: release/Makefile
===================================================================
--- release/Makefile
+++ release/Makefile
@@ -52,7 +52,7 @@
.endif
.endif
IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
-DISTDIR= dist
+RELDISTDIR= dist
# Define OSRELEASE by using newvers.sh
.if !defined(OSRELEASE) || empty(OSRELEASE)
@@ -128,34 +128,34 @@
clean: beforeclean
base.txz:
- mkdir -p ${DISTDIR}
- cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${.OBJDIR}/${DISTDIR}
+ mkdir -p ${RELDISTDIR}
+ cd ${WORLDDIR} && ${IMAKE} distributeworld RELDISTDIR=${.OBJDIR}/${RELDISTDIR}
# Set up mergemaster root database
sh ${.CURDIR}/scripts/mm-mtree.sh -m ${WORLDDIR} -F \
"TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} ${.MAKE.JOBS:D-j${.MAKE.JOBS}}" \
- -D "${.OBJDIR}/${DISTDIR}/base"
+ -D "${.OBJDIR}/${RELDISTDIR}/base"
etcupdate extract -B -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \
- -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate"
+ -s ${WORLDDIR} -d "${.OBJDIR}/${RELDISTDIR}/base/var/db/etcupdate"
# Package all components
- cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${.OBJDIR}/${DISTDIR}
- mv ${DISTDIR}/*.txz .
+ cd ${WORLDDIR} && ${IMAKE} packageworld RELDISTDIR=${.OBJDIR}/${RELDISTDIR}
+ mv ${RELDISTDIR}/*.txz .
kernel.txz:
- mkdir -p ${DISTDIR}
- cd ${WORLDDIR} && ${IMAKE} distributekernel packagekernel DISTDIR=${.OBJDIR}/${DISTDIR}
- mv ${DISTDIR}/kernel*.txz .
+ mkdir -p ${RELDISTDIR}
+ cd ${WORLDDIR} && ${IMAKE} distributekernel packagekernel RELDISTDIR=${.OBJDIR}/${RELDISTDIR}
+ mv ${RELDISTDIR}/kernel*.txz .
src.txz:
- mkdir -p ${DISTDIR}/usr
- ln -fs ${WORLDDIR} ${DISTDIR}/usr/src
- cd ${DISTDIR} && tar cLvf - --exclude .svn --exclude .zfs \
+ mkdir -p ${RELDISTDIR}/usr
+ ln -fs ${WORLDDIR} ${RELDISTDIR}/usr/src
+ cd ${RELDISTDIR} && tar cLvf - --exclude .svn --exclude .zfs \
--exclude .git --exclude @ --exclude usr/src/release/dist usr/src | \
${XZ_CMD} > ${.OBJDIR}/src.txz
ports.txz:
- mkdir -p ${DISTDIR}/usr
- ln -fs ${PORTSDIR} ${DISTDIR}/usr/ports
- cd ${DISTDIR} && tar cLvf - \
+ mkdir -p ${RELDISTDIR}/usr
+ ln -fs ${PORTSDIR} ${RELDISTDIR}/usr/ports
+ cd ${RELDISTDIR} && tar cLvf - \
--exclude .git --exclude .svn \
--exclude usr/ports/distfiles --exclude usr/ports/packages \
--exclude 'usr/ports/INDEX*' --exclude work usr/ports | \
Index: share/man/man7/build.7
===================================================================
--- share/man/man7/build.7
+++ share/man/man7/build.7
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 11, 2020
+.Dd October 1, 2020
.Dt BUILD 7
.Os
.Sh NAME
@@ -232,7 +232,7 @@
Files are placed in the directory hierarchy specified by
.Xr make 1
variable
-.Va DISTDIR .
+.Va RELDISTDIR .
This target is used while building a release; see
.Xr release 7 .
.It Cm native-xtools
@@ -262,7 +262,7 @@
Archive the results of
.Cm distributeworld ,
placing the results in
-.Va DISTDIR .
+.Va RELDISTDIR .
This target is used while building a release; see
.Xr release 7 .
.It Cm installworld
@@ -391,14 +391,14 @@
variables.
.It Cm distributekernel
Install the kernel to the directory
-.Pa ${DISTDIR}/kernel/boot/kernel .
+.Pa ${RELDISTDIR}/kernel/boot/kernel .
This target is used while building a release; see
.Xr release 7 .
.It Cm packagekernel
Archive the results of
.Cm distributekernel ,
placing the results in
-.Va DISTDIR .
+.Va RELDISTDIR .
This target is used while building a release; see
.Xr release 7 .
.It Cm kernel
Index: share/mk/bsd.own.mk
===================================================================
--- share/mk/bsd.own.mk
+++ share/mk/bsd.own.mk
@@ -8,7 +8,7 @@
#
# DESTDIR Change the tree where the file gets installed. [not set]
#
-# DISTDIR Change the tree where the file for a distribution
+# RELDISTDIR Change the tree where the file for a distribution
# gets installed (see /usr/src/release/Makefile). [not set]
#
# COMPRESS_CMD Program to compress documents.
Index: share/mk/bsd.subdir.mk
===================================================================
--- share/mk/bsd.subdir.mk
+++ share/mk/bsd.subdir.mk
@@ -94,7 +94,7 @@
distribute: .MAKE
.for dist in ${DISTRIBUTION}
${_+_}cd ${.CURDIR}; \
- ${MAKE} install installconfig -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies
+ ${MAKE} install installconfig -DNO_SUBDIR DESTDIR=${RELDISTDIR}/${dist} SHARED=copies
.endfor
.endif
# Convenience targets to run 'build${target}' and 'install${target}' when

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 13, 5:11 AM (16 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17130314
Default Alt Text
D26617.diff (17 KB)

Event Timeline