Date: Fri, 23 May 2014 11:25:51 -0400 From: Glen Barber <gjb@FreeBSD.org> To: Nathan Whitehorn <nwhitehorn@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r266553 - head/release/scripts Message-ID: <20140523152551.GI68335@hub.FreeBSD.org> In-Reply-To: <537F6706.6070509@freebsd.org> References: <201405221922.s4MJM4Y9025265@svn.freebsd.org> <537F6706.6070509@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--pe+tqlI1iYzVj1X/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 >=20 > 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=3DYES instead of ASSUME_ALWAYS_YES=3D1 > > 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 > >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > >--- 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=3D1 > >+export ASSUME_ALWAYS_YES=3D"YES" > > export PKG_DBDIR=3D"/tmp/pkg" > > export PERMISSIVE=3D"YES" > > export REPO_AUTOUPDATE=3D"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=3D$(pkg -vv | grep ^ABI | awk '{print $3}') > >+PKG_ABI=3D$(pkg -vv | grep ^ABI | awk '{print $3}') > >+PKG_ABI=3D"${PKG_ABI%\";}" > >+PKG_ABI=3D"${PKG_ABI#\"}" > >+export PKG_ABI > > export PKG_CACHEDIR=3D"dvd/packages/${PKG_ABI}" > > /bin/mkdir -p ${PKG_CACHEDIR} > > --pe+tqlI1iYzVj1X/ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBCAAGBQJTf2h/AAoJELls3eqvi17Q0MoQAIdQmJ2Pnk+Zvh1YVcWbLaax te4f6k0dK+zsOFmdh/fwVHpmBmu7Xxskdhr3fXy+eQ+vEg8Ba/FSYHIidZNF9BEX XIV475QJtO0pA5NosDK9Imj46Z6NKtc7l0mAXpbG85hfWU1+WDuv/j8WjWS13QhC LxIB8D/jAlguzUrn6+H+NwaxiE0nVlhYVTSij/lPmr6+WkAZMgb5WltShy1Hpe9a RHa+GdAvUtuPDLbLwnx+mh06Zcv7nd4CT+RYF6ZFJj619Jd8h9OetrXxApxhB06s V9ix+Z50xSWSxmpKTJoK5awPPDCe6ou7QksKwWaFuQ/Af9Cvz1y3yGbWKyaYaxx1 DbmBCk8kexJG5IVmNVJ9Gux13whaz9V+BN/fCyBrFFjwwqyZcAFXlcC5pnmUP69F WlZKmoQ1foI7aR7d5GIItakouEtbdwIE5wK2uiRkb1ms6+McW71ODWNtR3uxe7Rr DJc48gBu0mKDKXa4cqigfpwwIL1PjEE3kaurcAyTx0YlpP03K+spzq0yaoS21ake n7Pwt5WRabL4wDGVb5JF+fEpL9Oh4rPL3IJSi2+7D5n5KgTSwqyQkiVD926VzTjM Tr7B1TRWKyPxdfZI3TW8qgvj4aPFmxYI4+csD5bCaeQI+ktPHNiC3G/lWMJ+xKY+ SiKEWXAZCXPol5xmU+mx =Mpxa -----END PGP SIGNATURE----- --pe+tqlI1iYzVj1X/--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140523152551.GI68335>