Author: emaste Date: Sat Jan 18 22:58:32 2020 New Revision: 356869 URL: https://svnweb.freebsd.org/changeset/base/356869
Log: pkgbase: cache pkg ABI for all world/kernel packages Rather than invoking `pkg config ABI` repeatedly. Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D23255 Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sat Jan 18 20:37:45 2020 (r356868) +++ head/Makefile.inc1 Sat Jan 18 22:58:32 2020 (r356869) @@ -1925,6 +1925,10 @@ create-world-packages: _pkgbootstrap .PHONY .include "${WSTAGEDIR}/packages.mk" .endif +.if make(create-world-packages-jobs) || make(create-kernel-packages*) +PKG_ABI!=${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI +.endif + create-world-packages-jobs: .PHONY .for pkgname in ${_PKGS} create-world-packages-jobs: create-world-package-${pkgname} @@ -1942,7 +1946,7 @@ create-world-package-${pkgname}: .PHONY create -M ${WSTAGEDIR}/${pkgname}.ucl \ -p ${WSTAGEDIR}/${pkgname}.plist \ -r ${WSTAGEDIR} \ - -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} + -o ${REPODIR}/${PKG_ABI}/${PKG_VERSION} .endfor _default_flavor= -default @@ -1974,7 +1978,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_defaul create -M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \ -p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \ -r ${KSTAGEDIR}/${DISTDIR} \ - -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} + -o ${REPODIR}/${PKG_ABI}/${PKG_VERSION} . endfor .endif .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" @@ -2006,7 +2010,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_ create -M ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \ -p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \ -r ${KSTAGEDIR}/kernel.${_kernel} \ - -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} + -o ${REPODIR}/${PKG_ABI}/${PKG_VERSION} . endfor . endif . endfor _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
