From nobody Tue Jul 15 05:12:54 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 4bh6lB4vLQz61whL; Tue, 15 Jul 2025 05:12:54 +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 4bh6lB2F0rz3mF5; Tue, 15 Jul 2025 05:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752556374; 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=AbCkLv4kB93zJCx7yFinmbJcgNxSQ9ZamI28HRKIXcY=; b=liztwkzecq4/10VrEDMP+5Jt5qc0CBbknTnYQ7GnSsEEZ1NFJSPwo9Nl5b1KUX0uubomPw avfog6QM7oL3Jub0v78LLNacm5TDX2BDMCEwuJsy0BsoGwh4CIi3+OPy5eHyC1CxXgDBM/ SQ7j30m2V+f7RmR/tbBAgHeDi3+vyIvVNOJ5n9LzQE1b6qpv9wHpuc6BLiVT3/4KlRYc0Z EBJi333u1u+lbbaCHXYKzEGq7+bOxCXNW/dRirguQUaPqZ786BHPdLt2+qLrtkB1zuyEVm 5ldr30H8dyK2oPBpvDdHBucpYQ+heOeDn5F4LF+w1/5yLrS8GmdNQKfKHDk5RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752556374; 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=AbCkLv4kB93zJCx7yFinmbJcgNxSQ9ZamI28HRKIXcY=; b=FBEG1NNmF8N6UA7RhN/QYN6LZb4ciPfYO41BYF79E4PRRY3lZzHOSPLCn6waTIa3G/yrwg 9ja1g84ybDBZ2C8aIRuK/9SgB0x1bqRE6cUg77DNG/oKifJUVz1Qk/qzhxUeWtMyPyLSQ/ XxfC3Hh+LyEt6CNgge72BTbSmfVafO1kjrhCllJgKmtWTwvXYjGjrtviKHAAhgC//ZC13f GbPYRU9Jk8VkbDfntFGRlP5zMBFRIXo/wK0c0r4ClVf0TgEs6q6qv+Ap9pNQoAJ66jw4En 1GGU02Llr7bXkSoN1cd6HmgjPxaImBcY7IKpp25ERHqYAsb6N35s/5krMQd6Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752556374; a=rsa-sha256; cv=none; b=NJc9h2/DqW7qYiJvUXWAfkLcUHT4qYKjgEowC8GlVqbUKzBDR1Z85C1Dy8i8cFQ5fHcOcK lpya53MIQGpuof3OKKo5kKFUDy91zDV6xwhyBs/i3f8Lp6gN4YY4xf/coGOtKpLcMzIFIU 4yfUgiCO6KJ8pbf/hszhdfNJ9YMZueWSaTgVKVGq6IItzJu17ZoerT3aQWfbY6CGwdyoMD LU/gLpXch8us5Z1g1BelF3CxGQ4o+a1jr8vKjMdVFcMxp6kON6mahRcEvAaRPSCvJQjGXc U6CK1Nmvoc6T2I3gSay5fJ6RmBAyButz79olfNOXyj/qd7T3A8M/ZnXGGqCyBw== 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 4bh6lB1r72z9jP; Tue, 15 Jul 2025 05:12:54 +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 56F5Cs9e079736; Tue, 15 Jul 2025 05:12:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56F5Csa7079733; Tue, 15 Jul 2025 05:12:54 GMT (envelope-from git) Date: Tue, 15 Jul 2025 05:12:54 GMT Message-Id: <202507150512.56F5Csa7079733@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: f75b20e7ddb8 - main - packages: make UCL files required 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f75b20e7ddb86a68e0c7bd1d96de523f27fc4182 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=f75b20e7ddb86a68e0c7bd1d96de523f27fc4182 commit f75b20e7ddb86a68e0c7bd1d96de523f27fc4182 Author: Lexi Winter AuthorDate: 2025-07-07 13:37:19 +0000 Commit: Lexi Winter CommitDate: 2025-07-15 05:12:44 +0000 packages: make UCL files required Modify template.ucl to require that the "all" UCL file exists for every package. This prevents packages being added accidentally, and ensures each package has as least a perfunctory comment and description. Add missing UCL files for all existing packages. Modify special packages created by Makefile.inc1 to pass the appropriate parameters to generate-ucl to find their UCL files. Reviewed by: des, bapt Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50281 --- Makefile.inc1 | 24 ++++++++++++------------ release/packages/generate-ucl.sh | 10 ++++++++++ release/packages/template.ucl | 2 +- release/packages/ucl/ccdconfig-all.ucl | 5 +++++ release/packages/ucl/ctl-all.ucl | 4 ++++ release/packages/ucl/dtb-all.ucl | 4 ++++ release/packages/ucl/elftoolchain-all.ucl | 4 ---- release/packages/ucl/fd-all.ucl | 4 ++++ release/packages/ucl/ipf-all.ucl | 4 ++++ release/packages/ucl/ipfw-all.ucl | 4 ++++ release/packages/ucl/iscsi-all.ucl | 6 ++++++ release/packages/ucl/kernel-all.ucl | 4 ++-- release/packages/ucl/lib9p-all.ucl | 5 +++++ release/packages/ucl/libarchive-all.ucl | 4 ++++ release/packages/ucl/libbegemot-all.ucl | 5 +++++ release/packages/ucl/libblocksruntime-all.ucl | 4 ++++ release/packages/ucl/libbsdstat-all.ucl | 5 +++++ release/packages/ucl/libbsm-all.ucl | 6 ++++++ release/packages/ucl/libbz2-all.ucl | 5 +++++ release/packages/ucl/libcasper-all.ucl | 5 +++++ release/packages/ucl/libcompat-all.ucl | 4 ++++ release/packages/ucl/libcompiler_rt-all.ucl | 4 ++++ release/packages/ucl/libcuse-all.ucl | 5 +++++ release/packages/ucl/libdwarf-all.ucl | 6 ++++++ release/packages/ucl/libevent1-all.ucl | 4 ++++ release/packages/ucl/libexecinfo-all.ucl | 5 +++++ release/packages/ucl/libipt-all.ucl | 6 ++++++ release/packages/ucl/libldns-all.ucl | 6 ++++++ release/packages/ucl/liblzma-all.ucl | 5 +++++ release/packages/ucl/libmagic-all.ucl | 5 +++++ release/packages/ucl/libpathconv-all.ucl | 5 +++++ release/packages/ucl/librpcsec_gss-all.ucl | 5 +++++ release/packages/ucl/librss-all.ucl | 5 +++++ release/packages/ucl/libsdp-all.ucl | 5 +++++ release/packages/ucl/libsqlite3-all.ucl | 4 ++++ release/packages/ucl/libstdbuf-all.ucl | 6 ++++++ release/packages/ucl/libstdthreads-all.ucl | 4 ++++ release/packages/ucl/libthread_db-all.ucl | 5 +++++ release/packages/ucl/libucl-all.ucl | 5 +++++ release/packages/ucl/libufs-all.ucl | 8 ++++++++ release/packages/ucl/libvgl-all.ucl | 13 +++++++++++++ release/packages/ucl/libvmmapi-all.ucl | 4 ++++ release/packages/ucl/liby-all.ucl | 5 +++++ release/packages/ucl/libyaml-all.ucl | 5 +++++ release/packages/ucl/libzfs-all.ucl | 5 +++++ release/packages/ucl/lld-all.ucl | 5 +++++ release/packages/ucl/lldb-all.ucl | 5 +++++ release/packages/ucl/locales-all.ucl | 4 ++++ release/packages/ucl/natd-all.ucl | 4 ++++ release/packages/ucl/pf-all.ucl | 4 ++++ release/packages/ucl/ppp-all.ucl | 5 +++++ release/packages/ucl/quotacheck-all.ucl | 8 ++++++++ release/packages/ucl/src-all.ucl | 5 +++++ release/packages/ucl/src-sys-all.ucl | 5 +++++ release/packages/ucl/syscons-all.ucl | 4 ---- release/packages/ucl/syscons-data-all.ucl | 4 ++++ release/packages/ucl/toolchain-all.ucl | 4 ++++ release/packages/ucl/vt-all.ucl | 4 ---- release/packages/ucl/vt-data-all.ucl | 4 ++++ release/packages/ucl/zoneinfo-all.ucl | 5 +++++ 60 files changed, 291 insertions(+), 27 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d366be09f497..010f5ac2bb55 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2130,11 +2130,10 @@ create-source-src-package: _pkgbootstrap .PHONY PKGNAME "src" \ PKGGENNAME "src" \ VERSION "${PKG_VERSION}" \ - DESC "FreeBSD Kernel Sources" \ - COMMENT "FreeBSD Userland Sources" \ PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ PKG_MAINTAINER "${PKG_MAINTAINER}" \ PKG_WWW "${PKG_WWW}" \ + UCLFILES "${SRCDIR}/release/packages/ucl" \ ${SRCDIR}/release/packages/template.ucl \ ${SSTAGEDIR}/src.ucl ${PKG_CMD} -o ABI=${PKG_ABI} \ @@ -2155,13 +2154,12 @@ create-source-src-sys-package: _pkgbootstrap .PHONY > ${SSTAGEDIR}/src-sys.plist ${SRCDIR}/release/packages/generate-ucl.lua \ PKGNAME "src-sys" \ - PKGGENNAME "src" \ + PKGGENNAME "src-sys" \ VERSION "${PKG_VERSION}" \ - DESC "FreeBSD Kernel Sources" \ - COMMENT "FreeBSD Kernel Sources" \ PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ PKG_MAINTAINER "${PKG_MAINTAINER}" \ PKG_WWW "${PKG_WWW}" \ + UCLFILES "${SRCDIR}/release/packages/ucl" \ ${SRCDIR}/release/packages/template.ucl \ ${SSTAGEDIR}/src-sys.ucl ${PKG_CMD} -o ABI=${PKG_ABI} \ @@ -2226,12 +2224,12 @@ create-dtb-package: @if [ -f ${KSTAGEDIR}/${DISTDIR}/dtb.plist ]; then \ ${SRCDIR}/release/packages/generate-ucl.lua \ PKGNAME "dtb" \ + PKGGENNAME "dtb" \ VERSION "${PKG_VERSION}" \ - COMMENT "FreeBSD Devicetree Blobs" \ - DESC "FreeBSD Devicetree Blobs" \ PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ PKG_MAINTAINER "${PKG_MAINTAINER}" \ PKG_WWW "${PKG_WWW}" \ + UCLFILES "${SRCDIR}/release/packages/ucl" \ ${SRCDIR}/release/packages/template.ucl \ ${KSTAGEDIR}/${DISTDIR}/dtb.ucl ; \ awk -F\" ' \ @@ -2257,13 +2255,15 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap -v kernel=yes -v _kernconf=${INSTALLKERNEL} ; \ ${SRCDIR}/release/packages/generate-ucl.lua \ PKGNAME "kernel-${INSTALLKERNEL:tl}${flavor}" \ + PKGGENNAME "kernel" \ VERSION "${PKG_VERSION}" \ KERNELDIR "kernel" \ - COMMENT "FreeBSD ${INSTALLKERNEL} kernel ${flavor}" \ - DESC "FreeBSD ${INSTALLKERNEL} kernel ${flavor}" \ + KERNEL_NAME "${INSTALLKERNEL}" \ + KERNEL_FLAVOR "${flavor}" \ PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ PKG_MAINTAINER "${PKG_MAINTAINER}" \ PKG_WWW "${PKG_WWW}" \ + UCLFILES "${SRCDIR}/release/packages/ucl" \ ${SRCDIR}/release/packages/template.ucl \ ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ awk -F\" ' \ @@ -2296,14 +2296,14 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne PKGNAME "kernel-${_kernel:tl}${flavor}" \ PKGGENNAME "kernel" \ FORCEINCLUDE "kernel${flavor}" \ - UCLFILES "${SRCDIR}/release/packages/" \ VERSION "${PKG_VERSION}" \ + KERNEL_NAME "${_kernel:tl}" \ + KERNEL_FLAVOR "${flavor}" \ KERNELDIR "kernel.${_kernel}" \ - DESC "FreeBSD ${_kernel} kernel ${flavor}" \ - COMMENT "FreeBSD ${_kernel} kernel ${flavor}" \ PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ PKG_MAINTAINER "${PKG_MAINTAINER}" \ PKG_WWW "${PKG_WWW}" \ + UCLFILES "${SRCDIR}/release/packages/ucl" \ ${SRCDIR}/release/packages/template.ucl \ ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ awk -F\" ' \ diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 6a64fc78a3b1..3d3f67ed365c 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -5,6 +5,10 @@ mancx=" (manual pages)" mandx="This package contains the online manual pages." +lib32mancx=" (32-bit manual pages)" +lib32mandx="This package contains the online manual pages for 32-bit components +on a 64-bit host." + lib32cx=" (32-bit libraries)" lib32dx="This package contains 32-bit libraries for running 32-bit applications on a 64-bit host." @@ -113,6 +117,12 @@ main() { desc_suffix="$dbg32dx" pkgdeps="${outname}" ;; + *-man-lib32) + outname="${outname%%-man-lib32}" + comment_suffix="$lib32mancx" + desc_suffix="$lib32mandx" + pkgdeps="${outname}" + ;; *-lib32) outname="${outname%%-lib32}" comment_suffix="$lib32cx" diff --git a/release/packages/template.ucl b/release/packages/template.ucl index 982641305ad6..faa48effe1ad 100644 --- a/release/packages/template.ucl +++ b/release/packages/template.ucl @@ -14,6 +14,6 @@ licenses = [ BSD2CLAUSE ] desc = <