Date: Fri, 23 May 2014 08:19:34 -0700 From: Nathan Whitehorn <nwhitehorn@freebsd.org> To: Glen Barber <gjb@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r266553 - head/release/scripts Message-ID: <537F6706.6070509@freebsd.org> In-Reply-To: <201405221922.s4MJM4Y9025265@svn.freebsd.org> References: <201405221922.s4MJM4Y9025265@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Is there any chance of finally switching the pkg abi identifiers to just be uname -p? -Nathan On 05/22/14 12:22, Glen Barber wrote: > Author: gjb > Date: Thu May 22 19:22:03 2014 > New Revision: 266553 > URL: http://svnweb.freebsd.org/changeset/base/266553 > > Log: > 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 > > Modified: > head/release/scripts/pkg-stage.sh > > Modified: head/release/scripts/pkg-stage.sh > ============================================================================== > --- head/release/scripts/pkg-stage.sh Thu May 22 18:22:02 2014 (r266552) > +++ head/release/scripts/pkg-stage.sh Thu May 22 19:22:03 2014 (r266553) > @@ -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} >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?537F6706.6070509>