From owner-svn-src-head@freebsd.org Tue Oct 8 10:27:02 2019 Return-Path: Delivered-To: svn-src-head@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 3157A143288; Tue, 8 Oct 2019 10:27:02 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.blih.net", Issuer "mail.blih.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 46nYS43twzz3FS6; Tue, 8 Oct 2019 10:27:00 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) by mail.blih.net (OpenSMTPD) with ESMTP id 420abf02; Tue, 8 Oct 2019 12:26:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=bidouilliste.com; h=date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=mail; bh=iTWeQhQA45djTtcSKQkXCTy/GTs=; b=fJlNbfnDfSzjxIcTVTpRjm3eNHgr RoIzCNcHjnEjniFlyymbMxHfxeXTZjj90iFAoe2/UFUZBxr/pYBbKbUeg7vq1nYZ ImZARc3YNulcG3Np8kr+wb8g4IdiM6fprmCKUJ+VjU0FUsmUs1S6Z+yxa4uTfBpM pEVjH8o6PVVTyQA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=bidouilliste.com; h=date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; q=dns; s= mail; b=S6Z/+6/BlJm5dmH1Rdb0eIF5dtpohccZi7OnSN3qRruSXhA7zaLkuhDR pq53G4vKLCKMfvvtJVHQclIpKcadRpZQrq1jxuqYkVSpvEjM+Up5owR8kpaPUyyZ J9RYVtq7l8KkZpKcOcieANrYulg2kYTZxbuweuzDRhcI4ChfLF8= Received: from skull.home.blih.net (ip-9.net-89-3-105.rev.numericable.fr [89.3.105.9]) by mail.blih.net (OpenSMTPD) with ESMTPSA id 3116809d TLS version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Tue, 8 Oct 2019 12:26:52 +0200 (CEST) Date: Tue, 8 Oct 2019 12:26:52 +0200 From: Emmanuel Vadot To: Glen Barber 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: <20191008122652.63c1a55e76fca9c202e50f8e@bidouilliste.com> In-Reply-To: <201909191643.x8JGhCJu089738@repo.freebsd.org> References: <201909191643.x8JGhCJu089738@repo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 46nYS43twzz3FS6 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mail header.b=fJlNbfnD; dmarc=none; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.177.182 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-1.34 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mail]; NEURAL_HAM_MEDIUM(-0.92)[-0.924,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:212.83.177.182/32]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; MV_CASE(0.50)[]; DMARC_NA(0.00)[bidouilliste.com]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-0.89)[-0.890,0]; DKIM_TRACE(0.00)[bidouilliste.com:+]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; IP_SCORE(0.37)[ip: (-0.75), ipnet: 212.83.160.0/19(2.49), asn: 12876(0.11), country: FR(-0.00)]; ASN(0.00)[asn:12876, ipnet:212.83.160.0/19, country:FR]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2019 10:27:02 -0000 Hi Glen, On Thu, 19 Sep 2019 16:43:12 +0000 (UTC) Glen Barber 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, -- Emmanuel Vadot