D33323.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D33323.diff
View Options

	diff --git a/Makefile.inc1 b/Makefile.inc1
	--- a/Makefile.inc1
	+++ b/Makefile.inc1
	@@ -1896,7 +1896,12 @@
	@env ASSUME_ALWAYS_YES=YES pkg bootstrap
	.endif

	-.if make(create-world-packages-jobs) \|\| make(create-kernel-packages*) \|\| make(real-update-packages) \|\| make(sign-packages)
	+#
	+# 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.
	+#
	+.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
	.endif
	PKG_BIN_VERSION!=${PKG_CMD} --version </dev/null 2>/dev/null \|\
	@@ -2061,7 +2066,7 @@
	/name/ { printf("===> Creating %s-", $$2); next } \
	/version/ {print $$2; next } ' \
	${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
	- ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \
	+ ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \
	create -f ${PKG_FORMAT} \
	-M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \
	-p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \