It would certainly make my life easier. But until such thing is done in pkg(7) code, I have to put things in a directory structure that pkg(7) can "just use" for on-disc packages.
Glen On Fri, May 23, 2014 at 08:19:34AM -0700, Nathan Whitehorn wrote: > 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} > >
pgpFPuEvrnbJv.pgp
Description: PGP signature
