From nobody Thu Apr 10 22:17:19 2025 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 4ZYZ1t0KWPz5rtp5 for ; Thu, 10 Apr 2025 22:17:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZYZ1s29Mrz44gy for ; Thu, 10 Apr 2025 22:17:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20230601.gappssmtp.com header.s=20230601 header.b=mWAKcCP5; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::633) smtp.mailfrom=wlosh@bsdimp.com Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-224341bbc1dso13162285ad.3 for ; Thu, 10 Apr 2025 15:17:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1744323451; x=1744928251; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=a8edUD6NU0mNntZqVVttu2g/bHmaWDnbFlE1hRG94js=; b=mWAKcCP5hZ/SxVs3p3KIBNYVa4KtjXLt6vafLpNVH+KZubFrW61QolfDF5QILQ7h/d GMkXP7MS0OGbr0vcf553TjD9Bwj/mTH3t0yxH3+fi/BEBHNpAp+URh7sD5SLXjHiXSft 8dxBgd6vOWtDtmQMKmbOASfHrqjJHMO675uMXS/Flhv7U1Q1/4xMe63c7XRYc2bRCOWe dSc25PY4bnurwI4+DKSmTIhk8VNdVTN0yj1N2MbdcaggkhlpIhWn+No0ybo6ALRNExW9 9Df5Vs7uJP7GqyJTOPSh9AvUNilRCcFfdrFO17n9oQyZT/s2oZCtWG7ZwXQ+Yye8iIKG qvDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744323451; x=1744928251; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a8edUD6NU0mNntZqVVttu2g/bHmaWDnbFlE1hRG94js=; b=CJ/L4dW3IcAYwQLpqoBIWw/t//aZrVG3VG13c/JXYLqijBkM+Gu8yZRenLxqG1ovR+ HeAECvJVeQ55QSxNgYxK8e8Rg6SjpsAj6Uya7jPQj16E6CTFSeWbfPfpcJt9IiHupy5Y fSj5bvXVJv0JIDtFxN4RZNQC1KJGOtX1BJcGEM5kxDOCizxLKUzi7BeG7+v1e1PeGFoq Lbx+baT8A+9GFyUGiI5knyaCe0p2pK5DxatSt7jF1aXMpTvRGoo3DzoK3Hv6bkZKs/X6 Jpkn4A+zYtK3lgYDcSgnR4+/KRYFAPFHbXCCFzEg/QfCpW/fTbDLNFUhsXAcc1pUfQbX BV3w== X-Forwarded-Encrypted: i=1; AJvYcCXWRr58rSUzOwoMsX0AfYsXVrGL+XJuM0GLiaOZff9U3h93uNnnVccJdY9gAA0/BLQ1mqW44586qxxAiDVSHgmbc1YDJA==@freebsd.org X-Gm-Message-State: AOJu0YwMNQKJ4EFznfoJEBPhqzOvnsBVXqE+F+GZR26dzXSwJo3XqIdu efC0F+yw5nBdzMh/rLVa1s47E3qHVqj5JFiOPDPp9sADZtJ4VuL5Bd1I3EnEeEYua70oDc3OExq PHpUo8mmikwE7HY61/fTIo9XgNOp1onuSrP8aag== X-Gm-Gg: ASbGncvbfnPXTiusYV0Uhc01XIUobqHa19LN4LKpCFALKXYdecbf+JYY5qOQXpIHYXn C+B+WkYtZH/nzzi8r0vEVrK/YobD3N7rJGqC3avL8wznH5yeBP+TcVbLjwkewwJ8XBYcpXxBR4b DHU1DfzEhIj85PJqoc7EFr3g== X-Google-Smtp-Source: AGHT+IFD3pl6nWfXzKxlw9qYjikmSqvPG1Ew0dPD6njgkewerqUhm44URu2S2G81menh37Z6ZZmoKsPb1+T1/WfJb4A= X-Received: by 2002:a17:902:f681:b0:21f:522b:690f with SMTP id d9443c01a7336-22bea4ff05amr4851425ad.46.1744323450790; Thu, 10 Apr 2025 15:17:30 -0700 (PDT) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202504101341.53ADfEP0023340@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Thu, 10 Apr 2025 16:17:19 -0600 X-Gm-Features: ATxdqUGgaLLgpgFnwYUhi7iHhkL7w5cQsBp3n8qKehheBZSKrlV6D6A-Xcggn_M Message-ID: Subject: Re: git: adad92981419 - main - Fix build under current. To: Michael Reifenberger Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.99 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.992]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20230601.gappssmtp.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; MISSING_XM_UA(0.00)[]; R_SPF_NA(0.00)[no SPF record]; DMARC_NA(0.00)[bsdimp.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::633:from]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20230601.gappssmtp.com:+] X-Rspamd-Queue-Id: 4ZYZ1s29Mrz44gy X-Spamd-Bar: -- So after some experiments, I've concluded that I misread this commit. It's for a different file than I thought. My apologies. While the commit log isn't great, the change didn't break what I thought it would break, so I withdraw my request to revert. The worst that Isee this doing is that it does break a convention that I have for NANO_OBJ that's set automatically, but that convention isn't universal (though often followed in historical nanobsd config files). Warner On Thu, Apr 10, 2025 at 12:33=E2=80=AFPM Warner Losh wrote= : > > Please revert this. > > (1) It includes things that are bogus (clearly not intended) > (2) it wasn't reviewed. we're trying to review things in phab for nanobsd > (3) The only possible valid change in here is the size bump, but even > it doesn't make sense. > (4) the t->true changes are gratuitous. > > Warner > > On Thu, Apr 10, 2025 at 7:41=E2=80=AFAM Michael Reifenberger wrote: > > > > The branch main has been updated by mr: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dadad9298141964ca38e21a05= c0b8951efbcb70b2 > > > > commit adad9298141964ca38e21a05c0b8951efbcb70b2 > > Author: Michael Reifenberger > > AuthorDate: 2025-04-10 13:39:12 +0000 > > Commit: Michael Reifenberger > > CommitDate: 2025-04-10 13:41:02 +0000 > > > > Fix build under current. > > --- > > tools/tools/nanobsd/rescue/common | 34 ++++++++++++++++++-------------= --- > > 1 file changed, 18 insertions(+), 16 deletions(-) > > > > diff --git a/tools/tools/nanobsd/rescue/common b/tools/tools/nanobsd/re= scue/common > > index 5fcf5c19b882..15bf10f5e67d 100644 > > --- a/tools/tools/nanobsd/rescue/common > > +++ b/tools/tools/nanobsd/rescue/common > > @@ -1,15 +1,15 @@ > > # > > # > > -NANO_SRC=3D$(pwd) > > -NANO_SRC=3D${NANO_SRC%/tools/tools/nanobsd/rescue} > > -NANO_OBJ=3D${NANO_SRC}/../nanobsd-builds/${NANO_NAME}/obj > > +#NANO_SRC=3D$(pwd) > > +#NANO_SRC=3D${NANO_SRC%/tools/tools/nanobsd/rescue} > > +#NANO_OBJ=3D${NANO_SRC}/../nanobsd-builds/${NANO_NAME}/obj > > NANO_TOOLS=3D`pwd` > > NANO_PACKAGE_DIR=3D`pwd`/Pkg > > NANO_RAM_TMPVARSIZE=3D40960 > > NANO_PMAKE=3D"make -j 8" > > NANO_LABEL=3D"rescue" > > NANO_RAM_TMPVARSIZE=3D40960 > > -NANO_MEDIASIZE=3D"3932160" > > +NANO_MEDIASIZE=3D"6000000" > > NANO_SECTS=3D"63" > > NANO_HEADS=3D"16" > > NANO_IMAGES=3D"2" > > @@ -31,10 +31,12 @@ CONF_INSTALL=3D' > > CONF_WORLD=3D' > > CFLAGS=3D-O -pipe > > # We do not need these for rescue > > -WITHOUT_LIB32=3Dtrue > > WITHOUT_TESTS=3Dtrue > > -WITHOUT_DEBUG_FILES=3Dt > > -WITHOUT_KERNEL_SYMBOLS=3Dt > > +WITHOUT_DEBUG_FILES=3Dtrue > > +WITHOUT_KERNEL_SYMBOLS=3Dtrue > > +WITHOUT_CLANG_FULL=3Dtrue > > +WITH_CLANG_EXTRAS=3Dtrue > > +WITHOUT_LIB32=3Dtrue > > ' > > > > # Functions > > @@ -50,14 +52,14 @@ toUpper() { > > customize_cmd cust_allow_ssh_root > > customize_cmd cust_install_files > > > > -cust_ld32_cfg () ( > > - cd ${NANO_WORLDDIR}/libexec > > - if [ \! -f ld-elf32.so.1 ]; then > > - ln -s ld-elf.so.1 ld-elf32.so.1 > > - fi > > -) > > -customize_cmd cust_ld32_cfg > > - > > +#cust_ld32_cfg () ( > > +# cd ${NANO_WORLDDIR}/libexec > > +# if [ \! -f ld-elf32.so.1 ]; then > > +# ln -s ld-elf.so.1 ld-elf32.so.1 > > +# fi > > +#) > > +#customize_cmd cust_ld32_cfg > > +# > > #cust_boot_cfg () ( > > # cd ${NANO_WORLDDIR} > > # echo "-S115200 -h" > boot.config > > @@ -67,7 +69,7 @@ customize_cmd cust_ld32_cfg > > #) > > #customize_cmd cust_boot_cfg > > > > -customize_cmd cust_pkgng > > +#customize_cmd cust_pkgng > > > > cust_etc_cfg () ( > > cd ${NANO_WORLDDIR}