Date: Tue, 8 Oct 2019 15:40:50 +0000 From: Glen Barber <gjb@freebsd.org> To: Emmanuel Vadot <manu@bidouilliste.com> Cc: 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: <20191008154050.GR27491@FreeBSD.org> In-Reply-To: <20191008122652.63c1a55e76fca9c202e50f8e@bidouilliste.com> References: <201909191643.x8JGhCJu089738@repo.freebsd.org> <20191008122652.63c1a55e76fca9c202e50f8e@bidouilliste.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Tue, Oct 08, 2019 at 12:26:52PM +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. It does. root@releng3:/usr/src/usr.sbin/pkg # make _BRANCH=CURRENT -V PKGCONFBRANCH latest root@releng3:/usr/src/usr.sbin/pkg # make _BRANCH=STABLE -V PKGCONFBRANCH latest root@releng3:/usr/src/usr.sbin/pkg # make _BRANCH=RC1 -V PKGCONFBRANCH quarterly > Also this depends on MACHINE and iirc MACHINE is always the host when > cross compiling. You are correct. I'll fix this. > I think this need to be reverted. > No, I'll implement a proper fix. Glen [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAl2crgIACgkQAxRYpUeP 4pM3eQ/9HO6kRepGS7XquiHRpRXAjIkdLKA77FG8NZYzFTbh/jKwb7Xgg0zz4pc0 IS6sSUGZG/qFuwcba5A8bx781CX9ZmwIqhDSHyxsxu2pnmwm4v/iX2sfZx0bZqd6 nDLiGj1K6t0jikiL+u1OvnMSRXQR6KbdX+wt2Ak+qACc4tYHix60OURebExa97cd phIwomoyPHjGMS00ndhoKC+u22v5c8+NpwxIvK665m7cTEGXhuXHqXkDVrhS3nLn U251OJ4v6UkV4Yc7jcJoAoEDCLB9y7HeFo6xoMNkFvgWK/r30oWDA7hvA0EhekAe pf+Oo3/L/DiGliXY4z8/sYNs7HksTVQOlVEWm9rGLtK+moFvcPneZu8EUFXoQP+a XghqXpE7edrGB+VfMJvKYii7BDA3184OZRl41TrGadDitXRAWGtzjLUBhhAA4aDV SvvS668VTeQGI6+Zxug74IvUy8+Yikv5WTB3dF6i3LmoOxdN7cgSNczmUs9tx8dh ZkcrSNQBvb05ZD+ulp4s2GHrVFWm2EoH8ADCQIrBZltBNy3s7dBTMHgyeBU17Ean LvhWXHqeV83Byn86nESJrTcC3fhBm7R7tpaAhES2oGpsTBlUXuwC3HG8WI/Xb/np xPlOZsNx8VJ2yDPDm7rS1LLba/iYCiodKJpnC25bysmRiRaABds= =dZOT -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191008154050.GR27491>