From owner-svn-src-head@freebsd.org Tue Oct 8 15:18:53 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 4268912CADD for ; Tue, 8 Oct 2019 15:18:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (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 46ngwr3xFgz45Sf for ; Tue, 8 Oct 2019 15:18:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x834.google.com with SMTP id o12so25867263qtf.3 for ; Tue, 08 Oct 2019 08:18:52 -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=GuNUeCEYqzBbgHw8HD3P5XNTHQtFurOO7fXWhRiQaaw=; b=jSiyaPBLYN7BVIM7byzhC13lYldRO7y9D4lIgPUzv+WJ15VjogLksKLbVkkansgcSt Io8gXDXKE9piTHxaFJmGzKFWpNJn1tjNTuHABhffYV8CZ8bMyS7ZYzbkTO+QjqjGpVDX 5HxouIJS2AwebGLPT0NkIYhZsOIkjSqpBaKjefGgXY0h7Ms1OGULVHPZqAhkD0o3Mqni /CZgAeYEqzD8I4Yi4YdjXlmSxwU9rwaG/tYRRMcws1aZ/Pi3zpibqTOA0d/3XMRpxPu7 mnldhPkU/SSeTyZKy/DMo9XMTo3iR/XZr9rH5KII+ZU4//Bf5Wvp9wLBzocfktJCNJNj W4mA== 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=GuNUeCEYqzBbgHw8HD3P5XNTHQtFurOO7fXWhRiQaaw=; b=fWSZ5fekPenlr6W6xJTSXMLRYtTWmjQ5EsSM2qBzqEb64JXdGKb4RYElfzRj8YOMKJ 6s9CffSYvvGFd6FczvxqoWkZJ51CWx0KUcLCar9cRMgYZFbyXYQgRGW7UNNsJV5Irzdn K2gSLeBP/zsT2vK1AXzySOv2XIHxU5hS466fySR/XppkJE3CXxtQFONC/MppYBFIHPbN yY1M/+s1dNr/Durer7wv3YWhRHE+3tbrCGRHM430s4OkCgnV1xvbqhdkm62eRUW41ulW okFdLkT1YyY2KJhfDQzLgMPVVceZ70TaCEioJPe9e8SHPY/sPgEkuSL7dOGmz1VxwHgz 4ydQ== X-Gm-Message-State: APjAAAVFxlxUYqjF9xRndIcyxLApMwQUYFtPk+oWA3J3bcRE8MxTsdv9 1AOONBb+fgY2HEr2qjd/bJ/BnbQSP6ixMvvJZkSLCw== X-Google-Smtp-Source: APXvYqyAN9MhpbYtig3O1LRx7q7vzTniX1RYfxfJtxOYNfYReBZoIjDJAQggQjLo5L7BZsyFOQxawHUeCAin2813zbA= X-Received: by 2002:ac8:44c9:: with SMTP id b9mr36332330qto.175.1570547931557; Tue, 08 Oct 2019 08:18:51 -0700 (PDT) MIME-Version: 1.0 References: <201909191643.x8JGhCJu089738@repo.freebsd.org> <20191008122652.63c1a55e76fca9c202e50f8e@bidouilliste.com> <955b9ea8c0a578a422acd508fa98db9af04850ce.camel@freebsd.org> <20191008163332.662fa45bb75e0e9aefdd4723@bidouilliste.com> In-Reply-To: <20191008163332.662fa45bb75e0e9aefdd4723@bidouilliste.com> From: Warner Losh Date: Tue, 8 Oct 2019 09:18:40 -0600 Message-ID: Subject: Re: svn commit: r352520 - head/usr.sbin/pkg To: Emmanuel Vadot Cc: Ian Lepore , Glen Barber , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 46ngwr3xFgz45Sf X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=jSiyaPBL; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::834) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.83 / 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)[4.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.83)[ip: (-9.42), 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:18:53 -0000 On Tue, Oct 8, 2019 at 8:33 AM Emmanuel Vadot wrote: > On Tue, 08 Oct 2019 08:22:33 -0600 > 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. > > > > -- Ian > > Ah ok, thanks for this info. > > Anyway it's still need to be reverted as all arches should use latest > on CURRENT. > Agreed. -current is moving too quickly to use the quarterly, and this 100% breaks all the graphics .ko's since those *MUST* be compiled against the latest kernel. Things are already wonky enough there without introducing this new (bad) behavior to the mix. It should be fixed in other ways, but until those are in place this change makes a bad situation much, much worse. Warner