LXOBxqDlLsX97gopBucpIP5y jm9isD+75WZPvt2a5vazvBHKpQ7KO3gc7npn66Al2hTN59BgT5LhsvDDXqgetQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752556373; a=rsa-sha256; cv=none; b=KmNNfRFFXEIGEVohzfBg8SJj5mhy4SnG/1jFiREWNXUi/XuuBvB4hZzySdliVU7QQSUhpO iBNWu8QydxShUwK1SjS99htzVt83yOriA48ki+1u2clhak6J38fmLC/ex7Xgk1reRCUjgg NQEhcP8NKtzAt4mYwV18vhDU5IXvdTu+31LLEltb5VIIJrCvEA1al1+a5ZobLx9fXHu7rf uhf2wrUHvONzsiCbwho+Qr57e3Odjss8ve8YaU5xkbROH7NWX2gWzI35LuvtxlgS0lTlRn jFioPkG9wQj/j+RehGzpc+B/AO7XuHH7CGv39YhgNKFtncPN1EFSuqFa9FEKaQ== 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 4bh6l91Hcxz9dh; Tue, 15 Jul 2025 05:12:53 +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 56F5CrIP079695; Tue, 15 Jul 2025 05:12:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56F5CrjN079691; Tue, 15 Jul 2025 05:12:53 GMT (envelope-from git) Date: Tue, 15 Jul 2025 05:12:53 GMT Message-Id: <202507150512.56F5CrjN079691@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: 29121751723a - main - packages: create UCL files for package descriptions 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29121751723a0ea1a357d32148165c416b0824ec Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=29121751723a0ea1a357d32148165c416b0824ec commit 29121751723a0ea1a357d32148165c416b0824ec Author: Lexi Winter AuthorDate: 2025-07-07 13:34:58 +0000 Commit: Lexi Winter CommitDate: 2025-07-15 05:12:44 +0000 packages: create UCL files for package descriptions Mechanically convert Makefile.package into individual UCL files for each package and delete it. Move handling of the 'comment' and 'desc' fields from generate-ucl.sh to template.ucl; this provides the default values for some packages which don't have a UCL file yet. Reviewed by: des, bapt, emaste Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50280 --- release/packages/Makefile.package | 191 ----------------------------- release/packages/generate-ucl.sh | 12 -- release/packages/template.ucl | 4 +- release/packages/ucl/acct-all.ucl | 4 + release/packages/ucl/acpi-all.ucl | 4 + release/packages/ucl/amd-all.ucl | 4 + release/packages/ucl/apm-all.ucl | 4 + release/packages/ucl/at-all.ucl | 4 + release/packages/ucl/audit-all.ucl | 4 + release/packages/ucl/autofs-all.ucl | 4 + release/packages/ucl/bhyve-all.ucl | 4 + release/packages/ucl/blocklist-all.ucl | 4 + release/packages/ucl/bluetooth-all.ucl | 4 + release/packages/ucl/bootloader-all.ucl | 4 + release/packages/ucl/bsdinstall-all.ucl | 4 + release/packages/ucl/bsnmp-all.ucl | 4 + release/packages/ucl/caroot-all.ucl | 4 + release/packages/ucl/certctl-all.ucl | 4 + release/packages/ucl/clang-all.ucl | 4 + release/packages/ucl/clibs-all.ucl | 4 + release/packages/ucl/console-tools-all.ucl | 4 + release/packages/ucl/cron-all.ucl | 4 + release/packages/ucl/csh-all.ucl | 4 + release/packages/ucl/ctf-tools-all.ucl | 4 + release/packages/ucl/cxgbe-tools-all.ucl | 4 + release/packages/ucl/devd-all.ucl | 4 + release/packages/ucl/devmatch-all.ucl | 4 + release/packages/ucl/dhclient-all.ucl | 4 + release/packages/ucl/dma-all.ucl | 4 + release/packages/ucl/docs-all.ucl | 4 + release/packages/ucl/dtrace-all.ucl | 4 + release/packages/ucl/dwatch-all.ucl | 4 + release/packages/ucl/ee-all.ucl | 4 + release/packages/ucl/efi-tools-all.ucl | 4 + release/packages/ucl/elftoolchain-all.ucl | 4 + release/packages/ucl/examples-all.ucl | 4 + release/packages/ucl/fetch-all.ucl | 4 + release/packages/ucl/firmware-iwm-all.ucl | 4 + release/packages/ucl/ftp-all.ucl | 4 + release/packages/ucl/ftpd-all.ucl | 4 + release/packages/ucl/fwget-all.ucl | 4 + release/packages/ucl/games-all.ucl | 4 + release/packages/ucl/geom-all.ucl | 4 + release/packages/ucl/ggate-all.ucl | 4 + release/packages/ucl/hast-all.ucl | 4 + release/packages/ucl/hostapd-all.ucl | 4 + release/packages/ucl/hyperv-tools-all.ucl | 4 + release/packages/ucl/inetd-all.ucl | 4 + release/packages/ucl/jail-all.ucl | 4 + release/packages/ucl/kerberos-all.ucl | 4 + release/packages/ucl/kerberos-lib-all.ucl | 4 + release/packages/ucl/kernel-all.ucl | 4 + release/packages/ucl/lp-all.ucl | 4 + release/packages/ucl/manuals-all.ucl | 4 + release/packages/ucl/mlx-tools-all.ucl | 4 + release/packages/ucl/mtree-all.ucl | 4 + release/packages/ucl/netmap-all.ucl | 4 + release/packages/ucl/newsyslog-all.ucl | 4 + release/packages/ucl/nfs-all.ucl | 4 + release/packages/ucl/ntp-all.ucl | 4 + release/packages/ucl/nuageinit-all.ucl | 4 + release/packages/ucl/nvme-tools-all.ucl | 4 + release/packages/ucl/openssl-all.ucl | 4 + release/packages/ucl/openssl-lib-all.ucl | 4 + release/packages/ucl/periodic-all.ucl | 4 + release/packages/ucl/pkg-bootstrap-all.ucl | 4 + release/packages/ucl/rc-all.ucl | 4 + release/packages/ucl/rcmds-all.ucl | 7 ++ release/packages/ucl/rdma-all.ucl | 1 + release/packages/ucl/rescue-all.ucl | 4 + release/packages/ucl/resolvconf-all.ucl | 4 + release/packages/ucl/runtime-all.ucl | 4 + release/packages/ucl/sendmail-all.ucl | 4 + release/packages/ucl/smbutils-all.ucl | 4 + release/packages/ucl/ssh-all.ucl | 4 + release/packages/ucl/syscons-all.ucl | 4 + release/packages/ucl/syslogd-all.ucl | 4 + release/packages/ucl/tcpd-all.ucl | 4 + release/packages/ucl/telnet-all.ucl | 4 + release/packages/ucl/tests-all.ucl | 4 + release/packages/ucl/ufs-all.ucl | 4 + release/packages/ucl/unbound-all.ucl | 4 + release/packages/ucl/utilities-all.ucl | 4 + release/packages/ucl/vi-all.ucl | 4 + release/packages/ucl/vt-all.ucl | 4 + release/packages/ucl/wpa-all.ucl | 4 + release/packages/ucl/zfs-all.ucl | 4 + 87 files changed, 338 insertions(+), 205 deletions(-) diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package deleted file mode 100644 index e00efed2af1b..000000000000 --- a/release/packages/Makefile.package +++ /dev/null @@ -1,191 +0,0 @@ -# -# - -acct_COMMENT= System Accounting Utilities -acct_DESC= System Accounting Utilities -acpi_COMMENT= ACPI Utilities -acpi_DESC= ACPI Utilities -amd_COMMENT= AMD Utilities -amd_DESC= AMD Utilities -apm_COMMENT= APM Utilities -apm_DESC= APM Utilities -at_COMMENT= AT Utilities -at_DESC= AT Utilities -audit_COMMENT= OpenBSM auditing utilities -audit_DESC= OpenBSM auditing utilities -autofs_COMMENT= Autofs Utilities -autofs_DESC= Autofs Utilities -bhyve_COMMENT= Bhyve Utilities -bhyve_DESC= Bhyve Utilities -blocklist_COMMENT= Blocklist Utilities -blocklist_DESC= Blocklist Utilities -bluetooth_COMMENT= Bluetooth Utilities -bluetooth_DESC= Bluetooth Utilities -bootloader_COMMENT= Bootloader -bootloader_DESC= Bootloader and configuration files -bsdinstall_COMMENT= BSDInstall Utilities -bsdinstall_DESC= BSDInstall Utilities -bsnmp_COMMENT= BSNMP Utilities -bsnmp_DESC= BSNMP Utilities -caroot_COMMENT= SSL Certificates -caroot_DESC= SSL Certificates -clang_COMMENT= Clang Utilities -clang_DESC= Clang Utilities -clibs_COMMENT= Core C Libraries -clibs_DESC= Core C Libraries -certctl_COMMENT= SSL Certificate Utility -certctl_DESC= SSL Certificate Utility -console-tools_COMMENT= Console Utilities -console-tools_DESC= Console Utilities -cron_COMMENT= cron(8) and crontab(1) -cron_DESC= cron(8) and crontab(1) -csh_COMMENT= C Shell -csh_DESC= C Shell -ctf-tools_COMMENT= CTF Utilities -ctf-tools_DESC= CTF Utilities -cxgbe-tools_COMMENT= Chelsio cxbge Utilities -cxgbe-tools_DESC= Chelsio cxbge Utilities -devd_COMMENT= Devd Utility and scripts -devd_DESC= Devd Utility and scripts -devmatch_COMMENT= Devmatch Utility -devmatch_DESC= Devmatch Utility -dhclient_COMMENT= DHCP Client -dhclient_DESC= DHCP Client -dma_COMMENT= DMA Mail Agent Utilities -dma_DESC= DMA Mail Agent Utilities -docs_COMMENT= Documentation -docs_DESC= Documentation -dtrace_COMMENT= Dtrace Utilities -dtrace_DESC= Dtrace Utilities -dwatch_COMMENT= Dwatch Utilities -dwatch_DESC= Dwatch Utilities -ee_COMMENT= Easy Editor Utilities -ee_DESC= Easy Editor Utilities -efi-tools_COMMENT= UEFI Utilities -efi-tools_DESC= UEFI Utilities -examples_COMMENT= Examples in /usr/share/examples -examples_DESC= Examples in /usr/share/examples -fd_COMMENT= Floppy disk support -fd_DESC= Floppy disk support -fetch_COMMENT= Fetch Utility -fetch_DESC= Fetch Utility -firmware-iwm_DESC= iwm(4) firmwares -firmware-iwm_COMMENT= iwm(4) firmwares -ftp_COMMENT= FTP Utilities -ftp_DESC= FTP Utilities -ftpd_COMMENT= FTP Daemon -ftpd_DESC= FTP Daemon -fwget_COMMENT= FWGET Utility -fwget_DESC= FWGET Utility -games_COMMENT= Games -games_DESC= Games -geom_COMMENT= GEOM Utilitites -geom_DESC= GEOM Utilitites -ggate_COMMENT= GEOM Gate Utilities -ggate_DESC= GEOM Gate Utilities -hast_COMMENT= Highly Available Storage daemon -hast_DESC= Highly Available Storage daemon -hostapd_COMMENT= 802.11 Access Point Daemon an Utilities -hostapd_DESC= 802.11 Access Point Daemon an Utilities -hyperv-tools_COMMENT= Microsoft HyperV Utilities -hyperv-tools_DESC= Microsoft HyperV Utilities -inetd_COMMENT= Internet super-server -inetd_DESC= Internet super-server -jail_COMMENT= Jail Utilities -jail_DESC= Jail Utilities -jail-debug_DESCR= Debugging Symbols -jail-development_DESCR=Development Files -jail-profile_DESCR= Profiling Libraries -jail-lib32_DESCR= 32-bit Libraries -jail-lib32-debug_DESCR=32-bit Debugging Symbols -jail-lib32-development_DESCR=32-bit Development Files -jail-lib32-profile_DESCR=32-bit Profiling Libraries -kerberos_COMMENT= Kerberos Utilities -kerberos_DESC= Kerberos Utilities -kerberos-lib_COMMENT= Kerberos Libraries -kerberos-lib_DESC= Kerberos Libraries -kernel_COMMENT= FreeBSD Kernel -kernel_DESC= FreeBSD Kernel -lp_COMMENT= Printer subsystem -lp_DESC= Printer subsystem -manuals_COMMENT= Manual Pages -manuals_DESC= Manual Pages -mlx-tools_COMMENT= Mellanox Utilities -mlx-tools_DESC= Mellanox Utilities -mtree_COMMENT= MTREE Files -mtree_DESC= MTREE Files -netmap_COMMENT= Netmap Library and Utilities -netmap_DESC= Netmap Library and Utilities -newsyslog_COMMENT= Newsyslog Utility -newsyslog_DESC= Newsyslog Utility -nfs_COMMENT= NFS Utilities -nfs_DESC= NFS Utilities -ntp_COMMENT= Network Time Protocol server and client -ntp_DESC= Network Time Protocol server and client -nuageinit_COMMENT= CloudInit support scripts -nuageinit_DESC= CloudInit support scripts -nvme-tools_COMMENT= NVME Utilities -nvme-tools_DESC= NVME Utilities -openssl_COMMENT= OpenSSL Utility -openssl_DESC= OpenSSL Utility -openssl-lib_COMMENT= OpenSSL Libraries -openssl-lib_DESC= OpenSSL Libraries -pkg-bootstrap_COMMENT= pkg bootstrap Utility -pkg-bootstrap_DESC= pkg bootstrap Utility -periodic_COMMENT= Periodic Utility -periodic_DESC= Periodic Utility -rc_COMMENT= RC Scripts -rc_DESC= RC Scripts -rcmds_COMMENT= BSD/SunOS remote status commands -rcmds_DESC=\ -The BSD/SunOS remote status commands, which can be used to query or interact\ -with remote hosts over the network. This includes the command-line utilities\ -rwho, ruptime, rup, rusers and rwall and the daemons rwhod, rpc.rstatd,\ -rpc.rusersd, and rpc.rwalld. -rdma_COMMENT= RDMA Utilities -rdma_DESC= RDMA Utilities -rescue_COMMENT= Rescue Utilities -rescue_DESC= Rescue Utilities -resolvconf_COMMENT= Resolvconf Utility and scripts -resolvconf_DESC= Resolvconf Utility and scripts -runtime_COMMENT= FreeBSD Base System -runtime_DESC= FreeBSD Base System -runtime-debug_DESCR= Debugging Symbols -runtime-development_DESCR=Development Files -runtime-profile_DESCR= Profiling Libraries -runtime-lib32_DESCR= 32-bit Libraries -runtime-lib32-debug_DESCR=32-bit Debugging Symbols -runtime-lib32-development_DESCR=32-bit Development Files -runtime-lib32-profile_DESCR=32-bit Profiling Libraries -sendmail_COMMENT= Sendmail Utilities -sendmail_DESC= Sendmail Utilities -smbutils_COMMENT= SMB Utilities -smbutils_DESC= SMB Utilities -ssh_COMMENT= Secure Shell Utilities -ssh_DESC= Secure Shell Utilities -syscons_COMMENT= Syscons Console -syscons_DESC= Syscons Console -syslogd_COMMENT= Syslog Daemon -syslogd_DESC= Syslog Daemon -tcpd_COMMENT= TCP Wrapper utilities -tcpd_DESC= TCP Wrapper utilities -telnet_COMMENT= Telnet client -telnet_DESC= Telnet client -tests_COMMENT= Test Suite -tests_DESC= Test Suite -toolchain_COMMENT= Utilities for program development -toolchain_DESC= Utilities for program development -ufs_COMMENT= UFS Libraries and Utilities -ufs_DESC= UFS Libraries and Utilities -unbound_COMMENT= Unbound DNS Resolver -unbound_DESC= Unbound DNS Resolver -utilities_COMMENT= Non-vital programs and libraries -utilities_DESC= Non-vital programs and libraries -vi_COMMENT= Vi Editor -vi_DESC= Vi Editor -vt_COMMENT= VT fonts and keyboard files -vt_DESC= VT fonts and keyboard files -wpa_COMMENT= 802.11 Supplicant -wpa_DESC= 802.11 Supplicant -zfs_COMMENT= ZFS Libraries and Utilities -zfs_DESC= ZFS Libraries and Utilities diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 4dac34cd4753..6a64fc78a3b1 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -27,9 +27,7 @@ source-level debugger." main() { outname="" origname="" - desc= desc_suffix="" - comment= comment_suffix="" debug= uclsource= @@ -135,9 +133,6 @@ main() { ;; esac - desc="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESC)" - comment="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_COMMENT)" - uclsource="${srctree}/release/packages/template.ucl" if [ -n "${debug}" ]; then @@ -148,9 +143,7 @@ main() { echo "origname=${origname}" echo "srctree=${srctree}" echo "uclfile=${uclfile}" - echo "desc=${desc}" echo "desc_suffix=${desc_suffix}" - echo "comment=${comment}" echo "comment_suffix=${comment_suffix}" echo "vital=${vital}" echo "cp ${uclsource} -> ${uclfile}" @@ -160,9 +153,6 @@ main() { echo "" fi - [ -z "${comment}" ] && comment="${outname} package" - [ -z "${desc}" ] && desc="${outname} package" - cp "${uclsource}" "${uclfile}" if [ -n "${pkgdeps}" ]; then echo 'deps: {' >> ${uclfile} @@ -182,9 +172,7 @@ EOF PKGNAME "${origname}" \ PKGGENNAME "${outname}" \ PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ - COMMENT "${comment}" \ COMMENT_SUFFIX "${comment_suffix}" \ - DESC "${desc}" \ DESC_SUFFIX "$desc_suffix" \ CAP_MKDB_ENDIAN "${cap_arg}" \ PKG_WWW "${PKG_WWW}" \ diff --git a/release/packages/template.ucl b/release/packages/template.ucl index a65f58868118..982641305ad6 100644 --- a/release/packages/template.ucl +++ b/release/packages/template.ucl @@ -4,7 +4,7 @@ name = "${PKG_NAME_PREFIX}-${PKGNAME}" origin = "base" version = "${VERSION}" -comment = "${COMMENT}" +comment = "${PKGNAME} package" categories = [ base ] maintainer = "${PKG_MAINTAINER}" www = "${PKG_WWW}" @@ -12,7 +12,7 @@ prefix = "/" licenselogic = "single" licenses = [ BSD2CLAUSE ] desc = <