Date: Thu, 10 Apr 2025 16:17:19 -0600 From: Warner Losh <imp@bsdimp.com> To: Michael Reifenberger <mr@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: adad92981419 - main - Fix build under current. Message-ID: <CANCZdfp4HPNUnKgK-d22j9iR6%2B6u7i0UBLWRfcDW=tsSWauT7Q@mail.gmail.com> In-Reply-To: <CANCZdfrJ77fjoaeGXXUUbCMkLisGJERKKCwSt_S7eN-HOSUX4A@mail.gmail.com> References: <202504101341.53ADfEP0023340@gitrepo.freebsd.org> <CANCZdfrJ77fjoaeGXXUUbCMkLisGJERKKCwSt_S7eN-HOSUX4A@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <imp@bsdimp.com> 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 <mr@freebsd.= org> wrote: > > > > The branch main has been updated by mr: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dadad9298141964ca38e21a05= c0b8951efbcb70b2 > > > > commit adad9298141964ca38e21a05c0b8951efbcb70b2 > > Author: Michael Reifenberger <mr@FreeBSD.org> > > AuthorDate: 2025-04-10 13:39:12 +0000 > > Commit: Michael Reifenberger <mr@FreeBSD.org> > > 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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfp4HPNUnKgK-d22j9iR6%2B6u7i0UBLWRfcDW=tsSWauT7Q>