From owner-freebsd-ports@FreeBSD.ORG Wed May 28 17:04:46 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 733E9910; Wed, 28 May 2014 17:04:46 +0000 (UTC) Received: from mail-wg0-x229.google.com (mail-wg0-x229.google.com [IPv6:2a00:1450:400c:c00::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D815B2D2D; Wed, 28 May 2014 17:04:45 +0000 (UTC) Received: by mail-wg0-f41.google.com with SMTP id z12so11546240wgg.12 for ; Wed, 28 May 2014 10:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=wEF2WoD9FADtcj8D+ETgc2sqltI7Cu09LM8bsxn640E=; b=SFmaej1IfHeXrSXPc14xM6Aqe7NSBTE55IYdNJnLY/+AffoTLev9xW1A3tESLNvNPO k34jq9CRbksecHM9Vhs0dvOMsMS+Jk4iEsnHrso0ZICtpqwvt67XMtP6ZAgxuOB8AQQC or4IzNDsEoEx0mbVTfC0IlfejMQgQkn9cOhHFyHrIOPCk31RyKSjQmKysZWVJ5G0XbKI SW7W2gUqBlMIBRETBVIj0Sbu+fCNoilVN18wttj21hI1QqEgloS9iyHLE4r/JExEh9aD VSSkuiVxnlDI5kIRy84+wrhkYn1etS15tN0Vr41ns3RH1aei0fYVG7ysCbbjWzRTC958 1pKQ== X-Received: by 10.180.100.41 with SMTP id ev9mr51234981wib.22.1401296684119; Wed, 28 May 2014 10:04:44 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id l4sm18376528wiy.0.2014.05.28.10.04.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 May 2014 10:04:43 -0700 (PDT) Sender: Baptiste Daroussin Date: Wed, 28 May 2014 19:04:41 +0200 From: Baptiste Daroussin To: Nathan Whitehorn Subject: Re: [Patch] Using MACHINE_ARCH identifiers in pkg Message-ID: <20140528170440.GA80273@ivaldir.etoilebsd.net> References: <5383EEB6.6010703@freebsd.org> <538614AB.4070803@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="1yeeQ81UyVL57Vl7" Content-Disposition: inline In-Reply-To: <538614AB.4070803@freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: Warner Losh , FreeBSD Mailing List X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 May 2014 17:04:46 -0000 --1yeeQ81UyVL57Vl7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, May 28, 2014 at 09:54:03AM -0700, Nathan Whitehorn wrote: > The following was in a deep and increasingly branched thread on the SVN= =20 > list. I've forwarded the relevant part here. The discussion was on using= =20 > MACHINE_ARCH codes for package architectures in pkg instead of the=20 > existing ones (which are equivalent) to make script-writing easier and=20 > improve consistency with the way the src and ports trees work. The=20 > patches below are designed to make transitioning the architecture=20 > identifiers as painless as possible. > -Nathan >=20 > ------------------------------------------------------------------------ >=20 > I've written two patches today. The first > (http://people.freebsd.org/~nwhitehorn/pkg_machinearch.diff) is to pkg > itself and the second > (http://people.freebsd.org/~nwhitehorn/pkg_bootstrap_machinearch.diff) > is to the pkg bootstrapper in base. These switch pkg from using > identifiers like "freebsd:11:arm:32:eb:eabi:softfp" to identifiers like > "FreeBSD:11:armeb", matching the canonical FreeBSD platform identifiers. > The strings it uses can be predicted easily from scripts, as they are > identical in all cases to the output of `uname -s`:`uname -r | cut -f 1 > -d .`:`uname -p`. >=20 > I tried to avoid changing much, so the patches are pretty short. > Internally, the patch introduces a translation table to pkg that > contains all extant FreeBSD and Dragonfly BSD architectures and moves > between the ELF-based coding and MACHINE_ARCH values. This is kind of > gross, but has the least possibility for regression, and can easily be > changed behind the scenes later. Platform detection uses the same > ELF-parsing code as before. 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 testing > suggests it works well -- I can fetch and install packages fine. More > testing would be great. >=20 > One small issue is how to bootstrap the change for existing binary > package users. The modified pkg can use packages with either > architecture ID just fine, but the current one will barf on the > FreeBSD:11:amd64 package containing its own update. There are a couple > of options: manual instructions, marking that one package with the > old-style architecture ID, etc. None should be more than slightly > irritating, though. The least bumpy route, I think, is making > directories with both the old and new names, but putting only one > package in the old-named directory: a special intermediate version of > pkg marked with the old architecture ID but able to install from the new > one. Then you just have to deal with two rounds of updates without any > other intervention, which is not so bad. > -Nathan >=20 >=20 >=20 Thanks I'll be away for a couple of days, but I'll have a look and test your patch in all situation we need to support and come back to you if needed or directly commit; regards, Bapt --1yeeQ81UyVL57Vl7 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iEYEARECAAYFAlOGFygACgkQ8kTtMUmk6EzJjwCfeEKAhTQnX9RVc2XvXHd9QG8T ub4An2BKgtLKs1aHXxTMenUKGMaQvyPp =NNxj -----END PGP SIGNATURE----- --1yeeQ81UyVL57Vl7--