From nobody Mon May 26 17:43:59 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 4b5jmw1H3kz5wZyY; Mon, 26 May 2025 17:44:00 +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 4b5jmv6pgGz4358; Mon, 26 May 2025 17:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748281440; 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=b881IPyI+7SRJk46XJcbKmISndzE5WRfQymn0AQbtFw=; b=sCDQfYsUBOhTMbsaRa0CL88R2XZfuHId5J2ijMoIAKthE13x8Nxx4MbHt8us8O4wJKyMCp di4USX3zuL/cztEYVnYrkAOMXWR7X4QbnPl8eSbHr+tQ+Adb3heYIliftVT98KK4YiQVZ6 Z4n+lFevCQoj/OfHopL6qhrzFyKxF++sTJkHiTZzKD09kXWx5oqRj9Or8VOmIKU7TS9YT8 lmBlqdtD/7PiDyDuAkpO+pSncYpFWVh3Xv7LVON57ORlx47VwpKA8Bys/3aw/fTCLWnL1W T69vYIQ4t3rDlhqkHRiqaoifhnyO2aXmCO90OmfmjzioW7GA9dr5Yu8L1I0GSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748281440; 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=b881IPyI+7SRJk46XJcbKmISndzE5WRfQymn0AQbtFw=; b=M/DI+bx9caxioX5UxSOlQkqjsrMYd8IfGhpIoou7JYco4YhO9q/D3tucSZXKset2tOR0Z+ /vqQUjpTmRp+7g2BuTU6OJ4y6QNhSJAj2xcXtDvXcH1eS+tTtqwYwP2gau7f3ToS/DNlKN A2LB5KUDAtO6HBH/Jx3t+bwhNg3xEb0ra9FjHk98AEGMpUjBdH7jZnk7RtecdBIJeeeibR d6hAhL/BJ3ZQ4uMDA1uGmP5UMlj4kYeNz9TErG3KxpumyQILytmW5GNGoAf9b5MyQerHbV 6ibI7TsADXz+DK+5F4pIKjkwaBwdlcuMS6fkJVJVduQC0dYAn9wz1C5jQrXHnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748281440; a=rsa-sha256; cv=none; b=ptgTpYp1f39Tfu6NqCSQFlWvCMI2fgyojdcdy/xy2XfqLUeMR1AitLt4hE6vqHdOZPY6gt LFfgzi/ydDEx11AdNET0Tc4GY2crLHFtG4G6gRe2A602B3VNIEsc/gEqxr20eY2/8mPfqA VqlnF5kuy1kD4xndou4HK08TZXKF+cVZuSM6j3F2TKYWP4MfIC4aLcusxufWQogwoRGtKC HB57oYh5HZ/vOEq6VFjpSztIFtPp3c1bGRfrEr8d0U4zQiMzHx7fjyCoFDSrYxoaolk2kU Dj+3apHw6dKS02LR2+DMpcJVcAkTyUjDXPgxY62rBIMA8x+13L7h4JkG5OuUdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b5jmv6Bytz2KN; Mon, 26 May 2025 17:43:59 +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 54QHhxUN089893; Mon, 26 May 2025 17:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QHhx32089890; Mon, 26 May 2025 17:43:59 GMT (envelope-from git) Date: Mon, 26 May 2025 17:43:59 GMT Message-Id: <202505261743.54QHhx32089890@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: 79537a90dc36 - main - release: Add some comments and tidy dist set targets 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 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: 79537a90dc36a29b1c99c995651f4d7f98964af3 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=79537a90dc36a29b1c99c995651f4d7f98964af3 commit 79537a90dc36a29b1c99c995651f4d7f98964af3 Author: Ed Maste AuthorDate: 2025-05-21 13:36:46 +0000 Commit: Ed Maste CommitDate: 2025-05-26 17:43:28 +0000 release: Add some comments and tidy dist set targets Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50458 --- release/Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/release/Makefile b/release/Makefile index cf941534995b..a9a8d0f04605 100644 --- a/release/Makefile +++ b/release/Makefile @@ -132,7 +132,10 @@ beforeclean: .include clean: beforeclean -base.txz: +# +# Legacy distribution tarballs +# +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} ) # Bootstrap etcupdate(8) database. @@ -149,7 +152,7 @@ base.txz: ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT packageworld DISTDIR=${.OBJDIR}/${DISTDIR} ) mv ${DISTDIR}/*.txz . -kernel.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} ) @@ -171,6 +174,10 @@ ports.txz: --exclude usr/ports/distfiles --exclude usr/ports/packages \ --exclude 'usr/ports/INDEX*' --exclude work usr/ports ) +packagesystem: ${DISTRIBUTIONS} + sh ${.CURDIR}/scripts/make-manifest.sh $$(ls *.txz | grep -v container) > MANIFEST + touch ${.TARGET} + .if defined(PKGBASE) PKGBASE_REPO= pkgbase-repo PKG_ABI= $$(${PKG_CMD} -o ABI_FILE=${.TARGET}/usr/bin/uname config ABI) @@ -361,10 +368,6 @@ mini-memstick: mini-memstick.img mini-memstick.img: bootonly-memstick cd bootonly-memstick && sh ${.CURDIR}/${TARGET}/make-memstick.sh ./METALOG ../${.TARGET} -packagesystem: ${DISTRIBUTIONS} - sh ${.CURDIR}/scripts/make-manifest.sh $$(ls *.txz | grep -v container) > MANIFEST - touch ${.TARGET} - pkg-stage: dvd .if !defined(NOPKG) || empty(NOPKG) env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \