Date: Fri, 29 Jan 2016 17:05:30 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r295044 - projects/release-pkg Message-ID: <201601291705.u0TH5URH072289@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri Jan 29 17:05:30 2016 New Revision: 295044 URL: https://svnweb.freebsd.org/changeset/base/295044 Log: Reorder execution in the 'packages' target so both userland and kernel are staged before invoking the 'create-<foo>-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 Modified: projects/release-pkg/Makefile.inc1 Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Fri Jan 29 16:42:03 2016 (r295043) +++ projects/release-pkg/Makefile.inc1 Fri Jan 29 17:05:30 2016 (r295044) @@ -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 || :
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601291705.u0TH5URH072289>