Date: Tue, 9 Feb 2016 19:27:38 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r295447 - projects/release-pkg Message-ID: <201602091927.u19JRc7j033643@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue Feb 9 19:27:38 2016 New Revision: 295447 URL: https://svnweb.freebsd.org/changeset/base/295447 Log: Add logic to rotate the package repository, keyed on PKG_VERSION, and create a 'latest' symlink to the PKG_VERSION repository path. Suggested by: des Sponsored by: The FreeBSD Foundation Modified: projects/release-pkg/Makefile projects/release-pkg/Makefile.inc1 Modified: projects/release-pkg/Makefile ============================================================================== --- projects/release-pkg/Makefile Tue Feb 9 18:43:52 2016 (r295446) +++ projects/release-pkg/Makefile Tue Feb 9 19:27:38 2016 (r295447) @@ -128,7 +128,7 @@ TGTS= all all-man buildenv buildenvvars build32 builddtb distribute32 install32 xdev xdev-build xdev-install \ xdev-links native-xtools stageworld stagekernel stage-packages \ create-world-packages create-kernel-packages create-packages \ - packages installconfig sign-packages + packages installconfig real-packages sign-packages TGTS+= ${SUBDIR_TARGETS} Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Tue Feb 9 18:43:52 2016 (r295446) +++ projects/release-pkg/Makefile.inc1 Tue Feb 9 19:27:38 2016 (r295447) @@ -1374,7 +1374,10 @@ _pkgbootstrap: @env ASSUME_ALWAYS_YES=YES pkg bootstrap .endif -packages: stage-packages create-packages sign-packages +packages: + ${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} real-packages + +real-packages: stage-packages create-packages sign-packages stage-packages: @mkdir -p ${WSTAGEDIR} ${KSTAGEDIR} @@ -1413,7 +1416,7 @@ create-world-packages: _pkgbootstrap create -M ${DESTDIR}/$${pkgname}.ucl \ -p ${DESTDIR}/$${pkgname}.plist \ -r ${DESTDIR} \ - -o ${REPODIR}/$$(pkg -o ABI_FILE=${DESTDIR}/bin/sh config ABI)/latest ; \ + -o ${REPODIR}/$$(pkg -o ABI_FILE=${DESTDIR}/bin/sh config ABI)/${PKG_VERSION} ; \ done create-kernel-packages: _pkgbootstrap @@ -1441,7 +1444,7 @@ create-kernel-packages: _pkgbootstrap create -M ${DESTDIR}/${DISTDIR}/kernel-${flavor}.ucl \ -p ${DESTDIR}/${DISTDIR}/kernel-${flavor}.plist \ -r ${DESTDIR}/${DISTDIR} \ - -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest + -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} .endfor .endif .if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS) @@ -1470,14 +1473,22 @@ create-kernel-packages: _pkgbootstrap create -M ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.ucl \ -p ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.plist \ -r ${DESTDIR}/kernel.${_kernel} \ - -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest + -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} .endfor .endif .endfor .endif sign-packages: _pkgbootstrap - @pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh repo ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI) ${PKGSIGNKEY} + @[ -L "${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest" ] && \ + unlink ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest ; \ + env PKG_VERSION=${PKG_VERSION} pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh repo \ + -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \ + ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \ + ${PKGSIGNKEY} ; \ + env PKG_VERSION=${PKG_VERSION} \ + ln -s ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \ + ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest # #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602091927.u19JRc7j033643>