Date: Fri, 24 Apr 2026 14:11:04 +0000 From: Lexi Winter <ivy@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: bb75b0d581f7 - main - packages: Convert world to a subdir build Message-ID: <69eb79f8.23dfc.5bb7fa7d@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=bb75b0d581f74e22a68d7868ad1f5da1146a8de0 commit bb75b0d581f74e22a68d7868ad1f5da1146a8de0 Author: Lexi Winter <ivy@FreeBSD.org> AuthorDate: 2026-04-24 14:10:01 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> CommitDate: 2026-04-24 14:10:01 +0000 packages: Convert world to a subdir build Instead of driving the world package build from Makefile.inc1, use a subdir build where each package has a subdirectory under packages/ using the new <bsd.pkg.mk>. Convert some metadata that was previously in the UCL files (e.g. sets and dependencies) to Makefile variables. Build the packages under objdir (not repodir), and use the new stagepackages target to copy them to repodir when creating the repository. Determine an explicit list of packages to build in packages/Makefile based on enabled src.conf options, and add logic to abort the build if we attempt to build an empty package. This inverts the previous logic in Makefile.inc1 which would simply skip empty packages. There are a few advantages to doing it this way: * The package build works more like the rest of the build system, so it's more accessible to developers. * We can customise the packages we build based on src.conf options, e.g. skipping a package entirely, or adjusting its dependencies based on what it actually requires. * We have a specific list of packages that we want to build, and an unexpectedly missing package results in a build error, instead of silently producing a broken repository. * It's possible to build (and in the future, install) an individual package without having to rebuild the entire repository. This doesn't apply to the dtb, kernel-* or src-* packages; those have their own build systems in Makefile.inc1 and will be converted later. MFC after: 4 weeks (stable/15 only) Reviewed by: jlduran, sjg, brooks Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56087 --- Makefile.inc1 | 51 +---- packages/Makefile | 165 ++++++++++++++++ packages/Makefile.amd64 | 23 +++ packages/Makefile.arm | 18 ++ packages/Makefile.arm64 | 20 ++ packages/Makefile.powerpc | 18 ++ packages/Makefile.riscv64 | 20 ++ packages/acct/Makefile | 3 + .../ucl/acct-all.ucl => packages/acct/acct.ucl | 4 - packages/acpi/Makefile | 12 ++ .../ucl/acpi-all.ucl => packages/acpi/acpi.ucl | 4 - packages/apm/Makefile | 12 ++ .../ucl/apm-all.ucl => packages/apm/apm.ucl | 4 - packages/at/Makefile | 10 + .../packages/ucl/at-all.ucl => packages/at/at.ucl | 4 - packages/atf/Makefile | 4 + .../ucl/atf-all.ucl => packages/atf/atf.ucl | 4 - packages/audit/Makefile | 5 + .../ucl/audit-all.ucl => packages/audit/audit.ucl | 4 - packages/autofs/Makefile | 3 + .../autofs-all.ucl => packages/autofs/autofs.ucl | 4 - packages/bhyve/Makefile | 3 + .../ucl/bhyve-all.ucl => packages/bhyve/bhyve.ucl | 4 - packages/blocklist/Makefile | 5 + .../blocklist/blocklist.ucl | 4 - packages/bluetooth/Makefile | 11 ++ .../bluetooth/bluetooth.ucl | 4 - packages/bmake/Makefile | 5 + .../ucl/bmake-all.ucl => packages/bmake/bmake.ucl | 4 - packages/bootloader/Makefile | 24 +++ .../bootloader/bootloader.ucl | 4 - packages/bsdconfig/Makefile | 7 + .../bsdconfig/bsdconfig.ucl | 4 - packages/bsdinstall/Makefile | 8 + .../bsdinstall/bsdinstall.ucl | 4 - packages/bsnmp/Makefile | 5 + .../ucl/bsnmp-all.ucl => packages/bsnmp/bsnmp.ucl | 4 - packages/bzip2/Makefile | 7 + .../ucl/bzip2-all.ucl => packages/bzip2/bzip2.ucl | 4 - packages/caroot/Makefile | 11 ++ .../packages/ucl => packages/caroot}/caroot.ucl | 7 +- .../caroot-all.ucl => packages/caroot/common.ucl | 4 - packages/ccdconfig/Makefile | 6 + .../ccdconfig/ccdconfig.ucl | 4 - packages/certctl/Makefile | 7 + .../certctl/certctl.ucl | 4 - packages/clang/Makefile | 10 + .../ucl/clang-all.ucl => packages/clang/clang.ucl | 9 +- packages/clibs/Makefile | 8 + .../ucl/clibs-all.ucl => packages/clibs/clibs.ucl | 4 - packages/console-tools/Makefile | 6 + .../console-tools/console-tools.ucl | 4 - packages/cron/Makefile | 5 + .../ucl/cron-all.ucl => packages/cron/cron.ucl | 4 - packages/csh/Makefile | 3 + .../ucl/csh-all.ucl => packages/csh/csh.ucl | 4 - packages/ctf/Makefile | 8 + .../ucl/ctf-all.ucl => packages/ctf/ctf.ucl | 6 - packages/ctl/Makefile | 6 + .../ucl/ctl-all.ucl => packages/ctl/ctl.ucl | 4 - packages/cxgbe-tools/Makefile | 6 + .../cxgbe-tools/cxgbe-tools.ucl | 4 - packages/devd/Makefile | 8 + .../ucl/devd-all.ucl => packages/devd/devd.ucl | 4 - packages/devmatch/Makefile | 8 + .../devmatch/devmatch.ucl | 4 - packages/dhclient/Makefile | 10 + .../dhclient/dhclient.ucl | 6 - packages/dma/Makefile | 3 + .../ucl/dma-all.ucl => packages/dma/dma.ucl | 4 - packages/dtrace/Makefile | 9 + .../dtrace-all.ucl => packages/dtrace/dtrace.ucl | 4 - packages/dwatch/Makefile | 10 + .../dwatch-all.ucl => packages/dwatch/dwatch.ucl | 4 - packages/ee/Makefile | 3 + .../packages/ucl/ee-all.ucl => packages/ee/ee.ucl | 4 - packages/efi-tools/Makefile | 13 ++ .../efi-tools/efi-tools.ucl | 4 - packages/examples/Makefile | 4 + .../examples/examples.ucl | 4 - packages/fd/Makefile | 6 + .../packages/ucl/fd-all.ucl => packages/fd/fd.ucl | 4 - packages/fetch/Makefile | 8 + .../ucl/fetch-all.ucl => packages/fetch/fetch.ucl | 4 - packages/firmware-iwm/Makefile | 6 + .../firmware-iwm/firmware-iwm.ucl | 4 - packages/flua/Makefile | 15 ++ .../ucl/flua-all.ucl => packages/flua/flua.ucl | 4 - packages/ftp/Makefile | 3 + .../ucl/ftp-all.ucl => packages/ftp/ftp.ucl | 4 - packages/fwget/Makefile | 7 + .../ucl/fwget-all.ucl => packages/fwget/fwget.ucl | 4 - packages/games/Makefile | 3 + .../ucl/games-all.ucl => packages/games/games.ucl | 4 - packages/geom/Makefile | 8 + .../ucl/geom-all.ucl => packages/geom/geom.ucl | 4 - packages/ggate/Makefile | 6 + .../ucl/ggate-all.ucl => packages/ggate/ggate.ucl | 4 - packages/googletest/Makefile | 4 + .../googletest/googletest.ucl | 4 - packages/gssd/Makefile | 3 + .../ucl/gssd-all.ucl => packages/gssd/gssd.ucl | 4 - packages/hast/Makefile | 6 + .../ucl/hast-all.ucl => packages/hast/hast.ucl | 4 - packages/hostapd/Makefile | 6 + .../hostapd/hostapd.ucl | 4 - packages/hyperv-tools/Makefile | 6 + .../hyperv-tools/hyperv-tools.ucl | 4 - packages/inetd/Makefile | 3 + .../ucl/inetd-all.ucl => packages/inetd/inetd.ucl | 4 - packages/ipf/Makefile | 3 + .../ucl/ipf-all.ucl => packages/ipf/ipf.ucl | 4 - packages/ipfw/Makefile | 3 + .../ucl/ipfw-all.ucl => packages/ipfw/ipfw.ucl | 4 - packages/iscsi/Makefile | 6 + .../ucl/iscsi-all.ucl => packages/iscsi/iscsi.ucl | 4 - packages/jail/Makefile | 3 + .../ucl/jail-all.ucl => packages/jail/jail.ucl | 4 - packages/kerberos-kdc/Makefile | 3 + .../kerberos-kdc/kerberos-kdc.ucl | 4 - packages/kerberos/Makefile | 5 + .../kerberos/kerberos.ucl | 4 - packages/kernel-man/Makefile | 7 + .../ucl => packages/kernel-man}/kernel-man.ucl | 4 - packages/kyua/Makefile | 5 + .../ucl/kyua-all.ucl => packages/kyua/kyua.ucl | 4 - packages/lib9p/Makefile | 5 + .../ucl/lib9p-all.ucl => packages/lib9p/lib9p.ucl | 4 - packages/libarchive/Makefile | 5 + .../libarchive/libarchive.ucl | 4 - packages/libbegemot/Makefile | 5 + .../libbegemot/libbegemot.ucl | 4 - packages/libblocksruntime/Makefile | 5 + .../libblocksruntime/libblocksruntime.ucl | 4 - packages/libbsdstat/Makefile | 5 + .../libbsdstat/libbsdstat.ucl | 4 - packages/libcasper/Makefile | 5 + .../libcasper/libcasper.ucl | 4 - packages/libcompat/Makefile | 15 ++ .../libcompat/libcompat.ucl | 4 - packages/libcompiler_rt/Makefile | 11 ++ .../libcompiler_rt/libcompiler_rt.ucl | 4 - packages/libcuse/Makefile | 5 + .../libcuse/libcuse.ucl | 4 - packages/libdwarf/Makefile | 5 + .../libdwarf/libdwarf.ucl | 4 - packages/libevent1/Makefile | 5 + .../libevent1/libevent1.ucl | 4 - packages/libexecinfo/Makefile | 5 + .../libexecinfo/libexecinfo.ucl | 4 - packages/libipt/Makefile | 4 + .../libipt-all.ucl => packages/libipt/libipt.ucl | 4 - packages/libldns/Makefile | 5 + .../libldns/libldns.ucl | 4 - packages/libmagic/Makefile | 5 + .../libmagic/libmagic.ucl | 4 - packages/libmilter/Makefile | 5 + .../libmilter/libmilter.ucl | 4 - packages/libpathconv/Makefile | 5 + .../libpathconv/libpathconv.ucl | 4 - packages/librpcsec_gss/Makefile | 5 + .../librpcsec_gss/librpcsec_gss.ucl | 4 - packages/librss/Makefile | 5 + .../librss-all.ucl => packages/librss/librss.ucl | 4 - packages/libsqlite3/Makefile | 5 + .../libsqlite3/libsqlite3.ucl | 4 - packages/libthread_db/Makefile | 5 + .../libthread_db/libthread_db.ucl | 4 - packages/libucl/Makefile | 5 + .../libucl-all.ucl => packages/libucl/libucl.ucl | 4 - packages/libvgl/Makefile | 5 + .../libvgl-all.ucl => packages/libvgl/libvgl.ucl | 4 - packages/libvmmapi/Makefile | 4 + .../libvmmapi/libvmmapi.ucl | 4 - packages/libyaml/Makefile | 5 + .../libyaml/libyaml.ucl | 4 - packages/lld/Makefile | 6 + .../ucl/lld-all.ucl => packages/lld/lld.ucl | 6 - packages/lldb/Makefile | 6 + .../ucl/lldb-all.ucl => packages/lldb/lldb.ucl | 6 - packages/local-unbound/Makefile | 14 ++ .../local-unbound/common.ucl | 6 - .../local-unbound}/local-unbound.ucl | 10 +- packages/locales/Makefile | 6 + .../locales/locales.ucl | 4 - packages/lp/Makefile | 3 + .../packages/ucl/lp-all.ucl => packages/lp/lp.ucl | 4 - packages/mandoc/Makefile | 5 + .../mandoc-all.ucl => packages/mandoc/mandoc.ucl | 4 - packages/mlx-tools/Makefile | 5 + .../mlx-tools/mlx-tools.ucl | 4 - packages/mtree/Makefile | 5 + .../ucl/mtree-all.ucl => packages/mtree/mtree.ucl | 4 - packages/natd/Makefile | 6 + .../ucl/natd-all.ucl => packages/natd/natd.ucl | 4 - packages/ncurses/Makefile | 7 + .../ncurses/ncurses.ucl | 4 - packages/netmap/Makefile | 5 + .../netmap-all.ucl => packages/netmap/netmap.ucl | 4 - packages/newsyslog/Makefile | 8 + .../newsyslog/newsyslog.ucl | 4 - packages/nfs/Makefile | 3 + .../ucl/nfs-all.ucl => packages/nfs/nfs.ucl | 4 - packages/ntp/Makefile | 3 + .../ucl/ntp-all.ucl => packages/ntp/ntp.ucl | 4 - packages/nuageinit/Makefile | 6 + .../nuageinit/nuageinit.ucl | 4 - packages/nvme-tools/Makefile | 5 + .../nvme-tools/nvme-tools.ucl | 4 - packages/openssl/Makefile | 5 + .../openssl/openssl.ucl | 4 - packages/pam/Makefile | 7 + .../ucl/pam-all.ucl => packages/pam/pam.ucl | 4 - packages/periodic/Makefile | 11 ++ .../ucl => packages/periodic}/periodic.ucl | 12 +- packages/pf/Makefile | 4 + .../packages/ucl/pf-all.ucl => packages/pf/pf.ucl | 4 - packages/pkg-bootstrap/Makefile | 5 + .../pkg-bootstrap/pkg-bootstrap.ucl | 4 - packages/pkgconf/Makefile | 6 + .../pkgconf/pkgconf.ucl | 6 - packages/pmc/Makefile | 5 + .../ucl/pmc-all.ucl => packages/pmc/pmc.ucl | 4 - packages/powerd/Makefile | 5 + .../powerd-all.ucl => packages/powerd/powerd.ucl | 4 - packages/ppp/Makefile | 5 + .../ucl/ppp-all.ucl => packages/ppp/ppp.ucl | 4 - packages/quotacheck/Makefile | 3 + .../quotacheck/quotacheck.ucl | 4 - packages/rc/Makefile | 11 ++ {release/packages/ucl => packages/rc}/rc.ucl | 16 +- packages/rcmds/Makefile | 6 + .../ucl/rcmds-all.ucl => packages/rcmds/rcmds.ucl | 4 - packages/rdma/Makefile | 5 + .../ucl/rdma-all.ucl => packages/rdma/rdma.ucl | 4 - packages/rescue/Makefile | 6 + .../rescue-all.ucl => packages/rescue/rescue.ucl | 4 - packages/resolvconf/Makefile | 6 + .../resolvconf/resolvconf.ucl | 4 - packages/rip/Makefile | 3 + .../ucl/rip-all.ucl => packages/rip/rip.ucl | 4 - packages/runtime/Makefile | 14 ++ .../runtime-all.ucl => packages/runtime/common.ucl | 4 - .../packages/ucl => packages/runtime}/runtime.ucl | 2 +- packages/sendmail/Makefile | 12 ++ .../sendmail/sendmail.ucl | 4 - packages/smbutils/Makefile | 7 + .../smbutils/smbutils.ucl | 4 - packages/sound/Makefile | 8 + .../ucl/sound-all.ucl => packages/sound/sound.ucl | 4 - packages/ssh/Makefile | 7 + .../ucl/ssh-all.ucl => packages/ssh/ssh.ucl | 6 - packages/syscons-data/Makefile | 6 + .../syscons-data/syscons-data.ucl | 4 - packages/syslogd/Makefile | 5 + .../syslogd/syslogd.ucl | 4 - packages/tcpd/Makefile | 6 + .../ucl/tcpd-all.ucl => packages/tcpd/tcpd.ucl | 4 - packages/telnet/Makefile | 3 + .../telnet-all.ucl => packages/telnet/telnet.ucl | 4 - packages/tests/Makefile | 22 +++ .../ucl/tests-all.ucl => packages/tests/tests.ucl | 4 - packages/toolchain/Makefile | 7 + .../toolchain/toolchain.ucl | 4 - packages/ufs/Makefile | 7 + .../ucl/ufs-all.ucl => packages/ufs/ufs.ucl | 4 - packages/utilities/Makefile | 14 ++ .../utilities/common.ucl | 4 - .../ucl => packages/utilities}/utilities.ucl | 2 + packages/vi/Makefile | 5 + .../packages/ucl/vi-all.ucl => packages/vi/vi.ucl | 4 - packages/vt-data/Makefile | 6 + .../vt-data/vt-data.ucl | 4 - packages/wpa/Makefile | 5 + .../ucl/wpa-all.ucl => packages/wpa/wpa.ucl | 4 - packages/xz/Makefile | 7 + .../packages/ucl/xz-all.ucl => packages/xz/xz.ucl | 4 - packages/yp/Makefile | 8 + .../packages/ucl/yp-all.ucl => packages/yp/yp.ucl | 4 - packages/zfs/Makefile | 8 + .../ucl/zfs-all.ucl => packages/zfs/zfs.ucl | 6 - packages/zlib/Makefile | 8 + .../ucl/zlib-all.ucl => packages/zlib/zlib.ucl | 6 - packages/zoneinfo/Makefile | 7 + .../zoneinfo/zoneinfo.ucl | 6 - packages/zstd/Makefile | 7 + .../ucl/zstd-all.ucl => packages/zstd/zstd.ucl | 4 - release/packages/ucl/at.ucl | 31 --- release/packages/ucl/bluetooth.ucl | 27 --- release/packages/ucl/bsdconfig.ucl | 24 --- release/packages/ucl/bsdinstall.ucl | 29 --- release/packages/ucl/certctl.ucl | 23 --- release/packages/ucl/clang.ucl | 14 -- release/packages/ucl/clibs.ucl | 1 - release/packages/ucl/devd.ucl | 24 --- release/packages/ucl/dhclient.ucl | 26 --- release/packages/ucl/newsyslog.ucl | 6 - release/packages/ucl/periodic-all.ucl | 29 --- release/packages/ucl/rc-all.ucl | 29 --- release/packages/ucl/rcmds.ucl | 25 --- release/packages/ucl/sendmail.ucl | 24 --- release/packages/ucl/tests.ucl | 46 ----- release/packages/ucl/yp.ucl | 24 --- share/mk/bsd.pkg.mk | 218 +++++++++++++++++++++ share/mk/bsd.pkg.pre.mk | 92 +++++++++ share/mk/bsd.subdir.mk | 4 +- 306 files changed, 1507 insertions(+), 1019 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 8d4dd3570a7b..ea066d8aad8a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2260,48 +2260,15 @@ create-world-packages: _pkgbootstrap .PHONY @cd ${WSTAGEDIR} ; \ ${METALOG_SORT_CMD} ${WSTAGEDIR}/${DISTDIR}/METALOG | \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk - @for plist in ${WSTAGEDIR}/*.plist; do \ - plist=$${plist##*/} ; \ - pkgname=$${plist%.plist} ; \ - echo "_PKGS+= $${pkgname}" ; \ - done > ${WSTAGEDIR}/packages.mk - ${_+_}@cd ${.CURDIR}; \ - PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \ - create-world-packages-jobs \ - SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \ - .MAKE.JOB.PREFIX= - -.if make(create-world-packages-jobs) -.include "${WSTAGEDIR}/packages.mk" -.endif - -create-world-packages-jobs: .PHONY -.for pkgname in ${_PKGS} -create-world-packages-jobs: create-world-package-${pkgname} -create-world-package-${pkgname}: .PHONY - @sh ${SRCDIR}/release/packages/generate-ucl.sh -o ${pkgname} \ - -s ${SRCDIR} -u ${WSTAGEDIR}/${pkgname}.ucl - @if [ "$$(grep -vc '^@dir' ${WSTAGEDIR}/${pkgname}.plist)" -gt 0 ]; then \ - awk -F\" ' \ - /^name/ { printf("===> Creating %s-", $$2); next } \ - /^version/ { print $$2; next } \ - ' ${WSTAGEDIR}/${pkgname}.ucl && \ - ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ - -o SHLIB_PROVIDE_PATHS_NATIVE=/lib,/usr/lib \ - ${_ALL_LIBCOMPATS:range:@i@-o SHLIB_PROVIDE_PATHS_COMPAT_${_ALL_LIBCOMPATS:[$i]}=/usr/lib${_ALL_libcompats:[$i]}@} \ - -o OSVERSION="${SRCRELDATE}" \ - create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \ - -M ${WSTAGEDIR}/${pkgname}.ucl \ - -p ${WSTAGEDIR}/${pkgname}.plist \ - -r ${WSTAGEDIR} \ - -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR}; \ - else \ - awk -F\" ' \ - /^name/ { printf("===> Skipping %s-", $$2); next } \ - /^version/ { print $$2; next } \ - ' ${WSTAGEDIR}/${pkgname}.ucl; \ - fi -.endfor + # bsd.pkg.mk doesn't always know about the dependencies of things + # it builds, so for now, always run clean here. + ${CROSSENV} ${MAKE} -C ${.CURDIR}/packages \ + FLUA=${WORLDTMP}/legacy/usr/libexec/flua \ + REPODIR=${REPODIR} \ + WSTAGEDIR=${WSTAGEDIR} \ + PKG_VERSION=${PKG_VERSION} \ + MK_AUTO_OBJ=yes \ + clean all stagepackages create-sets-packages-jobs: .PHONY create-sets-packages create-sets-packages: .PHONY diff --git a/packages/Makefile b/packages/Makefile new file mode 100644 index 000000000000..ba70a38880e0 --- /dev/null +++ b/packages/Makefile @@ -0,0 +1,165 @@ +# SPDX-License-Identifier: ISC +# +# Copyright (c) 2026 Lexi Winter <ivy@FreeBSD.org> +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +.include <src.opts.mk> + +SUBDIR= blocklist \ + bsdconfig \ + bzip2 \ + clibs \ + cron \ + ctl \ + devd \ + devmatch \ + dhclient \ + fetch \ + flua \ + firmware-iwm \ + fwget \ + geom \ + ggate \ + lib9p \ + libarchive \ + libbegemot \ + libblocksruntime \ + libbsdstat \ + libcasper \ + libcompat \ + libcompiler_rt \ + libdwarf \ + libevent1 \ + libexecinfo \ + libpathconv \ + librss \ + libsqlite3 \ + libthread_db \ + libucl \ + libyaml \ + locales \ + mandoc \ + mtree \ + natd \ + ncurses \ + netmap \ + newsyslog \ + nfs \ + nvme-tools \ + pam \ + periodic \ + powerd \ + ppp \ + quotacheck \ + rc \ + rcmds \ + resolvconf \ + rip \ + runtime \ + smbutils \ + syslogd \ + tcpd \ + toolchain \ + ufs \ + utilities \ + xz \ + zlib \ + zstd + +.if ${MK_ACCT} != "no" || ${MK_UTMPX} != "no" +SUBDIR+= acct +.endif + +.if ${MK_CLANG} != "no" || ${MK_TOOLCHAIN} != "no" +SUBDIR+= clang +.endif + +.if ${MK_AUTHPF} != "no" || ${MK_PF} != "no" +SUBDIR+= pf +.endif + +# XXX - certctl probably shouldn't depend on caroot. This logic comes from +# the src build, so we have to match it. +.if ${MK_CAROOT} != "no" +SUBDIR.${MK_OPENSSL}+= certctl +SUBDIR+= caroot +.endif + +SUBDIR.${MK_AT}+= at +SUBDIR.${MK_AUDIT}+= audit +SUBDIR.${MK_AUTOFS}+= autofs +SUBDIR.${MK_BLUETOOTH}+= bluetooth +SUBDIR.${MK_BOOT}+= bootloader +SUBDIR.${MK_BSDINSTALL}+= bsdinstall +SUBDIR.${MK_BSNMP}+= bsnmp +SUBDIR.${MK_CCD}+= ccdconfig +SUBDIR.${MK_CUSE}+= libcuse +SUBDIR.${MK_CXGBETOOL}+= cxgbe-tools +SUBDIR.${MK_DMAGENT}+= dma +SUBDIR.${MK_DTRACE}+= ctf dtrace dwatch +SUBDIR.${MK_EE}+= ee +SUBDIR.${MK_EFI}+= efi-tools +SUBDIR.${MK_EXAMPLES}+= examples +SUBDIR.${MK_FILE}+= libmagic +SUBDIR.${MK_FLOPPY}+= fd +SUBDIR.${MK_FTP}+= ftp +SUBDIR.${MK_GAMES}+= games +SUBDIR.${MK_GOOGLETEST}+= googletest +SUBDIR.${MK_HAST}+= hast +SUBDIR.${MK_HYPERV}+= hyperv-tools +SUBDIR.${MK_INETD}+= inetd +SUBDIR.${MK_IPFILTER}+= ipf +SUBDIR.${MK_IPFW}+= ipfw +SUBDIR.${MK_ISCSI}+= iscsi +SUBDIR.${MK_JAIL}+= jail +SUBDIR.${MK_KERBEROS}+= kerberos kerberos-kdc librpcsec_gss gssd +SUBDIR.${MK_LDNS}+= libldns +SUBDIR.${MK_LEGACY_CONSOLE}+= console-tools +SUBDIR.${MK_LLD}+= lld +SUBDIR.${MK_LLDB}+= lldb +SUBDIR.${MK_LPR}+= lp +SUBDIR.${MK_MAKE}+= bmake +SUBDIR.${MK_MAN}+= kernel-man +SUBDIR.${MK_MLX5TOOL}+= mlx-tools +SUBDIR.${MK_NIS}+= yp +SUBDIR.${MK_NTP}+= ntp +SUBDIR.${MK_NUAGEINIT}+= nuageinit +SUBDIR.${MK_OFED}+= rdma +SUBDIR.${MK_OPENSSH}+= ssh +SUBDIR.${MK_OPENSSL}+= openssl +SUBDIR.${MK_PKGBOOTSTRAP}+= pkg-bootstrap +SUBDIR.${MK_PKGCONF}+= pkgconf +SUBDIR.${MK_PMC}+= pmc +SUBDIR.${MK_RESCUE}+= rescue +SUBDIR.${MK_SENDMAIL}+= sendmail libmilter +SUBDIR.${MK_SOUND}+= sound +SUBDIR.${MK_SYSCONS}+= syscons-data +SUBDIR.${MK_TCSH}+= csh +SUBDIR.${MK_TELNET}+= telnet +SUBDIR.${MK_TESTS}+= tests +SUBDIR.${MK_TESTS_SUPPORT}+= atf kyua +SUBDIR.${MK_UNBOUND}+= local-unbound +SUBDIR.${MK_VI}+= vi +SUBDIR.${MK_VT}+= vt-data +SUBDIR.${MK_WIRELESS}+= hostapd wpa +SUBDIR.${MK_ZFS}+= zfs +SUBDIR.${MK_ZONEINFO}+= zoneinfo + +.include <bsd.arch.inc.mk> + +SUBDIR_PARALLEL= + +.ORDER: all stagepackages + +.include <bsd.subdir.mk> diff --git a/packages/Makefile.amd64 b/packages/Makefile.amd64 new file mode 100644 index 000000000000..ff2780f326e3 --- /dev/null +++ b/packages/Makefile.amd64 @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: ISC +# +# Copyright (c) 2026 Lexi Winter <ivy@FreeBSD.org> +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +SUBDIR+= libvgl + +SUBDIR.${MK_ACPI}+= acpi +SUBDIR.${MK_APM}+= apm +SUBDIR.${MK_BHYVE}+= bhyve +SUBDIR.${MK_BHYVE}+= libvmmapi +SUBDIR.${MK_PMC}+= libipt diff --git a/packages/Makefile.arm b/packages/Makefile.arm new file mode 100644 index 000000000000..db36ead23828 --- /dev/null +++ b/packages/Makefile.arm @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: ISC +# +# Copyright (c) 2026 Lexi Winter <ivy@FreeBSD.org> +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +SUBDIR.${MK_ACPI}+= acpi +SUBDIR.${MK_APM}+= apm diff --git a/packages/Makefile.arm64 b/packages/Makefile.arm64 new file mode 100644 index 000000000000..4bfca51bd031 --- /dev/null +++ b/packages/Makefile.arm64 @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: ISC +# +# Copyright (c) 2026 Lexi Winter <ivy@FreeBSD.org> +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +SUBDIR.${MK_ACPI}+= acpi +SUBDIR.${MK_APM}+= apm +SUBDIR.${MK_BHYVE}+= bhyve +SUBDIR.${MK_BHYVE}+= libvmmapi diff --git a/packages/Makefile.powerpc b/packages/Makefile.powerpc new file mode 100644 index 000000000000..db36ead23828 --- /dev/null +++ b/packages/Makefile.powerpc @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: ISC +# +# Copyright (c) 2026 Lexi Winter <ivy@FreeBSD.org> +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +SUBDIR.${MK_ACPI}+= acpi +SUBDIR.${MK_APM}+= apm diff --git a/packages/Makefile.riscv64 b/packages/Makefile.riscv64 new file mode 100644 index 000000000000..4bfca51bd031 --- /dev/null +++ b/packages/Makefile.riscv64 @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: ISC +# +# Copyright (c) 2026 Lexi Winter <ivy@FreeBSD.org> +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +SUBDIR.${MK_ACPI}+= acpi +SUBDIR.${MK_APM}+= apm +SUBDIR.${MK_BHYVE}+= bhyve +SUBDIR.${MK_BHYVE}+= libvmmapi diff --git a/packages/acct/Makefile b/packages/acct/Makefile new file mode 100644 index 000000000000..951ef1f994ea --- /dev/null +++ b/packages/acct/Makefile @@ -0,0 +1,3 @@ +WORLDPACKAGE= acct + +.include <bsd.pkg.mk> diff --git a/release/packages/ucl/acct-all.ucl b/packages/acct/acct.ucl similarity index 96% rename from release/packages/ucl/acct-all.ucl rename to packages/acct/acct.ucl index e6c98c3180ce..a96e3cc08471 100644 --- a/release/packages/ucl/acct-all.ucl +++ b/packages/acct/acct.ucl @@ -29,7 +29,3 @@ lastcomm(1) command to view this information. However, system accounting is not intended as a security auditing mechanism; use the OpenBSM auditing system provided in the $PKG_NAME_PREFIX-audit package for that. EOD - -annotations { - set = "optional,optional-jail" -} diff --git a/packages/acpi/Makefile b/packages/acpi/Makefile new file mode 100644 index 000000000000..360ecf22e9e7 --- /dev/null +++ b/packages/acpi/Makefile @@ -0,0 +1,12 @@ +WORLDPACKAGE= acpi + +# On these platforms, acpi only contains config files. +.if ${MACHINE_ARCH} == "armv7" || ${MACHINE} == "powerpc" || \ + ${MACHINE_ARCH} == "riscv64" +SUBPACKAGES= +.endif + +# ACPI isn't applicable in a jail. +PKG_SETS= optional + +.include <bsd.pkg.mk> diff --git a/release/packages/ucl/acpi-all.ucl b/packages/acpi/acpi.ucl similarity index 97% rename from release/packages/ucl/acpi-all.ucl rename to packages/acpi/acpi.ucl index 9b63b825bd60..96e63db64d1d 100644 --- a/release/packages/ucl/acpi-all.ucl +++ b/packages/acpi/acpi.ucl @@ -34,7 +34,3 @@ ACPI implementation in the kernel: * acpidump(8) dumps the system's raw ACPI data. * iasl(8) is the Intel ACPI compiler/decompiler EOD - -annotations { - set = "optional" -} diff --git a/packages/apm/Makefile b/packages/apm/Makefile new file mode 100644 index 000000000000..ddf8d1ed12ae --- /dev/null +++ b/packages/apm/Makefile @@ -0,0 +1,12 @@ +WORLDPACKAGE= apm + +# On non-amd64 platforms, this package only contain an rc script. +# (This should be fixed.) +.if ${MACHINE_CPUARCH} != "amd64" +SUBPACKAGES= +.endif + +# APM isn't applicable to jails. +PKG_SETS= optional + +.include <bsd.pkg.mk> diff --git a/release/packages/ucl/apm-all.ucl b/packages/apm/apm.ucl similarity index 97% rename from release/packages/ucl/apm-all.ucl rename to packages/apm/apm.ucl index a0ade7fb8a5f..1318befc4273 100644 --- a/release/packages/ucl/apm-all.ucl +++ b/packages/apm/apm.ucl @@ -27,7 +27,3 @@ This package provides apm(8), a utility which can be used to monitor the APM state and change the system power mode, and the /etc/rc.d/apm service which can enable and disable APM at system startup and shutdown. EOD - -annotations { - set = "optional" -} diff --git a/packages/at/Makefile b/packages/at/Makefile new file mode 100644 index 000000000000..1245e12fb58d --- /dev/null +++ b/packages/at/Makefile @@ -0,0 +1,10 @@ +WORLDPACKAGE= at + +PKG_SETS= minimal minimal-jail + +# atrun relies on cron to work. +PKG_DEPS.at+= cron +# at(1) passes the command to /bin/sh +PKG_DEPS.at+= runtime + +.include <bsd.pkg.mk> diff --git a/release/packages/ucl/at-all.ucl b/packages/at/at.ucl similarity index 96% rename from release/packages/ucl/at-all.ucl rename to packages/at/at.ucl index 32c720c48b96..2a66f1a03183 100644 --- a/release/packages/ucl/at-all.ucl +++ b/packages/at/at.ucl @@ -27,7 +27,3 @@ This package provides two utilities used to execute a command at a later time: Note that batch(1) is not intended to be a full batch scheduling system, and can only run commands on the local system. EOD - -annotations { - set = "minimal,minimal-jail" -} diff --git a/packages/atf/Makefile b/packages/atf/Makefile new file mode 100644 index 000000000000..2ed0edee9679 --- /dev/null +++ b/packages/atf/Makefile @@ -0,0 +1,4 @@ +WORLDPACKAGE= atf +SUBPACKAGES= dbg dev lib man + +.include <bsd.pkg.mk> diff --git a/release/packages/ucl/atf-all.ucl b/packages/atf/atf.ucl similarity index 97% rename from release/packages/ucl/atf-all.ucl rename to packages/atf/atf.ucl index 6e86955fb539..4d4bf8b6b69b 100644 --- a/release/packages/ucl/atf-all.ucl +++ b/packages/atf/atf.ucl @@ -33,7 +33,3 @@ test programs in a variety of languages. These libraries all offer similar functionality and any test program written with them exposes a consistent user interface. EOD - -annotations { - set = "optional,optional-jail" -} diff --git a/packages/audit/Makefile b/packages/audit/Makefile new file mode 100644 index 000000000000..1d0014ecebba --- /dev/null +++ b/packages/audit/Makefile @@ -0,0 +1,5 @@ +WORLDPACKAGE= audit +SUBPACKAGES= dbg dev lib man +COMPAT_PKGS= dbg dev lib + +.include <bsd.pkg.mk> diff --git a/release/packages/ucl/audit-all.ucl b/packages/audit/audit.ucl similarity index 97% rename from release/packages/ucl/audit-all.ucl rename to packages/audit/audit.ucl index 0ff79f7c6b73..c3181c6cedbd 100644 --- a/release/packages/ucl/audit-all.ucl +++ b/packages/audit/audit.ucl @@ -42,7 +42,3 @@ system. This package provides the auditing daemon auditd(8) and various utilities used to manage the auditing system and work with audit data. EOD - -annotations { - set = "optional,optional-jail" -} diff --git a/packages/autofs/Makefile b/packages/autofs/Makefile new file mode 100644 index 000000000000..9f43e22ee516 --- /dev/null +++ b/packages/autofs/Makefile @@ -0,0 +1,3 @@ +WORLDPACKAGE= autofs + +.include <bsd.pkg.mk> diff --git a/release/packages/ucl/autofs-all.ucl b/packages/autofs/autofs.ucl similarity index 96% rename from release/packages/ucl/autofs-all.ucl rename to packages/autofs/autofs.ucl index d45949847ce1..a51292e78faf 100644 --- a/release/packages/ucl/autofs-all.ucl +++ b/packages/autofs/autofs.ucl @@ -27,7 +27,3 @@ or to provide automated access to NFS servers via the /net mountpoint. This package provides the automountd(8) daemon which is responsible for managing this, as well as the management utility automount(8). EOD - -annotations { - set = "optional,optional-jail" -} diff --git a/packages/bhyve/Makefile b/packages/bhyve/Makefile new file mode 100644 index 000000000000..26658cf9934f --- /dev/null +++ b/packages/bhyve/Makefile @@ -0,0 +1,3 @@ +WORLDPACKAGE= bhyve + +.include <bsd.pkg.mk> diff --git a/release/packages/ucl/bhyve-all.ucl b/packages/bhyve/bhyve.ucl similarity index 97% rename from release/packages/ucl/bhyve-all.ucl rename to packages/bhyve/bhyve.ucl index c01a826a123f..ac250b0f2ad4 100644 --- a/release/packages/ucl/bhyve-all.ucl +++ b/packages/bhyve/bhyve.ucl @@ -40,7 +40,3 @@ loader. An example script is also provided in /usr/share/examples/bhyve/vmrun.sh which can be used to run simple virtual machines. EOD - -annotations { - set = "optional,optional-jail" -} diff --git a/packages/blocklist/Makefile b/packages/blocklist/Makefile new file mode 100644 index 000000000000..07333b5e4055 --- /dev/null +++ b/packages/blocklist/Makefile @@ -0,0 +1,5 @@ +WORLDPACKAGE= blocklist +SUBPACKAGES= dbg dev lib man +COMPAT_PKGS= dbg dev lib + +.include <bsd.pkg.mk> diff --git a/release/packages/ucl/blocklist-all.ucl b/packages/blocklist/blocklist.ucl similarity index 96% rename from release/packages/ucl/blocklist-all.ucl rename to packages/blocklist/blocklist.ucl index 273df85fc22b..dea2840af22d 100644 --- a/release/packages/ucl/blocklist-all.ucl +++ b/packages/blocklist/blocklist.ucl @@ -28,7 +28,3 @@ only daemons which have had blocklist support added will work. The blocklistd(8) daemon was previously named blacklistd(8). EOD - -annotations { - set = "optional,optional-jail" -} diff --git a/packages/bluetooth/Makefile b/packages/bluetooth/Makefile new file mode 100644 index 000000000000..d47e76c3731c --- /dev/null +++ b/packages/bluetooth/Makefile @@ -0,0 +1,11 @@ +WORLDPACKAGE= bluetooth +SUBPACKAGES= dbg dev lib man +COMPAT_PKGS= dbg dev lib + +# Bluetooth isn't applicable to jails. +PKG_SETS= optional + +# rfcomm_pppd(8) uses ppp(8) +PKG_DEPS.bluetooth+= ppp + +.include <bsd.pkg.mk> diff --git a/release/packages/ucl/bluetooth-all.ucl b/packages/bluetooth/bluetooth.ucl *** 4469 LINES SKIPPED ***home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69eb79f8.23dfc.5bb7fa7d>