diff options
| author | gjb <gjb@FreeBSD.org> | 2016-01-29 17:05:30 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-01-29 17:05:30 +0000 |
| commit | 7fd16a47bf32f40f1b3f67418d740b502415326f (patch) | |
| tree | 1bf92b0a1e1df1ecafbfa34ea21705bfec26e61a /Makefile.inc1 | |
| parent | f0d70cb3877d93986f60ec96c5b4ae87bfa7d297 (diff) | |
| download | FreeBSD-src-7fd16a47bf32f40f1b3f67418d740b502415326f.zip FreeBSD-src-7fd16a47bf32f40f1b3f67418d740b502415326f.tar.gz | |
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
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 3b13989..427e0c1 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 || : |
