From nobody Thu Apr 10 18:33:26 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 4ZYT3Q6LHqz5tK6b for ; Thu, 10 Apr 2025 18:33:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) (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 4ZYT3Q3bchz3Z3G for ; Thu, 10 Apr 2025 18:33:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-3011737dda0so1000363a91.1 for ; Thu, 10 Apr 2025 11:33:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1744310017; x=1744914817; 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=aRdAjtJaZcZXRoh0XprKbnntz3ycN8zeLv8PIOOedbo=; b=VekeWR9XYIJ87YPh5LM3jirfKnZb5GOQp9QLyKi3eLP6pu5qpi2H2I+GrS6WKjDu91 8BKAKzF6VQqgm6FjU4xQnIFEszjDN4JgDH75wljOG6BzEWgNQo7oxwH4d8pwfhPB6SeZ htRx/HEdjxHi/w4hmv3duk+mlIxB19mWtmovr9KtDZMaENlYlGfeA7sgpYXBjgBP0deq 1NLxQEt1EzJ4sCrkq/HphbM1AdMSbbrL9JNGrl2x3QXNHaPEE2vpaiF3irj/hroqGeTF sEy5mFg31uOYM5d4AXixSvf++QQ8gmSgSK3HPQCp7UO/wiBNFyUsKDsuyF4Z5cfNjqHy ygFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744310017; x=1744914817; 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=aRdAjtJaZcZXRoh0XprKbnntz3ycN8zeLv8PIOOedbo=; b=MxjynFLWEJHgflDc2D/sF2zheTdgz9elYmi2I1oCR95wiKB73L6ihfuiVl+uz6h6UL dEVNBYl4kDYkdmTCE4yFqnLrcar3KdThPc7OBqKnJFMtdektEGKvnx6wXS1a+ExdltbD /Cp4SUHIHq/JmNrodbeJy+bS4oA7fHXGRYnBz1uEspxHpWe8YmrCPJRfA+JcS33h66sa h7AAbycQ5FkvGv5QhUOn37vL4RtVhDutXoXOsCx0YIZg/vUWQKFfphqR8fKxJMcw0wgw dJJSfByM2e4uQwdbA11ux8aZjSJ8tVliRRmLaDom4zDQLzwkYY7v4NRHhaHrvrqxDYM2 ATrA== X-Forwarded-Encrypted: i=1; AJvYcCWYrhK4q1FUFRpw9SfS3sZRE3WHCn4FyeoScGpUG1AZ0d38y70RU15WTo8Imnh9Kpnie12yxQZdvBxLJwvXqRE5UcWH3A==@freebsd.org X-Gm-Message-State: AOJu0Yx2kEC9gQCq0Ilua9IELJhd0wooFMEwL7nyFvvzFsvHHYilPiSc hgCIDGumzp+o2GDkailPCkjXPAA0/AXyEYH7to0MBLpNc4eefj4sDGxYndQmsdifEkbYBevF3Zt 54xpewjqkHTUyPDLNv75UMijqY+tJDAQaPla6dg== X-Gm-Gg: ASbGnctzQ8nbrtkYF0k8h26qQWu3pid3yjxHEyIAi/wuYf4AYJAP7SDTS2OFrwbCrfM sbBup/GeVnLvSmp7u1kehoX/evjNREXn6v2n9QWoKSQagkYU3WiXWAGe2oeIMWCZHhkFImswwz1 +WKQjQRe/3JT0BsEj3Mcl2tw== X-Google-Smtp-Source: AGHT+IFg97HyYojbJ6Qh1xJUZ6MwtkWYV1/QwK/pQPzcfRsd3T6hPwMdJVc43py4wsrbImygh6dh1PrmsARdC/8JAII= X-Received: by 2002:a17:90b:5212:b0:2f5:747:cbd with SMTP id 98e67ed59e1d1-30823673532mr21416a91.18.1744310017164; Thu, 10 Apr 2025 11:33:37 -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: <202504101341.53ADfEP0023340@gitrepo.freebsd.org> From: Warner Losh Date: Thu, 10 Apr 2025 12:33:26 -0600 X-Gm-Features: ATxdqUGTv_-VXzsR0GVISvHw01Vcmh8rYaT5VkQ-Y8xtQs_fQuQ7a67HoFvCF4M 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-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4ZYT3Q3bchz3Z3G X-Spamd-Bar: ---- 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=3Dadad9298141964ca38e21a05c0= b8951efbcb70b2 > > 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/resc= ue/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}