D50954.id160749.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D50954.id160749.diff
View Options

	diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
	--- a/sys/conf/kern.post.mk
	+++ b/sys/conf/kern.post.mk
	@@ -467,7 +467,7 @@

	NEWVERS_ENV+= MAKE="${MAKE}"
	.if ${MK_REPRODUCIBLE_BUILD} != "no"
	-NEWVERS_ARGS+= -R
	+NEWVERS_ARGS+= -R -d ${PREFIX_OBJDIR}
	.endif
	vers.c: .NOMETA_CMP $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP:Nvers.*}
	${NEWVERS_ENV} sh $S/conf/newvers.sh ${NEWVERS_ARGS} ${KERN_IDENT}
	diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
	--- a/sys/conf/newvers.sh
	+++ b/sys/conf/newvers.sh
	@@ -110,14 +110,18 @@

	# We expand include_metadata later since we may set it to the
	# future value of modified.
	+builddir=$(pwd)
	include_metadata=yes
	modified=no
	-while getopts crRvV: opt; do
	+while getopts cd:rRvV: opt; do
	case "$opt" in
	c)
	echo "$COPYRIGHT"
	exit 0
	;;
	+ d)
	+ builddir=$OPTARG
	+ ;;
	r)
	include_metadata=no
	;;
	@@ -187,7 +191,7 @@
	touch version
	v=$(cat version)
	u=${USER:-root}
	-d=$(pwd)
	+d=$builddir
	h=${HOSTNAME:-$(hostname)}
	if [ -n "$SOURCE_DATE_EPOCH" ]; then
	if ! t=$(date -ur $SOURCE_DATE_EPOCH 2>/dev/null); then