Date: Fri, 29 Jan 2016 21:39:44 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r295053 - projects/release-pkg Message-ID: <201601292139.u0TLdiDJ052081@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri Jan 29 21:39:44 2016 New Revision: 295053 URL: https://svnweb.freebsd.org/changeset/base/295053 Log: Make sure 'pkg config ABI' uses ABI_FILE for the target. 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 21:35:24 2016 (r295052) +++ projects/release-pkg/Makefile.inc1 Fri Jan 29 21:39:44 2016 (r295053) @@ -1413,7 +1413,7 @@ create-world-packages: _pkgbootstrap pkg -o ABI_FILE=${DESTDIR}/bin/sh \ create -M ${DESTDIR}/$${pkgname}.ucl \ -p ${DESTDIR}/$${pkgname}.plist \ - -r ${DESTDIR} -o ${REPODIR}/$$(pkg config ABI)/latest ; \ + -r ${DESTDIR} -o ${REPODIR}/$$(pkg -o ABI_FILE=${DESTDIR}/bin/sh config ABI)/latest ; \ done create-kernel-packages: _pkgbootstrap @@ -1440,7 +1440,7 @@ create-kernel-packages: _pkgbootstrap pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh \ create -M ${DESTDIR}/${DISTDIR}/kernel-${flavor}.ucl \ -p ${DESTDIR}/${DISTDIR}/kernel-${flavor}.plist \ - -r ${DESTDIR}/${DISTDIR} -o ${REPODIR}/$$(pkg config ABI)/latest + -r ${DESTDIR}/${DISTDIR} -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest .endfor .endif .if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS) @@ -1468,14 +1468,14 @@ create-kernel-packages: _pkgbootstrap pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh \ create -M ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.ucl \ -p ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.plist \ - -r ${DESTDIR}/kernel.${_kernel} -o ${REPODIR}/$$(pkg config ABI)/latest + -r ${DESTDIR}/kernel.${_kernel} -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest .endfor .endif .endfor .endif signpackages: _pkgbootstrap - @pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh repo ${REPODIR}/$$(pkg config ABI) ${PKGSIGNKEY} + @pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh repo ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI) ${PKGSIGNKEY} # # doxygen
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601292139.u0TLdiDJ052081>