From owner-svn-src-all@freebsd.org Mon Apr 22 14:56:30 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D299F159C2C1; Mon, 22 Apr 2019 14:56:29 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 777098EA05; Mon, 22 Apr 2019 14:56:29 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id CE520101AE; Mon, 22 Apr 2019 14:56:28 +0000 (UTC) (envelope-from gjb@freebsd.org) Date: Mon, 22 Apr 2019 14:56:25 +0000 From: Glen Barber To: Colin Percival Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org, portmgr@freebsd.org Subject: Re: svn commit: r340905 - in stable/12: release/pkg_repos usr.sbin/pkg Message-ID: <20190422145625.GA2572@FreeBSD.org> References: <201811241747.wAOHlr6W029937@repo.freebsd.org> <0100016a32795508-fd8bbc41-2b38-40ae-903a-e3ef3739dfd8-000000@email.amazonses.com> <20190419130522.GI39941@FreeBSD.org> <0100016a3bf3402e-9d865a0a-5c6e-43fc-b590-f6b7171b9d35-000000@email.amazonses.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="PNTmBPCT7hxwcZjr" Content-Disposition: inline In-Reply-To: <0100016a3bf3402e-9d865a0a-5c6e-43fc-b590-f6b7171b9d35-000000@email.amazonses.com> User-Agent: Mutt/1.11.2 (2019-01-07) X-Rspamd-Queue-Id: 777098EA05 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.99 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.986,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 22 Apr 2019 14:56:30 -0000 --PNTmBPCT7hxwcZjr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Apr 20, 2019 at 06:12:38PM +0000, Colin Percival wrote: > On 4/19/19 6:05 AM, Glen Barber wrote: > > On Thu, Apr 18, 2019 at 10:02:53PM +0000, Colin Percival wrote: > >> On 11/24/18 9:47 AM, Glen Barber wrote: > >>> Log: > >>> Revert r340161 in stable/12, setting the default pkg(8) repository = back > >>> to 'latest' from 'quarterly' prior to branching releng/12.0. > >> It looks like this is incorrect for non-x86 architectures. Portmgr may > >> correct me here, but it looks like "latest" builds are only done on no= n-x86 > >> architectures on HEAD. (The same problem also applies on stable/11.) > >> > >> I'm guessing that the answer here is to have different package configu= rations > >> installed depending on the architecture; I knew how to do this with th= e old > >> style of src/etc but I'm not sure how to do it now that pkgbase has sp= read > >> configuration files all over the tree. > >=20 > > For 13.0-CURRENT, both latest and quarterly are updated. For non-x86 on > > 12.0-STABLE and 11.2-STABLE, quarterly is updated (not latest), so from > > a general sense of this particular commit, it is correct. > >=20 > > But you are also correct in your assertion that the current default > > (latest) for non-x86 does appear to be incorrect. > I think this patch does what we need in stable/12 -- installing a differe= nt > FreeBSD.conf file depending on whether TARGET_ARCH is amd64/i386. I'm not > sure if we should have anything similar in HEAD since we want to use "lat= est" > packages on all architectures there; we might want to have both configura= tion > files in HEAD but always install the same one there. >=20 > Let me know what you'd like done; this is the last issue (aside from MFCs) > blocking ARM64 AMIs from working on stable/12. >=20 > --=20 > Colin Percival > Security Officer Emeritus, FreeBSD | The power to serve > Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid > Index: usr.sbin/pkg/FreeBSD.conf > =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 > --- usr.sbin/pkg/FreeBSD.conf (revision 346346) > +++ usr.sbin/pkg/FreeBSD.conf (nonexistent) > @@ -1,16 +0,0 @@ > -# $FreeBSD$ > -# > -# To disable this repository, instead of modifying or removing this file, > -# create a /usr/local/etc/pkg/repos/FreeBSD.conf file: > -# > -# mkdir -p /usr/local/etc/pkg/repos > -# echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.c= onf > -# > - > -FreeBSD: { > - url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", > - mirror_type: "srv", > - signature_type: "fingerprints", > - fingerprints: "/usr/share/keys/pkg", > - enabled: yes > -} >=20 > Property changes on: usr.sbin/pkg/FreeBSD.conf > ___________________________________________________________________ > Deleted: svn:keywords > ## -1 +0,0 ## > -FreeBSD=3D%H > \ No newline at end of property > Index: usr.sbin/pkg/FreeBSD.conf.latest > =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 > --- usr.sbin/pkg/FreeBSD.conf.latest (nonexistent) > +++ usr.sbin/pkg/FreeBSD.conf.latest (working copy) > @@ -0,0 +1,16 @@ > +# $FreeBSD: stable/12/usr.sbin/pkg/FreeBSD.conf 340905 2018-11-24 17:47:= 53Z gjb $ > +# > +# To disable this repository, instead of modifying or removing this file, > +# create a /usr/local/etc/pkg/repos/FreeBSD.conf file: > +# > +# mkdir -p /usr/local/etc/pkg/repos > +# echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.c= onf > +# > + > +FreeBSD: { > + url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", > + mirror_type: "srv", > + signature_type: "fingerprints", > + fingerprints: "/usr/share/keys/pkg", > + enabled: yes > +} > Index: usr.sbin/pkg/FreeBSD.conf.quarterly > =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 > --- usr.sbin/pkg/FreeBSD.conf.quarterly (nonexistent) > +++ usr.sbin/pkg/FreeBSD.conf.quarterly (working copy) > @@ -0,0 +1,16 @@ > +# $FreeBSD: stable/12/usr.sbin/pkg/FreeBSD.conf 340905 2018-11-24 17:47:= 53Z gjb $ > +# > +# To disable this repository, instead of modifying or removing this file, > +# create a /usr/local/etc/pkg/repos/FreeBSD.conf file: > +# > +# mkdir -p /usr/local/etc/pkg/repos > +# echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.c= onf > +# > + > +FreeBSD: { > + url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", > + mirror_type: "srv", > + signature_type: "fingerprints", > + fingerprints: "/usr/share/keys/pkg", > + enabled: yes > +} > Index: usr.sbin/pkg/Makefile > =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 > --- usr.sbin/pkg/Makefile (revision 346346) > +++ usr.sbin/pkg/Makefile (working copy) > @@ -1,6 +1,12 @@ > # $FreeBSD$ > =20 > -CONFS=3D FreeBSD.conf > +.if ${TARGET_ARCH} !=3D "amd64" && ${TARGET_ARCH} !=3D "i386" > +CONFS=3D FreeBSD.conf.quarterly > +.else > +CONFS=3D FreeBSD.conf.latest > +.endif > +CONFSNAME=3D FreeBSD.conf > + > CONFSDIR=3D /etc/pkg > CONFSMODE=3D 644 > PROG=3D pkg This looks somewhat similar to what I was thinking, but I'd like to think about this a bit more. What I was thinking was installing FreeBSD.conf for amd64 and i386 (which get switched to 'quarterly' during a release cycle), and creating creating an arch-specific FreeBSD.conf-${TARGET_ARCH} that defaults to 'quarterly' for the other architectures. Your way lessens the number of configuration files in-tree, while what I was thinking would lessen the number of files to touch when switching the default during the cycle, so I'm conflicted at the moment on which method I (personally) prefer. Glen --PNTmBPCT7hxwcZjr Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAly91hkACgkQAxRYpUeP 4pMxAw//Sa9TpYGYoGkru7p95GuTiRXfoNRiGoDHzygUsVFsWYIgfC9q9tKBcm7V rwNdwCg4GVeD6sjqBR0QxdZK63pTjXjBp632NS5U1rfz7JHE5Ts7Tkx/WdVhEDuu wyuztWj1qc7yZTYbUxXjeZ2mc2D5Gk4y71cJzd0ZYVnLe19NHIm1HtHgvtyILnEe vKgvhxBUW1Ssvz5JGrLh5mFnMOaCQfPYrZaNbkB+yaBfMJyx0AG18m5j4Br86sbd aP4Fah36M5e4oY9lcLBqy6fcPDMFFpTqe38ZPM2EBIc+Een7f8RWf6J0S4Aa/N8f 3sMN1YVIairYdY05mlU2lCi3H9a+oHC7wWqSdOTWxJ3w/OUDAYQKVVe/iB4PHxoY WUN4iTxX4ap6QsT4kjsCSs6lQgwAsy5f25YqPgHTk6L/MiM3gCQqed2T6gEVTcf8 5/GPcSEGtVzxTZtrd4zcyq33Wni2ROSvJDcAGfKR4YrVWiyOLlXAtsa/F6Chrold HeaN0SBf8j3bzz1U8jwJuBEOAhe26VW12PeY4KUBVIYE0YZIEut4lk/ZJwr8qC8y l2BApjKsMKHTE/439AJLt3nMfgDVwFN0KJTcAYWFUfU0tdk4MmDl7CP73+JiCS3C Sn4gh4RUzg05spn7Ab7nxTJLVVe0sBujWncE0uXuvcaYWeA7fCI= =O3cI -----END PGP SIGNATURE----- --PNTmBPCT7hxwcZjr--