D34249.id102661.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D34249.id102661.diff
View Options

	Index: Makefile.inc1
	===================================================================
	--- Makefile.inc1
	+++ Makefile.inc1
	@@ -521,7 +521,7 @@
	.endif

	# Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION.
	-.for _V in BRANCH REVISION
	+.for _V in BRANCH REVISION TYPE
	.if !defined(_${_V})
	_${_V}!= eval $$(awk '/^${_V}=/{print}' ${SRCTOP}/sys/conf/newvers.sh); echo $$${_V}
	.export _${_V}
	@@ -1879,12 +1879,10 @@
	.endif

	#
	-# Allow overriding PKG_ABI, this allow to create kernel packages without having
	-# to build world first.
	-# If it's not provided resolv it from the uname binary in the world stage.
	+# Determine PKG_ABI from newvers.sh if not already set.
	#
	.if !defined(PKG_ABI) && (make(create-world-packages-jobs) \|\| make(create-kernel-packages*) \|\| make(real-update-packages) \|\| make(sign-packages))
	-PKG_ABI!=${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI
	+PKG_ABI=${_TYPE}:${_REVISION:S/\..*$//}:${MACHINE_ARCH}
	.endif
	PKG_BIN_VERSION!=${PKG_CMD} --version </dev/null 2>/dev/null \|\
	awk -F. '/^[0-9.]+$$/ {print $$1 * 10000 + $$2 * 100 + $$3}'