From d9b0aafdb642f52827cc76ac8057f1e162439542 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Fri, 29 Jan 2016 17:05:30 +0000 Subject: [PATCH] Reorder execution in the 'packages' target so both userland and kernel are staged before invoking the 'create--packages' targets. Include PKG_VERSION value in the 'create-{world,kernel}-packages' targets so the value is not redefined when packaging the kernel, which otherwise results in inconsistent and confusing package version results. Sponsored by: The FreeBSD Foundation --- Makefile.inc1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 3b13989477f3..427e0c126dc6 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1379,9 +1379,9 @@ packages: _pkgbootstrap @mkdir -p ${WSTAGEDIR} ${KSTAGEDIR} ${REPODIR} ${_+_}@cd ${.CURDIR}; \ ${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} -DNO_ROOT -B stageworld ; \ - ${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} create-world-packages ; \ ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} -DNO_ROOT -B stagekernel ; \ - ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} DISTDIR=kernel create-kernel-packages + ${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} PKG_VERSION=${PKG_VERSION} create-world-packages ; \ + ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} PKG_VERSION=${PKG_VERSION} DISTDIR=kernel create-kernel-packages create-world-packages: _pkgbootstrap @rm -f ${DESTDIR}/*.plist 2>/dev/null || :