From nobody Fri Nov 19 07:13:20 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 71D31189C610 for ; Fri, 19 Nov 2021 07:13:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ua1-x92d.google.com (mail-ua1-x92d.google.com [IPv6:2607:f8b0:4864:20::92d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HwSZ371yFz3vX4 for ; Fri, 19 Nov 2021 07:13:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-ua1-x92d.google.com with SMTP id y5so19343895ual.7 for ; Thu, 18 Nov 2021 23:13:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=8dBJzg772PO62bWbqha50RH/T+lFDQtIqxkrNKIcQCU=; b=eKIEdwE4VTyIjk11Wx/sBsQ8A3ZsLSaM327/U9mGMt/FGDJ/GcwMrDkNhNCh4LVoCH OY/MDuAfUmBqhYVQlCaAJ5Ryt3UDDYpavnx3+MRZJBluecuJurM1s1LxXpc71IYkcU1J h6HKK4kuHI6pdZLjRe43TWuE2sxTBOxz018Grqw0NdrK6Bn5AT8RzDwtukHwpCvpUbDK NwXGsDBAgQhE1cmnwfDdbvjSi8MG/YGg+RyUnt1EG04DRlp3yXOFHSVsCQ1DzOmgrIq8 +R0NsHmu79smIfIkvFGPE9xoBjc/nrOhLOwoeNXc5Bn21Gwn+/JR7KlRtGiDta3Y2XVZ DIaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=8dBJzg772PO62bWbqha50RH/T+lFDQtIqxkrNKIcQCU=; b=o+c18cy68dkyJ7KFul2VUVL10Im3C8qFtIjbdlgKhrH5zaiJAyYxK4HvGSWuWC5D+D NaZyhCCtCIcWxCoDFZCLKM60x+gixiZ1WWkxLU/YknJVJ8lYh1+bmxzPAHA4ZhopKKVy lXYh6X73POlq44KJmIMxs/xN1actWBd2vkP4X4EuwvCKdyLhILE4/35c3X6ebT0DA30a kAm55uWkqiO3b6UeR5P4oQ5kl+2ml4KI1hYb4acO/RazqvM/4f44pHOSsay1hhfC1r5p a36jDgFHPGVHspI/kcdnBKr6LB9nkTimj2ku8Owv+Ai+8KUEJ8SmGi/pnSg3VF3b0n3h 99hA== X-Gm-Message-State: AOAM531fJRJpoUNJhNLiKJVHoYBEIlLKbCgTYrs60IS7KkKXswVlinUr EKDSyWSYa0WYvlHK5rzjlMFrBnj1Mw+zHVeMZGy2XQ== X-Google-Smtp-Source: ABdhPJyiTtgrKgts380GoD87P5bG4XJHc087VRk5vAJn1MhbiHrmsSuvAyAXKXUMZwI5ni2jZiG4Yfc/fBt+rMAHhoY= X-Received: by 2002:ab0:6f47:: with SMTP id r7mr45885051uat.85.1637306011358; Thu, 18 Nov 2021 23:13:31 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202111190614.1AJ6EfS2069583@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Fri, 19 Nov 2021 00:13:20 -0700 Message-ID: Subject: Re: git: a420a672bc53 - main - Bootstrap: Prune building from pre-FreeBSD 11 support To: Kyle Evans Cc: Warner Losh , src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000322c3b05d11f039d" X-Rspamd-Queue-Id: 4HwSZ371yFz3vX4 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N --000000000000322c3b05d11f039d Content-Type: text/plain; charset="UTF-8" On Thu, Nov 18, 2021 at 11:29 PM Kyle Evans wrote: > On Fri, Nov 19, 2021 at 12:14 AM Warner Losh wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=a420a672bc53bd3928626aa5d0ec5b41c0471356 > > > > commit a420a672bc53bd3928626aa5d0ec5b41c0471356 > > Author: Warner Losh > > AuthorDate: 2021-10-10 17:28:54 +0000 > > Commit: Warner Losh > > CommitDate: 2021-11-19 06:13:44 +0000 > > > > Bootstrap: Prune building from pre-FreeBSD 11 support > > > > We don't need to bootstrap lex or md4 anymore. > > Cat doesn't need to be bootstrapped (but is needed for buildkernel) > > cruncgen doesn't need to be bootstrapped at all. > > kbdcontrol isn't needed > > > > Sponsored by: Netflix > > Pull Request: https://github.com/freebsd/freebsd-src/pull/554 > > --- > > Makefile.inc1 | 51 ++++----------------------------------------------- > > 1 file changed, 4 insertions(+), 47 deletions(-) > > > > diff --git a/Makefile.inc1 b/Makefile.inc1 > > index d8f50cf77d4b..6573b4a079a1 100644 > > --- a/Makefile.inc1 > > +++ b/Makefile.inc1 > > @@ -681,8 +681,8 @@ PACKAGE= kernel > > > > BOOTSTRAPPING?= 0 > > # Keep these in sync > > -MINIMUM_SUPPORTED_OSREL?= 1002501 > > -MINIMUM_SUPPORTED_REL?= 10.3 > > +MINIMUM_SUPPORTED_OSREL?= 1102501 > > +MINIMUM_SUPPORTED_REL?= 11.3 > > > > # Common environment for world related stages > > CROSSENV+= \ > > @@ -2239,24 +2239,6 @@ _vtfontcvt= usr.bin/vtfontcvt > > # If you add a new bootstrap tool where we could also use the host > version, > > # please ensure that you also add a .else case where you add the tool > to the > > # _bootstrap_tools_links variable. > > -.if ${BOOTSTRAPPING} < 1000033 > > -# Note: lex needs m4 to build but m4 also depends on lex (which needs > m4 to > > -# generate any files). To fix this cyclic dependency we can build a > bootstrap > > -# version of m4 (with pre-generated files) then use that to build the > real m4. > > -# We can't simply use the host m4 since e.g. the macOS version does not > accept > > -# the flags that are passed by lex. > > -# For lex we also use the pre-gerated files since we would otherwise > need to > > -# build awk and sed first (which need lex to build) > > -# TODO: add a _bootstrap_lex and then build the real lex afterwards > > -_lex= usr.bin/lex > > -_m4= tools/build/bootstrap-m4 usr.bin/m4 > > -${_bt}-tools/build/bootstrap-m4: ${_bt}-usr.bin/lex > ${_bt}-lib/libopenbsd ${_bt}-usr.bin/yacc > > -${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd ${_bt}-usr.bin/yacc > ${_bt}-usr.bin/lex ${_bt}-tools/build/bootstrap-m4 > > -_bt_m4_depend=${_bt}-usr.bin/m4 > > -_bt_lex_depend=${_bt}-usr.bin/lex ${_bt_m4_depend} > > -.else > > -_bootstrap_tools_links+=m4 lex > > -.endif > > > > # ELF Tool Chain libraries are needed for ELF tools and dtrace tools. > > # r296685 fix cross-endian objcopy > > I'll leave a comment on just this first one, but it applies to the > others as well... this left a bunch of references to the removed > variables elsewhere in Makefile.inc1 that need to be removed. I'm also > not entirely convinced that flat removal was entirely right....these > should have probably been replaced with just the > _bootstrap_tools_links additions, because we presumably still want > them linked in if we're not building them. > I hadn't thought of that. I'm reverting until I can think this through. It worked in the test builds, but I want to understand when it might be needed. thanks for the feedback. Warner > > > @@ -2292,21 +2274,6 @@ ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libnetbsd > > _bootstrap_tools_links+=mtree > > .endif > > > > -# r246097: log addition login.conf.db, passwd, pwd.db, and spwd.db with > cat -l > > -.if ${BOOTSTRAPPING} < 1000027 > > -_cat= bin/cat > > -.else > > -_bootstrap_tools_links+=cat > > -.endif > > - > > -# r277259 crunchide: Correct 64-bit section header offset > > -# r281674 crunchide: always include both 32- and 64-bit ELF support > > -.if ${BOOTSTRAPPING} < 1100078 > > -_crunchide= usr.sbin/crunch/crunchide > > -.else > > -_bootstrap_tools_links+=crunchide > > -.endif > > - > > # 1300115: Higher WARNS fixes > > .if ${BOOTSTRAPPING} < 1202502 || \ > > (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300131) > > @@ -2315,18 +2282,6 @@ _crunchgen= usr.sbin/crunch/crunchgen > > _bootstrap_tools_links+=crunchgen > > .endif > > > > -# r296926 -P keymap search path, MFC to stable/10 in r298297 > > -# Note: kbdcontrol can not be bootstrapped on non-FreeBSD systems > > -.if !defined(CROSSBUILD_HOST) > > -.if (${BOOTSTRAPPING} < 1003501 || \ > > - (${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103) || \ > > - (!exists(/usr/sbin/kbdcontrol))) > > -_kbdcontrol= usr.sbin/kbdcontrol > > -.else > > -_bootstrap_tools_links+=kbdcontrol > > -.endif > > -.endif > > - > > # 1300102: VHDX support > > .if ${BOOTSTRAPPING} < 1201520 || \ > > (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300102) > > @@ -2423,6 +2378,8 @@ _basic_bootstrap_tools+=usr.sbin/services_mkdb > usr.sbin/pwd_mkdb > > # bootstrap ldd on non-FreeBSD systems > > _basic_bootstrap_tools+=usr.bin/ldd > > .endif > > +# cat is used by sys/kern/genoffset.sh and sys/conf/newvers.sh > > +_basic_bootstrap_tools+=bin/cat > > # sysctl/chflags are required for installkernel: > > .if !defined(CROSSBUILD_HOST) > > _basic_bootstrap_tools+=bin/chflags > --000000000000322c3b05d11f039d--