Date: Tue, 8 Oct 2019 15:46:18 +0000 From: Glen Barber <gjb@freebsd.org> To: Ian Lepore <ian@freebsd.org> Cc: Emmanuel Vadot <manu@bidouilliste.com>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r352520 - head/usr.sbin/pkg Message-ID: <20191008154618.GS27491@FreeBSD.org> In-Reply-To: <955b9ea8c0a578a422acd508fa98db9af04850ce.camel@freebsd.org> References: <201909191643.x8JGhCJu089738@repo.freebsd.org> <20191008122652.63c1a55e76fca9c202e50f8e@bidouilliste.com> <955b9ea8c0a578a422acd508fa98db9af04850ce.camel@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Tue, Oct 08, 2019 at 08:22:33AM -0600, Ian Lepore wrote: > On Tue, 2019-10-08 at 12:26 +0200, Emmanuel Vadot wrote: > > Hi Glen, > > > > On Thu, 19 Sep 2019 16:43:12 +0000 (UTC) > > Glen Barber <gjb@FreeBSD.org> wrote: > > > > > Author: gjb > > > Date: Thu Sep 19 16:43:12 2019 > > > New Revision: 352520 > > > URL: https://svnweb.freebsd.org/changeset/base/352520 > > > > > > Log: > > > Apply r346792 (cperciva) from stable/12 to head. The original commit > > > message: > > > > > > On non-x86 systems, use "quarterly" packages. > > > > > > x86 architectures have "latest" package builds on stable/*, so keep using > > > those (they'll get switched over to "quarterly" during releases). > > > > > > The original commit was a direct commit to stable/12, as at the time it > > > was presumed it would not be necessary for head. However, when it is time > > > to create a releng branch or switch from PRERELEASE/STABLE to BETA/RC, the > > > pkg(7) Makefile needs further adjusting. This commit includes those > > > further adjustments, evaluating the BRANCH variable from release/Makefile > > > to determine the pkg(7) repository to use. > > > > > > MFC after: immediate (if possible) > > > Sponsored by: Rubicon Communications, LLC (Netgate) > > > > > > Modified: > > > head/usr.sbin/pkg/Makefile > > > > > > Modified: head/usr.sbin/pkg/Makefile > > > ============================================================================== > > > --- head/usr.sbin/pkg/Makefile Thu Sep 19 15:12:32 2019 (r352519) > > > +++ head/usr.sbin/pkg/Makefile Thu Sep 19 16:43:12 2019 (r352520) > > > @@ -1,6 +1,16 @@ > > > # $FreeBSD$ > > > > > > +.if ${MACHINE} != "amd64" && ${MACHINE} != "i386" > > > +PKGCONFBRANCH?= quarterly > > > +.else > > > +_BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH > > > +BRANCH?= ${_BRANCH} > > > +. if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*} > > > +PKGCONFBRANCH?= quarterly > > > +. else > > > PKGCONFBRANCH?= latest > > > +. endif > > > +.endif > > > CONFS= FreeBSD.conf.${PKGCONFBRANCH} > > > CONFSNAME= FreeBSD.conf > > > CONFSDIR= /etc/pkg > > > > Tier 2 (and weird tier1 like aarch64) only have latest for current so > > this doesn't work. > > Also this depends on MACHINE and iirc MACHINE is always the host when > > cross compiling. > > I think this need to be reverted. > > > > Cheers, > > > > MACHINE is the build host when you first launch make(1), but the > crossbuild code in Makefile.inc1 overrides MACHINE to TARGET (and > MACHINE_ARCH to TARGET_ARCH) and launches a sub-make that way. > Ah, yes. That explains why when I first looked, my 'make -V [...]' in usr.sbin/pkg did not work correctly. Thank you for pointing this out. Glen [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAl2cr0oACgkQAxRYpUeP 4pN13Q//XM3DfaIw5QTmamFe5dA1ofR7KnD76YUZJW6gVWQa0DlNDx53HfMBn+tY OaMYbhqHTb+rIa+tM5TGPBy4T1DbgY7Mzw+CnZ4yd+ZRm2b3shPIc8iximiYY9AB KVXRqmvwt8TyVl3nFD4aQXQHM/C8oWAI9m5nuhNUuyfSVT+AnaO7G7n30b4zSWxw 5d5xigcQzUkH+p74jWRjLxGShHNpMvG24S04XeyCcYOkQ2jCyPwz22JCqW7EIT2q Ati20IepUSD4BE3t5tmqrrTpt3no7/fjj4khd1h0/2P6QzCHgfJYGZWxYmrLviLU zX2xkpeo7H7Q6MTHRHHR62yOtFF+MAnNiAUOUY6kb5Afe/FoOqnMdrLfe3U/RlAL eT4zhyngQ5RKHCHEE3mNB+pMxxS47uWdP9uz3iQapTfYBGEyT6GCDnrOoNSJtsIC duqWYo/JpEl9gp/Akn9UscEireBLkQha/b/Gib9Fb1hONoOLv80dS9JB3fNoyrJR rrNWgAbUupEdWoVFaVkoosWdRiH2rEqR90TG5V50oCHE+eJEeUsJQoU9n/xyG5yA ErAdQKm12sJFuhjUBfRFzIbLsyylkDp++0PCiDJmeRs7KB5mKEkmYTLqpW15Frl1 l5/UgfwcpmDG+wDOVYXCcmJoqFPjztk+aDazF0AgT0vorn0wFlo= =Yfdm -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191008154618.GS27491>