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 non-x86 > >> architectures on HEAD. (The same problem also applies on stable/11.) > >> > >> I'm guessing that the answer here is to have different package > >> configurations > >> installed depending on the architecture; I knew how to do this with the old > >> style of src/etc but I'm not sure how to do it now that pkgbase has spread > >> configuration files all over the tree. > > > > 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. > > > > 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 different > 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 "latest" > packages on all architectures there; we might want to have both configuration > files in HEAD but always install the same one there. > > Let me know what you'd like done; this is the last issue (aside from MFCs) > blocking ARM64 AMIs from working on stable/12. > > -- > 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
> ===================================================================
> --- 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.conf
> -#
> -
> -FreeBSD: {
> - url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest";,
> - mirror_type: "srv",
> - signature_type: "fingerprints",
> - fingerprints: "/usr/share/keys/pkg",
> - enabled: yes
> -}
>
> Property changes on: usr.sbin/pkg/FreeBSD.conf
> ___________________________________________________________________
> Deleted: svn:keywords
> ## -1 +0,0 ##
> -FreeBSD=%H
> \ No newline at end of property
> Index: usr.sbin/pkg/FreeBSD.conf.latest
> ===================================================================
> --- 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.conf
> +#
> +
> +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
> ===================================================================
> --- 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.conf
> +#
> +
> +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
> ===================================================================
> --- usr.sbin/pkg/Makefile (revision 346346)
> +++ usr.sbin/pkg/Makefile (working copy)
> @@ -1,6 +1,12 @@
> # $FreeBSD$
>
> -CONFS= FreeBSD.conf
> +.if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "i386"
> +CONFS= FreeBSD.conf.quarterly
> +.else
> +CONFS= FreeBSD.conf.latest
> +.endif
> +CONFSNAME= FreeBSD.conf
> +
> CONFSDIR= /etc/pkg
> CONFSMODE= 644
> PROG= 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
signature.asc
Description: PGP signature
