From owner-svn-src-all@freebsd.org Tue Oct 8 14:22:41 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 A5CA112A601 for ; Tue, 8 Oct 2019 14:22:41 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound2m.ore.mailhop.org (outbound2m.ore.mailhop.org [54.149.155.156]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 46nfh10rp3z419t for ; Tue, 8 Oct 2019 14:22:40 +0000 (UTC) (envelope-from ian@freebsd.org) ARC-Seal: i=1; a=rsa-sha256; t=1570544559; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=YIpFhbnph1FvrSR2WGHvnOokeifF4HvHLl4VBfpmbzaQP62k/ZnfAYR/vGsAh+c5gFEFpGuYBFv/E gtUpk3e3bFwBlhP8pt9N4kHRxPrGF5dbv/ZN1i52Mp3iYcCQirVx4k95K1AklKClRFBwbMtAJjLg9t HDaqI0Os0f6pofAbjnLXvf8Z7vDytspNHbssbvLI6p70le/UqJviH583eVHYnJ7+zeFsGLj5F4hElB tfBC4GAc9fKc097UrdVt5dWLsNDnivo8QgA44pwNK/KDjzcz1DVG7lo/YV3Hvz7qll7TJC9noKLcyl aPFyNhO5VeK5tj5mtWyfC7jjGmQ/HHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:cc:to:from:subject:message-id:dkim-signature:from; bh=A2jSNv+PIZn52lGqcZ2A/y6maEmeXYf9ZQVvE0DLVrg=; b=mypNDUsfxu7+Fu/DnVZYdmJYAUlcPV51k91Js1iSlJ3hI5ffXM+hObbQ129jGzJUAf86SftgFSfoj Jlq5bDb6zEtTMChpTeGJUj3wRhCD8CsZfFATQt5v/oTx44bq3wyJvHePwRLmaXMj7G0TBpxBP3hbCX +TDFkKSPd6W8zleEZEIBSKyjvPcTdgu9feV84XZA/7rMs3oXIMiPi9m5Fdy4Mkul+2BTqDMnA/gFrC Y4smf83O4UjjQd7CTxjbLRYscD0p9HaSXux+E+j5QRWH3HNuhQhgMqxmUuFvHtY98lDviq+JXMN/2N 6db99Rw0URHR+sNpldbHKAVgK3irqlA== ARC-Authentication-Results: i=1; outbound4.ore.mailhop.org; spf=softfail smtp.mailfrom=freebsd.org smtp.remote-ip=67.177.211.60; dmarc=none header.from=freebsd.org; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:cc:to:from:subject:message-id:from; bh=A2jSNv+PIZn52lGqcZ2A/y6maEmeXYf9ZQVvE0DLVrg=; b=DBg3HIBlxqWy4oF8ilsF8jlIRWveHk/ANOhkHWlbBiJS34ynYdiFHT9ksAIcsTD14FxFgkae7BSm3 2/dg5G8wEM7HyR9+239zZ3Rh0sCueP4IvJialnI/cyHr+h9eqZcofOhZFHi36KBvy1Ywol+7ySaG2V z4QV6nVEu5TdH8sivQTcGAbJe4EbAmMvnNBO/05VgURHe7XWy4FnRathGF/z714Y0cYNG0ruStYqpE icG6liqgFRh+ztdaCbbCxrCwEVs4cfL3V+MFraU38d0382i2oL4mXPEtFxBCaEoXduDRASXo8lgw8y MId2sKalKg0yc5ZYr66hKZNMsIGX7bw== X-MHO-RoutePath: aGlwcGll X-MHO-User: 12026c83-e9d7-11e9-85ed-13b9aae3a1d2 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [67.177.211.60]) by outbound4.ore.mailhop.org (Halon) with ESMTPSA id 12026c83-e9d7-11e9-85ed-13b9aae3a1d2; Tue, 08 Oct 2019 14:22:37 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id x98EMXKa082713; Tue, 8 Oct 2019 08:22:33 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <955b9ea8c0a578a422acd508fa98db9af04850ce.camel@freebsd.org> Subject: Re: svn commit: r352520 - head/usr.sbin/pkg From: Ian Lepore To: Emmanuel Vadot , Glen Barber Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Tue, 08 Oct 2019 08:22:33 -0600 In-Reply-To: <20191008122652.63c1a55e76fca9c202e50f8e@bidouilliste.com> References: <201909191643.x8JGhCJu089738@repo.freebsd.org> <20191008122652.63c1a55e76fca9c202e50f8e@bidouilliste.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 FreeBSD GNOME Team Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 46nfh10rp3z419t X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-1.93 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-0.93)[-0.927,0]; ASN(0.00)[asn:16509, ipnet:54.148.0.0/15, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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 14:22:41 -0000 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 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. -- Ian