From nobody Tue May 27 19:54:57 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 4b6Ndb4Fk9z5xqK3; Tue, 27 May 2025 19:54:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6NdZ3Lnnz43pV; Tue, 27 May 2025 19:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748375698; 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=2VL1QbMYISihxl16I1B6paaQkzu6IE1X7CN6XwDEeHI=; b=ptY0804wfd3a84xx6pnmJcsqMc0kDM8QNeYXTdVZonaVxRFnwlAQgWiAeGj3hX9TvlWuY/ s7ruGNCYc5Hnk8C7j2Nj1RgIimA3T+0V8DjZR0shrpzF+8rWcF+w2tJS/Fixa8La+Wo6/V URWsbN3WQSSvnrbRPQIlXsWG+oNmSONZtfScE0PXgPl2f0StKioyD6GLCKmBtSRdys3bn/ hNBUkhDhyikD9pIZNOcMTPD2A+qkMR+uJA+reCTLfu6vO+ie8Z6cYqGDwJer+NKmt8xxJU mEnKaB/5Kiav+Ky3+K9iSCNx2NWR66PRT8dSWFx/n1ElHqXtnardttJJDcGKZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748375698; a=rsa-sha256; cv=none; b=iCc6TJh32JIVozhrpM6sE847LRcKQ7C4FN8ndcAjHKh6d6QW/qZ5BbXRvEgtHgwyLgKlw8 5og+Q0Chfc0tCHb6Py8859pfOitiLi7reFcBqBkR9wz6XwhLhQRxcapaEJPkBbu36Q8Acb H6TuH1jgpfdX/i9tzsha7NpVm7YIXROhA/zn4lMWguAkKXYARZZ3haA6YFu0K/0jTtjD4m Td1EpCrZzcN561bXCeXU7WMnRg4SkwpnDQAn5vhtTOMrqLLnnshr/DYGe0NSmWSlK38SRU kNaYBRgATrfbdQc3zTB5FVBS/y17TQ875wqkq+PWIXcv0pyy+Emoua/D9a1hFQ== 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=1748375698; 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=2VL1QbMYISihxl16I1B6paaQkzu6IE1X7CN6XwDEeHI=; b=xraPvW0uZUfkoL4AdejV1oPyWpU04FK9g/O5d/Ff6qUHcypdGdJy0/V5h2ArW3M4uQwmed lC9OKZUAO0qai1VHUk5aUeWFUBey9WOE1vzIheueRADeg1qCChzfbcju+2c9bVBx4VGtCX nWCSAuSt5iezEo24wvY6qcwmYDr5Xny5TjlK4voBMBN3EF0LOjsiTZDM2dA7ZpXMpyld1y iZUSzCi6xBcPHV7q5cvvkMqaU+FhDN7Rg3hx2nFVh6eZA/CbAUEVfIsasAKVJwWiPVKbln cKLirabPRp0fUKjmDbbdxcHjW5l1UXErd0Z3x2jWaDduUZD2EqkkQck76cW56Q== 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 4b6NdY5Nrzz15bG; Tue, 27 May 2025 19:54:57 +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 54RJsvIB028992; Tue, 27 May 2025 19:54:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RJsvsS028989; Tue, 27 May 2025 19:54:57 GMT (envelope-from git) Date: Tue, 27 May 2025 19:54:57 GMT Message-Id: <202505271954.54RJsvsS028989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a49621c1d025 - main - release: Move -DNO_ROOT and -DDB_FROM_SRC into ${IMAKE} 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a49621c1d02509fe9121b76e76656cd3a349f0b9 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a49621c1d02509fe9121b76e76656cd3a349f0b9 commit a49621c1d02509fe9121b76e76656cd3a349f0b9 Author: Ed Maste AuthorDate: 2025-05-14 19:39:53 +0000 Commit: Ed Maste CommitDate: 2025-05-27 19:54:07 +0000 release: Move -DNO_ROOT and -DDB_FROM_SRC into ${IMAKE} All invocations specified -DNO_ROOT, so simplify by moving -DNO_ROOT directly into ${IMAKE}. Do the same for -DDB_FROM_SRC. Although it was not previously passed for all targets it is appropriate for all release artifact builds. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50356 --- release/Makefile | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/release/Makefile b/release/Makefile index a9a8d0f04605..a7549284ac35 100644 --- a/release/Makefile +++ b/release/Makefile @@ -53,7 +53,8 @@ TARGET_ARCH= ${MACHINE_ARCH} TARGET_ARCH= ${TARGET} .endif .endif -IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} +IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} \ + -DNO_ROOT -DDB_FROM_SRC DISTDIR= dist # Define OSRELEASE by using newvers.sh @@ -137,7 +138,7 @@ clean: beforeclean # base.txz: # Also (if enabled) tests, compat libs, and -dbg variants for all. mkdir -p ${DISTDIR} - ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT distributeworld DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${.OBJDIR}/${DISTDIR} ) # Bootstrap etcupdate(8) database. sh ${WORLDDIR}/usr.sbin/etcupdate/etcupdate.sh extract -B \ -m "${MAKE}" -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \ @@ -149,13 +150,13 @@ base.txz: # Also (if enabled) tests, compat libs, and -dbg variants for all. env -i LC_COLLATE=C sort >> ${.OBJDIR}/${DISTDIR}/base.meta rm ${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate/current/METALOG # Package all components - ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT packageworld DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${.OBJDIR}/${DISTDIR} ) mv ${DISTDIR}/*.txz . kernel.txz: # Also (if enabled) kernel-dbg.txz. mkdir -p ${DISTDIR} - ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT distributekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) - ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT packagekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} distributekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} packagekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) mv ${DISTDIR}/kernel*.txz . src.txz: @@ -196,8 +197,7 @@ disc1: packagesystem ${PKGBASE_REPO} ${_ALL_LIBCOMPATS:@v@MK_LIB$v=no@} \ MK_TOOLCHAIN=no \ MK_RESCUE=no MK_DICT=no \ - MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \ - -DDB_FROM_SRC -DNO_ROOT) + MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no) .if defined(PKGBASE) # Create offline pkgbase repo on release media mkdir -p ${.TARGET}/usr/freebsd-packages/repos/ @@ -258,8 +258,7 @@ bootonly: packagesystem ${_ALL_LIBCOMPATS:@v@MK_LIB$v=no@} \ MK_TOOLCHAIN=no \ MK_RESCUE=no MK_DICT=no \ - MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \ - -DDB_FROM_SRC -DNO_ROOT) + MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no) # Copy manifest only (no distfiles) to get checksums mkdir -p ${.TARGET}/usr/freebsd-dist cp MANIFEST ${.TARGET}/usr/freebsd-dist @@ -290,8 +289,7 @@ dvd: packagesystem ${PKGBASE_REPO} mkdir -p ${.TARGET} ( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \ DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no \ - MK_TESTS=no MK_DEBUG_FILES=no \ - -DDB_FROM_SRC -DNO_ROOT) + MK_TESTS=no MK_DEBUG_FILES=no) .if defined(PKGBASE) # Create offline pkgbase repo on release media mkdir -p ${.TARGET}/usr/freebsd-packages/repos/