diff options
| author | gjb <gjb@FreeBSD.org> | 2017-04-21 16:47:09 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2017-04-21 16:47:09 +0000 |
| commit | 2de135d4862b3e5632250957516b6f7e094ac206 (patch) | |
| tree | 9ca045d5b1648b17b5ee30b660d7d82e29d2702d /release/scripts/make-pkg-package.sh | |
| parent | c3efa5f3beb0b5104ea98efc99c3399fbe2e0067 (diff) | |
| download | FreeBSD-src-2de135d4862b3e5632250957516b6f7e094ac206.zip FreeBSD-src-2de135d4862b3e5632250957516b6f7e094ac206.tar.gz | |
MFC r310181 (matthew) (originally r309314):
Allow a user-overridable setting 'PKG_CMD' to control the command used
to create a repo during 'make packages'.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/scripts/make-pkg-package.sh')
| -rwxr-xr-x | release/scripts/make-pkg-package.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/release/scripts/make-pkg-package.sh b/release/scripts/make-pkg-package.sh index ab9418b..39814f1 100755 --- a/release/scripts/make-pkg-package.sh +++ b/release/scripts/make-pkg-package.sh @@ -8,6 +8,7 @@ eval $(make -C ${SRCDIR} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} buildenvvar export WRKDIRPREFIX=/tmp/ports.${TARGET} export WSTAGEDIR=${WSTAGEDIR} export REPODIR=${REPODIR} +export PKG_CMD=${PKG_CMD} export PKG_VERSION=${PKG_VERSION} export WRKDIR=$(make -C ${PORTSDIR}/ports-mgmt/pkg -V WRKDIR) @@ -15,11 +16,11 @@ make -C ${PORTSDIR}/ports-mgmt/pkg TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ CONFIGURE_ARGS="--host=$(uname -m)-portbld-freebsd${REVISION}" \ stage create-manifest -pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh \ +${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh \ create -v -m ${WRKDIR}/.metadir/ \ -r ${WRKDIR}/stage \ -p ${WRKDIR}/.PLIST.mktmp \ - -o ${REPODIR}/$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} -mkdir -p ${REPODIR}/$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}/Latest/ -cd ${REPODIR}/$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}/Latest/ && \ + -o ${REPODIR}/$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} +mkdir -p ${REPODIR}/$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}/Latest/ +cd ${REPODIR}/$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}/Latest/ && \ ln -s ../pkg-*.txz |
