From owner-svn-src-all@freebsd.org Tue Oct 8 15:41:08 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1751D12E1B7; Tue, 8 Oct 2019 15:41:08 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 46nhQW6pcxz48GY; Tue, 8 Oct 2019 15:41:07 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 64B2D26AE; Tue, 8 Oct 2019 15:41:03 +0000 (UTC) (envelope-from gjb@freebsd.org) Date: Tue, 8 Oct 2019 15:40:50 +0000 From: Glen Barber To: Emmanuel Vadot 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> References: <201909191643.x8JGhCJu089738@repo.freebsd.org> <20191008122652.63c1a55e76fca9c202e50f8e@bidouilliste.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="R6d/YZw7aFPcgCGm" Content-Disposition: inline In-Reply-To: <20191008122652.63c1a55e76fca9c202e50f8e@bidouilliste.com> User-Agent: Mutt/1.12.1 (2019-06-15) 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: Tue, 08 Oct 2019 15:41:08 -0000 --R6d/YZw7aFPcgCGm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 08, 2019 at 12:26:52PM +0200, Emmanuel Vadot wrote: >=20 > Hi Glen, >=20 > On Thu, 19 Sep 2019 16:43:12 +0000 (UTC) > Glen Barber wrote: >=20 > > Author: gjb > > Date: Thu Sep 19 16:43:12 2019 > > New Revision: 352520 > > URL: https://svnweb.freebsd.org/changeset/base/352520 > >=20 > > Log: > > Apply r346792 (cperciva) from stable/12 to head. The original commit > > message: > > =20 > > On non-x86 systems, use "quarterly" packages. > > =20 > > x86 architectures have "latest" package builds on stable/*, so keep = using > > those (they'll get switched over to "quarterly" during releases). > > =20 > > 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/Make= file > > to determine the pkg(7) repository to use. > > =20 > > MFC after: immediate (if possible) > > Sponsored by: Rubicon Communications, LLC (Netgate) > >=20 > > Modified: > > head/usr.sbin/pkg/Makefile > >=20 > > Modified: head/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=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- 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$ > > =20 > > +.if ${MACHINE} !=3D "amd64" && ${MACHINE} !=3D "i386" > > +PKGCONFBRANCH?=3D quarterly > > +.else > > +_BRANCH!=3D ${MAKE} -C ${SRCTOP}/release -V BRANCH > > +BRANCH?=3D ${_BRANCH} > > +. if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*} > > +PKGCONFBRANCH?=3D quarterly > > +. else > > PKGCONFBRANCH?=3D latest > > +. endif > > +.endif > > CONFS=3D FreeBSD.conf.${PKGCONFBRANCH} > > CONFSNAME=3D FreeBSD.conf > > CONFSDIR=3D /etc/pkg >=20 > 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=3DCURRENT -V PKGCONFBRAN= CH latest root@releng3:/usr/src/usr.sbin/pkg # make _BRANCH=3DSTABLE -V PKGCONFBRANCH latest root@releng3:/usr/src/usr.sbin/pkg # make _BRANCH=3DRC1 -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. >=20 No, I'll implement a proper fix. Glen --R6d/YZw7aFPcgCGm Content-Type: application/pgp-signature; name="signature.asc" -----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----- --R6d/YZw7aFPcgCGm--