From owner-svn-src-head@freebsd.org Tue Oct 8 15:09:01 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 E349E12C5E2 for ; Tue, 8 Oct 2019 15:09:01 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46ngjS5zs5z44qh for ; Tue, 8 Oct 2019 15:09:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x833.google.com with SMTP id j31so25799368qta.5 for ; Tue, 08 Oct 2019 08:09:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=W19eMhAOm0D+N7f1z0jaYTFwXhv/FvffxPlckTh0Cvg=; b=nO3Goqsb30OwvO9dtCdkD09IJ/l90sofcABa5Wp4eqifHlCZ9JdVYP3O2XOJH/TMgP +EEG4HNUyEEd2fE3MXKxkAkeIdmDry+VFfdAGx6TtobAIxtgt2tLUagsku2T7I5reRno LPcExRjVfuaNEQxaYk9cUe2H2TR9Mvl4tPCNiogH2NmBmNpxBcefcUq/JZzYF9ajCRnl 0w71rPmU4fvKBH7xB1+TBKfr6Ed+rQxc4/ogyPIf+rlJKFIpEKtmklBnTQr1/9d+ItQi ROSiOc3H3SG90h4bSUlS6/KgT1zahxzXvRIZxLzX3Jx2MabLvoA5jF81mvrMnYNHL0tS G4cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=W19eMhAOm0D+N7f1z0jaYTFwXhv/FvffxPlckTh0Cvg=; b=nbrYWqSv99Fb0zowqbOOAFu2o3Zv2iUYQ2tTfX39XQvQVhsEeE9jNO/9xsIcprVTd7 T7JzX68IeSewC4oGwr7pvSXVAaxJheON5QBFjwqXFSkRYd8RjgneEq3wAGTIRHtJVIFe Uh9v/4D8oeNWr19EP+PMEFLtKiLaEBajFB/EN08Q1+nv7V+3gVXIVZLyZAaV+RWzVfuX KzDdeaMt9gJGpG0r5BWXVnVxQ9VoGyO4SVeItoiLpLA1Iwqera0QkNqcW7jCNP+0d5j5 6IFBgTwiTUlIyBgQCv/gaTk0idwcBW1XMvr529FxsXQ3qa75jwplNajKZnG5n1CnfE7X orIw== X-Gm-Message-State: APjAAAWqpNz9OHxbiV5GQpGraJCt4CAKZgdAncT0goIWVb9CTgvxGU8C P9lbMje7579nAiS1qOEoyWy+Jaxk56bPQtMz5TD7Gg== X-Google-Smtp-Source: APXvYqy78rcGv6Dx7MHdgJmlLFoZgdUab9zWG1829Yh4vafgTs0bEzalC0BHnqoaIdQbB4jlqS1rS5DxSlX8fg2kt2o= X-Received: by 2002:a0c:e2c9:: with SMTP id t9mr32565240qvl.22.1570547339528; Tue, 08 Oct 2019 08:08:59 -0700 (PDT) MIME-Version: 1.0 References: <201909191643.x8JGhCJu089738@repo.freebsd.org> <20191008122652.63c1a55e76fca9c202e50f8e@bidouilliste.com> <955b9ea8c0a578a422acd508fa98db9af04850ce.camel@freebsd.org> In-Reply-To: <955b9ea8c0a578a422acd508fa98db9af04850ce.camel@freebsd.org> From: Warner Losh Date: Tue, 8 Oct 2019 09:08:48 -0600 Message-ID: Subject: Re: svn commit: r352520 - head/usr.sbin/pkg To: Ian Lepore Cc: Emmanuel Vadot , Glen Barber , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 46ngjS5zs5z44qh X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=nO3Goqsb; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::833) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.80 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; URI_COUNT_ODD(1.00)[3]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[3.3.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.80)[ip: (-9.29), ipnet: 2607:f8b0::/32(-2.54), asn: 15169(-2.14), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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 15:09:01 -0000 On Tue, Oct 8, 2019 at 8:22 AM 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 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. > MACHINE_ARCH likely should be used in the above, since MACHINE is the KERNEL architecture and MACHINE_ARCH is the user-land architecture. Packages are almost exclusively for user-land, and we normally test MACHINE_ARCH outside of sys except for some very narrow cases (that likely could go away now that we no longer have pc98). In this case, it likely doesn't matter. It might for arm, though, since armv7 may have packages, but armv6 or plain arm might not and we may want to configure them differently as a result. Ian is right that during a buildworld, we specify TARGET/TARGET_ARCH which use use in Makefile.inc1 for various things, but for the actual building MACHINE and MACHINE_ARCH are what are used/tested. Warner