d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add forward-compatibility glue with pkg-1.3:

Browse Source 
- 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
This commit is contained in:
gjb 2014-05-22 19:22:03 +00:00
parent 9578fc0e8e
commit 7d9c9ad8cf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
release/scripts/pkg-stage.sh
View File

@ -5,7 +5,7 @@
set -e set -e
export ASSUME_ALWAYS_YES=1 export ASSUME_ALWAYS_YES="YES"
export PKG_DBDIR="/tmp/pkg" export PKG_DBDIR="/tmp/pkg"
export PERMISSIVE="YES" export PERMISSIVE="YES"
export REPO_AUTOUPDATE="NO" 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 /usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
fi 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}" export PKG_CACHEDIR="dvd/packages/${PKG_ABI}"
/bin/mkdir -p ${PKG_CACHEDIR} /bin/mkdir -p ${PKG_CACHEDIR}