From owner-freebsd-ports@FreeBSD.ORG Thu Aug 14 19:42:17 2014 Return-Path: Delivered-To: freebsd-ports@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 917DE1E3 for ; Thu, 14 Aug 2014 19:42:17 +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 70D2E26A6 for ; Thu, 14 Aug 2014 19:42:17 +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 s7EJgHeU032063 for ; Thu, 14 Aug 2014 19:42:17 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.9/8.14.9/Submit) id s7EJgHfe032058 for freebsd-ports@FreeBSD.org; Thu, 14 Aug 2014 19:42:17 GMT (envelope-from bdrewery) Received: (qmail 16965 invoked from network); 14 Aug 2014 14:42:13 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 14 Aug 2014 14:42:13 -0500 Message-ID: <53ED110C.1040500@FreeBSD.org> Date: Thu, 14 Aug 2014 14:42:04 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: ports@freebsd.org, Nathan Whitehorn Subject: Re: [Patch] Using MACHINE_ARCH identifiers in pkg References: <5383EEB6.6010703@freebsd.org> <538614AB.4070803@freebsd.org> <53ECCF7F.3040107@FreeBSD.org> <53ECD741.5090703@freebsd.org> <53ED1044.80302@gmx.de> In-Reply-To: <53ED1044.80302@gmx.de> OpenPGP: id=6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Pc9GwGPkGV59A0ToUTiWeRhKu3wfRQlXp" Cc: Baptiste Daroussin , Warner Losh , FreeBSD Mailing List X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2014 19:42:17 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Pc9GwGPkGV59A0ToUTiWeRhKu3wfRQlXp Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 8/14/2014 2:38 PM, olli hauer wrote: > On 2014-08-14 17:35, Nathan Whitehorn wrote: >> >> On 08/14/14 08:02, Bryan Drewery wrote: >>> On 5/28/2014 11:54 AM, Nathan Whitehorn wrote: >>>> The current/previous values are also kept so >>>> that the patched pkg can install a package marked either with an x86= :64 >>>> or amd64-type architecture ID (symlinks will be needed for a little = bit >>>> on the package server to allow both clients to work). Limited testin= g >>>> suggests it works well -- I can fetch and install packages fine. Mor= e >>>> testing would be great. >>> Symlinks are now setup to make testing of this easier. >>> >>> I'll let Bapt signoff on this patch officially and its timeframe. It >>> seems reasonable to me. The use of 'x86' almost caused a regression >>> recently due to its ambiguity. >>> >>> Cheers, >>> Bryan >>> >> >> Thanks Bryan! If anyone is interested in testing the adapted pkg, ther= e is a patch that can be applied to ports at http://people.freebsd.org/~n= whitehorn/pkg-new-abi.diff. It tries to make this transition as painless = as possible by doing the following things: >> 1. Have pkg use e.g. FreeBSD:11:amd64 instead of freebsd:11:x86:64 as = an ABI string. >> 2. Maintain the freebsd:11:x86:64-type strings as the "altabi" config = variable. >> 3. pkg will install packages where the architecture ID matches either = the ABI or ALTABI value, which means that new pkg can install packages ma= de with the older version. >> 4. Patches the ports-mgmt/pkg Makefile so that the package for pkg its= elf is given a freebsd:11:x86:64-type architecture. This prevents pkg fro= m choking on an update to itself and should, with the symlinks discussed = above, make the transition painless and transparent. >> >> Especially point (4) I'd appreciate testing on if anyone is generating= private package repositories. >> -Nathan >=20 > Hi Nathan, >=20 > Thanks for the patch, but there is a possible chicken <-> egg issue. >=20 > I removed old pkg packages from the last build and running a new build = so pkg was build with the patch. > The first client complains about wrong architecture and there was no wa= y to reinstall pkg (even not with force) > Quick solution was to distribute pkg-static to the client and reinstall= pkg with the new pkg-static. > After the upgrade everything is running as usual ;) >=20 > Are there better upgrade paths then my quick workaround ? >=20 > Output after pd build was finished on the first client. >=20 > # pkg update -f > Updating repository catalogue > Fetching meta.txz: 100% of 584 B > Fetching digests.txz: 100% of 43 kB > Fetching packagesite.txz: 100% of 138 kB >=20 > Adding new entries: 34% > pkg: wrong architecture: FreeBSD:8:amd64 instead of freebsd:8:x86:64 >=20 > pkg: repository str contains packages with wrong ABI: FreeBSD:8:amd64 > Adding new entries: 100% > pkg: Unable to update repository str >=20 >=20 > Update with help of the patched pkg >=20 > # ~/pkg-static update -f > Updating repository catalogue > pkg-static: Repository str has a wrong packagesite, need to re-create d= atabase > Fetching meta.txz: 100% of 584 B > Fetching digests.txz: 100% of 43 kB > Fetching packagesite.txz: 100% of 138 kB >=20 > Adding new entries: 100% > Incremental update completed, 500 packages processed: > 0 packages updated, 0 removed and 500 added. >=20 > -- > olli >=20 Something I've mentioned to Bapt a few times is that pkg needs a way to have a list of accepted ABI strings. Then we could add both the old and the new style as accepted (internally) so that old and new repositories will continue to work. --=20 Regards, Bryan Drewery --Pc9GwGPkGV59A0ToUTiWeRhKu3wfRQlXp 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) iQEcBAEBAgAGBQJT7REMAAoJEDXXcbtuRpfPMPoIALKD0cvuF5smJl7Z6HeliKIy cc1wAjc4n51zstIjwPSkcSeqI+plQ7LlZbFTRnkjbHC3bVLGPt6OCv2+1QSklnKj FCr7Qxelgg9Usg4b36M+tu7Nv8KCkvsa0Yiz7Dks+z9nckzEftpPg+l1l+wfRn/M aqbiScLcyuazwuiizcwAvkyktS17J2rBVmWBQpJG71XRRiXQ206AUl9nRhU0RzWE qktL74hHJxKjrW2aBLKUa7vyfh2P0OTNKRO7GQnFfeUq+aYuBV85CPBTbAlAyhmC pUf0mWGACgHSQIML9C1PDXX2jhvDVtUfTvWldo48XhDdvo3r7A4lQLeQ26Jtios= =C8l+ -----END PGP SIGNATURE----- --Pc9GwGPkGV59A0ToUTiWeRhKu3wfRQlXp--