From nobody Thu Apr 10 13:41:14 2025 X-Original-To: dev-commits-src-all@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 4ZYLZ25yWGz5syZX; Thu, 10 Apr 2025 13:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZYLZ25NYvz40wH; Thu, 10 Apr 2025 13:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744292474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TF3l6PkXqpnfpBjW8gzC56NOJR9myubXA6eiQgo8XGM=; b=Yrb1yxQwIw1a9Ha1o5W3IE57IcRQLQiJ1To5ht73/L5jgxzyrYUJ6REFFAyQfmBJRxUvKA 0G/DuVjs7KoBZmFvaqWBFn/yb1X3B49+UQPohGUqchcz/F0dNsjVW8baGhBkrjaj6vMEdU JZx+beL497o2gX4tO7BonzMkUmGljfsgQbTAnLQNCyJwB7rQNGgAjeBbqdb83nMFuzFAiB bvzqU9Emj2Lc+5u7MsMU7PaVn7hTB9yvfyaUnv6QN4rn0dTqy77IVEk++jc6tzLHYq/d4L Vy633PDGXjejgrRR8sLagFPvSAbb0Bbi0+KJdfbWh1OCk8B/RXF2Jhz8vbXBkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744292474; a=rsa-sha256; cv=none; b=FtGw1BWekePqE33J3xRtbKXMCd5Dg8SpFQFK5oXbp9FIHpYDgayfVV0vcS2DbOkpZ2tksm m8Ql8zdCtGk1OVOaN0ctMX0yNf+m3u4BdnPzpJip4tQx7xg2sq9lBMEUH8S9SCyXLJxMR2 cNQ/IUnbxAJeLQ/Jto93zjQ+dl9t7JjeUvyBnchFJMmNKI9aQbfibLCT1aHsR6jB/Z0Tbj WlnG6nigJ2oT8FIKAuCygoAsQTaloz2cLRxIlIv1osNMqQQ9oU08kzWxRoriKkFWIr9unI wNDhrP6nbzWaCSydDm1vAdUeGlyDuQgzpjSK/Yfi5Cysx+u6rKoUW+1WY7NXwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744292474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TF3l6PkXqpnfpBjW8gzC56NOJR9myubXA6eiQgo8XGM=; b=JBCFU/ge7tIcVxVQSA6Sp/O+oOGwEYDH25LHHUs5sDsJVkfD+cmHDANRZ0QQgKS2IZWK/1 VpSVw1akfysy5HXsu58IgHNIA0vKZ9cKgrEGggrg6i3unC8lZkikJiKvDvsNTRD6h98XSA Cz4xp57pqf5cF9BuA1X3ZKOcut/X7XzwtItkp0DAJqjQsERIj0GD0fplndmmSTtI964/6i O3gk+XUQWe0hpt8W3WZIqhnx9xLWV+hvk5AmY5kCTFzv/GWNqHFE8aog0D4NVYTFifdw5F Bay6Bg3EvKBt9zC8Bla19YfjN0x7tITzBuk+A2tFQrmz6I1mb0HdgvYVVYCrVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZYLZ24yz2z14sG; Thu, 10 Apr 2025 13:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53ADfEv1023358; Thu, 10 Apr 2025 13:41:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53ADfEP0023340; Thu, 10 Apr 2025 13:41:14 GMT (envelope-from git) Date: Thu, 10 Apr 2025 13:41:14 GMT Message-Id: <202504101341.53ADfEP0023340@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Reifenberger Subject: git: adad92981419 - main - Fix build under current. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: adad9298141964ca38e21a05c0b8951efbcb70b2 Auto-Submitted: auto-generated 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}