diff options
| author | gjb <gjb@FreeBSD.org> | 2014-05-22 19:22:03 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-05-22 19:22:03 +0000 |
| commit | 7d9c9ad8cf61f7f78845551c5f886e2b9cb146b3 (patch) | |
| tree | a956297ebd936fbcf9b89f602dc10184a2225307 /release | |
| parent | 9578fc0e8e21fa0d07afbd84a1b35571706248dc (diff) | |
| download | FreeBSD-src-7d9c9ad8cf61f7f78845551c5f886e2b9cb146b3.zip FreeBSD-src-7d9c9ad8cf61f7f78845551c5f886e2b9cb146b3.tar.gz | |
Add forward-compatibility glue with pkg-1.3:
- Use ASSUME_ALWAYS_YES=YES instead of ASSUME_ALWAYS_YES=1
since pkg-1.3 expects "yes" or "true" values.
- Before exporting PKG_ABI, strip extra characters from what
is parsed from 'pkg -vv'. This causes problems further down
when creating the packages directory for inclusion on the
dvd1.iso. Previously PKG_ABI would be 'freebsd:9:x86:64',
but now is '"freebsd:9:x86:64";' in pkg-1.3
Tested on: stable/9@r265858 with ports-mgmt/pkg-devel
MFC After: 3 days
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
| -rwxr-xr-x | release/scripts/pkg-stage.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 2281435..6d02ac6 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -5,7 +5,7 @@ set -e -export ASSUME_ALWAYS_YES=1 +export ASSUME_ALWAYS_YES="YES" export PKG_DBDIR="/tmp/pkg" export PERMISSIVE="YES" export REPO_AUTOUPDATE="NO" @@ -40,7 +40,10 @@ if [ ! -x /usr/local/sbin/pkg ]; then /usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean fi -export PKG_ABI=$(pkg -vv | grep ^ABI | awk '{print $3}') +PKG_ABI=$(pkg -vv | grep ^ABI | awk '{print $3}') +PKG_ABI="${PKG_ABI%\";}" +PKG_ABI="${PKG_ABI#\"}" +export PKG_ABI export PKG_CACHEDIR="dvd/packages/${PKG_ABI}" /bin/mkdir -p ${PKG_CACHEDIR} |
