From nobody Sun Apr 13 11:06:42 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 4Zb71R35J3z5t8NQ; Sun, 13 Apr 2025 11:07:39 +0000 (UTC) (envelope-from mike@reifenberger.com) Received: from b1.eeeit.de (b1.eeeit.de [94.16.108.56]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zb71P4stNz3RYS; Sun, 13 Apr 2025 11:07:37 +0000 (UTC) (envelope-from mike@reifenberger.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=reifenberger.com header.s=nov24ed header.b="BEIU/OMD"; dkim=pass header.d=reifenberger.com header.s=nov24rsa header.b=YSbXVyFg; dmarc=pass (policy=reject) header.from=reifenberger.com; spf=pass (mx1.freebsd.org: domain of mike@reifenberger.com designates 94.16.108.56 as permitted sender) smtp.mailfrom=mike@reifenberger.com Received: from [10.0.0.190] (ip5f5bea8d.dynamic.kabel-deutschland.de [95.91.234.141]) by b1.eeeit.de (Postfix) with ESMTPSA id 16DE7917FD; Sun, 13 Apr 2025 13:06:58 +0200 (CEST) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=reifenberger.com; s=nov24ed; t=1744542419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=r9c4kx7V1ettScbwNi6sTbWw/9tbudozYY2P1hHIh7M=; b=BEIU/OMD9cZuXHddQEWVO4lIy9qGq6dLMVYDYINFEImU2o/vEA+8ZBF2+Se1WEMC16wNEu GQmQi2f60ZeMQcCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=reifenberger.com; s=nov24rsa; t=1744542419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=r9c4kx7V1ettScbwNi6sTbWw/9tbudozYY2P1hHIh7M=; b=YSbXVyFgBE2wsorEf0+TGqrK6wc+9DxynwVC9ZI6wSA+uiC5AoMfY/Cj/S2Kig+HdThWkd +5Ot7eBIGrhcEuPtg4jgZvV7jfSKSonN6yXWILR8EofmI4pbSXc1Mcq9Bd6816/dYEDGaw 2L4oY/G8cjjzVTEY6ga1HyoF8RrYcsplSQs4SuZ48iZ3kwcAqdc0camwkD3NjWjul80Gov pm88eZcxuMybdgghnyQE7YtxI0HpOxWUS4U+XdOyvTi/NPdCeTXB+prJi5Avj4p5VTBsDS bPXjek0Y33X3oEsci6S23t8UdhTmgmHvYkDalWQM0BG7Af5h14D0rS5feeajPw== Content-Type: multipart/alternative; boundary="------------Z09Q7yBuiD001XQkUOdkWEPp" Message-ID: <23c7faa0-9691-471f-a888-ab25472fec3b@reifenberger.com> Date: Sun, 13 Apr 2025 13:06:42 +0200 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 User-Agent: Mozilla Thunderbird Subject: Re: git: adad92981419 - main - Fix build under current. To: Warner Losh , Michael Reifenberger Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202504101341.53ADfEP0023340@gitrepo.freebsd.org> Content-Language: en-US From: mike new In-Reply-To: X-Spamd-Result: default: False [0.31 / 15.00]; NEURAL_SPAM_LONG(0.98)[0.982]; NEURAL_SPAM_MEDIUM(0.86)[0.855]; NEURAL_HAM_SHORT(-0.72)[-0.723]; DMARC_POLICY_ALLOW(-0.50)[reifenberger.com,reject]; ONCE_RECEIVED(0.20)[]; R_DKIM_ALLOW(-0.20)[reifenberger.com:s=nov24ed,reifenberger.com:s=nov24rsa]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; ASN(0.00)[asn:197540, ipnet:94.16.108.0/22, country:DE]; FREEFALL_USER(0.00)[mike]; RCVD_TLS_ALL(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[reifenberger.com:+] X-Rspamd-Queue-Id: 4Zb71P4stNz3RYS X-Spamd-Bar: / This is a multi-part message in MIME format. --------------Z09Q7yBuiD001XQkUOdkWEPp Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi Warner, sorry for the disturbance. In the first place I was astonished because of the revertion request. The commit is a WIP which was meant to get the rescue image to a buildable state. The final goal is to get a rescue image which works for BIOS and UEFI. While the I found that in its current state nanobsd.sh unmodified doesn't produce a image at all because the FS is too big for the defasult NANO_MEDIASIZE. So I would propose at least: - decrease the size and speed up the build - increase the image size  to fit the build diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 4ba35ffeb04d..8877ee3bb3b5 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -79,7 +79,11 @@ CONF_BUILD=' '  CONF_INSTALL=' '  # Options to put in make.conf during both build- & installworld. -CONF_WORLD=' ' +CONF_WORLD=' +WITHOUT_TESTS=true +WITHOUT_DEBUG_FILES=true +WITHOUT_KERNEL_SYMBOLS=true +'  # Kernel config file to use  NANO_KERNEL=GENERIC @@ -104,7 +108,7 @@ NANO_NEWFS="-b 4096 -f 512 -i 8192 -U"  NANO_DRIVE=ada0  # Target media size in 512 bytes sectors -NANO_MEDIASIZE=2000000 +NANO_MEDIASIZE=6000000  # Number of code images on media (1 or 2)  NANO_IMAGES=2 Greetings --- Michael On 4/11/25 00:17, Warner Losh wrote: > 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 PM 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 AM Michael Reifenberger wrote: >>> The branch main has been updated by mr: >>> >>> URL:https://cgit.FreeBSD.org/src/commit/?id=adad9298141964ca38e21a05c0b8951efbcb70b2 >>> >>> 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/rescue/common >>> index 5fcf5c19b882..15bf10f5e67d 100644 >>> --- a/tools/tools/nanobsd/rescue/common >>> +++ b/tools/tools/nanobsd/rescue/common >>> @@ -1,15 +1,15 @@ >>> # >>> # >>> -NANO_SRC=$(pwd) >>> -NANO_SRC=${NANO_SRC%/tools/tools/nanobsd/rescue} >>> -NANO_OBJ=${NANO_SRC}/../nanobsd-builds/${NANO_NAME}/obj >>> +#NANO_SRC=$(pwd) >>> +#NANO_SRC=${NANO_SRC%/tools/tools/nanobsd/rescue} >>> +#NANO_OBJ=${NANO_SRC}/../nanobsd-builds/${NANO_NAME}/obj >>> NANO_TOOLS=`pwd` >>> NANO_PACKAGE_DIR=`pwd`/Pkg >>> NANO_RAM_TMPVARSIZE=40960 >>> NANO_PMAKE="make -j 8" >>> NANO_LABEL="rescue" >>> NANO_RAM_TMPVARSIZE=40960 >>> -NANO_MEDIASIZE="3932160" >>> +NANO_MEDIASIZE="6000000" >>> NANO_SECTS="63" >>> NANO_HEADS="16" >>> NANO_IMAGES="2" @@ -31,10 +31,12 @@ CONF_INSTALL=' CONF_WORLD=' CFLAGS=-O -pipe # >>> We do not need these for rescue -WITHOUT_LIB32=true >>> WITHOUT_TESTS=true -WITHOUT_DEBUG_FILES=t -WITHOUT_KERNEL_SYMBOLS=t >>> +WITHOUT_DEBUG_FILES=true +WITHOUT_KERNEL_SYMBOLS=true >>> +WITHOUT_CLANG_FULL=true +WITH_CLANG_EXTRAS=true +WITHOUT_LIB32=true >>> ' # 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} --------------Z09Q7yBuiD001XQkUOdkWEPp Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit

Hi Warner,

sorry for the disturbance.

In the first place I was astonished because of the revertion request.

The commit is a WIP which was meant to get the rescue image to a buildable state.

The final goal is to get a rescue image which works for BIOS and UEFI.


While the I found that in its current state nanobsd.sh unmodified doesn't produce a image at all because the FS is too big for the defasult NANO_MEDIASIZE.

So I would propose at least:

- decrease the size and speed up the build
- increase the image size  to fit the build


diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh
index 4ba35ffeb04d..8877ee3bb3b5 100755
--- a/tools/tools/nanobsd/defaults.sh
+++ b/tools/tools/nanobsd/defaults.sh
@@ -79,7 +79,11 @@ CONF_BUILD=' '
 CONF_INSTALL=' '
 
 # Options to put in make.conf during both build- & installworld.
-CONF_WORLD=' '
+CONF_WORLD='
+WITHOUT_TESTS=true
+WITHOUT_DEBUG_FILES=true
+WITHOUT_KERNEL_SYMBOLS=true
+'
 
 # Kernel config file to use
 NANO_KERNEL=GENERIC
@@ -104,7 +108,7 @@ NANO_NEWFS="-b 4096 -f 512 -i 8192 -U"
 NANO_DRIVE=ada0
 
 # Target media size in 512 bytes sectors
-NANO_MEDIASIZE=2000000
+NANO_MEDIASIZE=6000000
 
 # Number of code images on media (1 or 2)
 NANO_IMAGES=2


Greetings

---

Michael


On 4/11/25 00:17, Warner Losh wrote:
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 PM 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 AM Michael Reifenberger <mr@freebsd.org> wrote:

The branch main has been updated by mr:

URL: https://cgit.FreeBSD.org/src/commit/?id=adad9298141964ca38e21a05c0b8951efbcb70b2

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/rescue/common
index 5fcf5c19b882..15bf10f5e67d 100644
--- a/tools/tools/nanobsd/rescue/common
+++ b/tools/tools/nanobsd/rescue/common
@@ -1,15 +1,15 @@
 #
 #
-NANO_SRC=$(pwd)
-NANO_SRC=${NANO_SRC%/tools/tools/nanobsd/rescue}
-NANO_OBJ=${NANO_SRC}/../nanobsd-builds/${NANO_NAME}/obj
+#NANO_SRC=$(pwd)
+#NANO_SRC=${NANO_SRC%/tools/tools/nanobsd/rescue}
+#NANO_OBJ=${NANO_SRC}/../nanobsd-builds/${NANO_NAME}/obj
 NANO_TOOLS=`pwd`
 NANO_PACKAGE_DIR=`pwd`/Pkg
 NANO_RAM_TMPVARSIZE=40960
 NANO_PMAKE="make -j 8"
 NANO_LABEL="rescue"
 NANO_RAM_TMPVARSIZE=40960
-NANO_MEDIASIZE="3932160"
+NANO_MEDIASIZE="6000000"
 NANO_SECTS="63"
 NANO_HEADS="16"
 NANO_IMAGES="2"
@@ -31,10 +31,12 @@ CONF_INSTALL='
 CONF_WORLD='
 CFLAGS=-O -pipe
 # We do not need these for rescue
-WITHOUT_LIB32=true
 WITHOUT_TESTS=true
-WITHOUT_DEBUG_FILES=t
-WITHOUT_KERNEL_SYMBOLS=t
+WITHOUT_DEBUG_FILES=true
+WITHOUT_KERNEL_SYMBOLS=true
+WITHOUT_CLANG_FULL=true
+WITH_CLANG_EXTRAS=true
+WITHOUT_LIB32=true
 '

 # 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}


    

  


--------------Z09Q7yBuiD001XQkUOdkWEPp--