From owner-svn-src-all@FreeBSD.ORG Fri Sep 12 21:21:37 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D64661BE for ; Fri, 12 Sep 2014 21:21:37 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B7B44B75 for ; Fri, 12 Sep 2014 21:21:37 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id s8CLLb9k054717 for ; Fri, 12 Sep 2014 21:21:37 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.9/8.14.9/Submit) id s8CLLbbp054712 for svn-src-all@freebsd.org; Fri, 12 Sep 2014 21:21:37 GMT (envelope-from bdrewery) Received: (qmail 49414 invoked from network); 12 Sep 2014 16:21:35 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 12 Sep 2014 16:21:35 -0500 Message-ID: <541363D6.3080502@FreeBSD.org> Date: Fri, 12 Sep 2014 16:21:26 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.1.1 MIME-Version: 1.0 To: Glen Barber , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r271480 - head/release/scripts References: <201409121852.s8CIq1Eg099609@svn.freebsd.org> In-Reply-To: <201409121852.s8CIq1Eg099609@svn.freebsd.org> OpenPGP: id=6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="sJ2BLcToTG3CffBvFjhWeev1RoQeMkg2v" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2014 21:21:38 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --sJ2BLcToTG3CffBvFjhWeev1RoQeMkg2v Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 9/12/2014 1:52 PM, Glen Barber wrote: > Author: gjb > Date: Fri Sep 12 18:52:01 2014 > New Revision: 271480 > URL: http://svnweb.freebsd.org/changeset/base/271480 >=20 > Log: > Set PKG_CACHEDIR to an 'All/' directory one level lower > to fix 'pkg repo' generating repository metadata for the > on-disc packages. > =20 > MFC after: 3 days > X-MFC-to-10.1: yes > Sponsored by: The FreeBSD Foundation >=20 > Modified: > head/release/scripts/pkg-stage.sh >=20 > 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 Fri Sep 12 18:31:44 2014 (r271479= ) > +++ head/release/scripts/pkg-stage.sh Fri Sep 12 18:52:01 2014 (r271480= ) > @@ -44,7 +44,8 @@ PKG_ABI=3D$(pkg -vv | grep ^ABI | awk '{pr > PKG_ABI=3D"${PKG_ABI%\";}" > PKG_ABI=3D"${PKG_ABI#\"}" > export PKG_ABI > -export PKG_CACHEDIR=3D"dvd/packages/${PKG_ABI}" > +export PKG_REPODIR=3D"dvd/packages/${PKG_ABI}" > +export PKG_CACHEDIR=3D"${PKG_REPODIR}/${PKG_ABI}/All" > =20 > /bin/mkdir -p ${PKG_CACHEDIR} > =20 > @@ -53,7 +54,7 @@ ${PKGCMD} -vv > ${PKGCMD} update -f > ${PKGCMD} fetch -d ${DVD_PACKAGES} > =20 > -${PKGCMD} repo ${PKG_CACHEDIR} > +${PKGCMD} repo ${PKG_REPODIR} > =20 > # Always exit '0', even if pkg(8) complains about conflicts. > exit 0 >=20 There's still an issue with 1.3 here. pkg-fetch now uses mangled package names in its cache dir, and does not use the All/ subdir anymore as you've found. # ls /var/cache/pkg/psutils-1.17_4* /var/cache/pkg/psutils-1.17_4-fe318c25d7.txz /var/cache/pkg/psutils-1.17_4.txz@ Rather the polluting the DVD with these hashed filenames you can just not set PKG_CACHEDIR and use pkg fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGE= S}. You can also now simplify the PKG_ABI lookup 4 lines to just: export PKG_ABI=3D$(pkg config ABI). pkg fetch -o was added to 1.3 specifically for cases such as creating DVD= s. It will then store the files in dvd/packages/${PKG_ABI}/All. See https://people.freebsd.org/~bdrewery/patches/pkg-stage-1.3.diff --=20 Regards, Bryan Drewery --sJ2BLcToTG3CffBvFjhWeev1RoQeMkg2v Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) iQEcBAEBAgAGBQJUE2PWAAoJEDXXcbtuRpfPi/kIAJzYawO0BrfXRYlNBBeTFNxw m+unX1OwFiZYR/P1cp66TfiLjDfY4aXjsWiHPzoSlwyrg67W8jIPvaCOLZH28F/8 popFl0u+6eMRQQz1nXqWsveNePGwhewEI4yGAWWWfv1V/jqfeEdi62WNvq2jS9pj GWRONNKKZ1BpEyE8aBMlO00aDChuS8rC4vf10LnS2yN1yD0Ccgms7KfK4hw7+/0N mz+Kx50oVlgHWRfPCuhKIkAzEUj32uiK4mUt4lylTuJ4SQd4CwlvPCIeaHl6PTEN c6nqyHNLYsXCAlCLTp/FR2Fd57RUEAWPsrKHNBRqzkqa8IiTUypie+9qwRCt4sQ= =Zlfo -----END PGP SIGNATURE----- --sJ2BLcToTG3CffBvFjhWeev1RoQeMkg2v--