aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
Diffstat (limited to 'release')
-rw-r--r--release/Makefile.vm3
-rw-r--r--release/packages/ucl/bsdinstall.ucl5
-rw-r--r--release/packages/ucl/caroot.ucl4
-rw-r--r--release/packages/ucl/dhclient-all.ucl2
-rw-r--r--release/packages/ucl/dhclient.ucl26
-rw-r--r--release/packages/ucl/flua-all.ucl32
-rw-r--r--release/packages/ucl/local-unbound.ucl8
-rw-r--r--release/packages/ucl/nuageinit-all.ucl7
-rw-r--r--release/packages/ucl/tests.ucl27
-rw-r--r--release/packages/ucl/zlib-all.ucl32
-rw-r--r--release/scripts/mtree-to-plist.awk6
-rw-r--r--release/tools/vmimage.subr2
12 files changed, 144 insertions, 10 deletions
diff --git a/release/Makefile.vm b/release/Makefile.vm
index 336e8fc82299..a04f779ebebb 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -101,10 +101,13 @@ QEMUTGT=emulator-portinstall
.endif
QEMUTGT?=
+.if (defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE)) || \
+ (defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES))
.if (defined(WITHOUT_QEMU) && !defined(NO_ROOT)) || \
(!defined(WITHOUT_QEMU) && defined(NO_ROOT))
.error WITHOUT_QEMU requires NO_ROOT (and vice versa)
.endif
+.endif
.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
. for _CW in ${CLOUDWARE}
diff --git a/release/packages/ucl/bsdinstall.ucl b/release/packages/ucl/bsdinstall.ucl
index 7fe8898b9427..96ff220bfb54 100644
--- a/release/packages/ucl/bsdinstall.ucl
+++ b/release/packages/ucl/bsdinstall.ucl
@@ -21,4 +21,9 @@ deps {
"runtime" {
version = "${VERSION}"
},
+
+ # the pkgbase script requires flua
+ "flua" {
+ version = "${VERSION}"
+ },
}
diff --git a/release/packages/ucl/caroot.ucl b/release/packages/ucl/caroot.ucl
index e43c9d0771f2..f7d0dd8acb7f 100644
--- a/release/packages/ucl/caroot.ucl
+++ b/release/packages/ucl/caroot.ucl
@@ -4,6 +4,6 @@ deps {
}
}
scripts: {
- post-install = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ rehash"
- post-uninstall = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ rehash"
+ post-install = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ ${PKG_METALOG:+-U -M $PKG_METALOG} rehash"
+ post-uninstall = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ ${PKG_METALOG:+-U -M $PKG_METALOG} rehash"
}
diff --git a/release/packages/ucl/dhclient-all.ucl b/release/packages/ucl/dhclient-all.ucl
index bae3c7d7c413..b540a23eeb71 100644
--- a/release/packages/ucl/dhclient-all.ucl
+++ b/release/packages/ucl/dhclient-all.ucl
@@ -46,5 +46,5 @@ EOD
licenses = [ "BSD-3-Clause" ]
annotations {
- set = minimal
+ set = "minimal,minimal-jail"
}
diff --git a/release/packages/ucl/dhclient.ucl b/release/packages/ucl/dhclient.ucl
new file mode 100644
index 000000000000..f15ca8703edf
--- /dev/null
+++ b/release/packages/ucl/dhclient.ucl
@@ -0,0 +1,26 @@
+/*
+ * SPDX-License-Identifier: ISC
+ *
+ * Copyright (c) 2025 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.
+ */
+
+deps {
+ # dhclient uses resolvconf to update /etc/resolv.conf in case the
+ # DHCP server returns nameserver addresses.
+ "resolvconf" {
+ version = "${VERSION}"
+ },
+}
+
diff --git a/release/packages/ucl/flua-all.ucl b/release/packages/ucl/flua-all.ucl
new file mode 100644
index 000000000000..7488e2e36839
--- /dev/null
+++ b/release/packages/ucl/flua-all.ucl
@@ -0,0 +1,32 @@
+/*
+ * SPDX-License-Identifier: ISC
+ *
+ * Copyright (c) 2025 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.
+ */
+
+comment = "Private Lua implementation"
+
+desc = <<EOD
+flua(1) is an implementation of Lua for use by the base system. This facility
+is not intended for general use, and may be modified or removed at any time
+without notice.
+
+Supported versions of Lua for general use are available in the FreeBSD Ports
+Collection.
+EOD
+
+annotations {
+ set = "optional,optional-jail"
+}
diff --git a/release/packages/ucl/local-unbound.ucl b/release/packages/ucl/local-unbound.ucl
index 0f1c77a0d0ee..34d4c3664c9e 100644
--- a/release/packages/ucl/local-unbound.ucl
+++ b/release/packages/ucl/local-unbound.ucl
@@ -25,3 +25,11 @@ by running "service local_unbound setup" before restarting the service.
EOM
}
]
+
+deps {
+ # local-unbound uses resolvconf to update resolv.conf and to generate
+ # its forward.conf.
+ "resolvconf" {
+ version = "${VERSION}"
+ },
+}
diff --git a/release/packages/ucl/nuageinit-all.ucl b/release/packages/ucl/nuageinit-all.ucl
index c9913f8cfb88..8c7a0754040c 100644
--- a/release/packages/ucl/nuageinit-all.ucl
+++ b/release/packages/ucl/nuageinit-all.ucl
@@ -27,6 +27,13 @@ loaded from a local disk or CD-ROM.
nuageinit implements the cloud-init (https://cloud-init.io/) specification.
EOD
+deps {
+ # nuageinit is written in Lua
+ "flua" {
+ version = "${VERSION}"
+ },
+}
+
annotations {
set = minimal
}
diff --git a/release/packages/ucl/tests.ucl b/release/packages/ucl/tests.ucl
new file mode 100644
index 000000000000..bac72f1534d3
--- /dev/null
+++ b/release/packages/ucl/tests.ucl
@@ -0,0 +1,27 @@
+/*
+ * SPDX-License-Identifier: ISC
+ *
+ * Copyright (c) 2025 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.
+ */
+
+
+deps {
+ # Quite a few tests require flua.
+ "flua" {
+ version = "${VERSION}"
+ },
+}
+
+
diff --git a/release/packages/ucl/zlib-all.ucl b/release/packages/ucl/zlib-all.ucl
new file mode 100644
index 000000000000..d7596c698e39
--- /dev/null
+++ b/release/packages/ucl/zlib-all.ucl
@@ -0,0 +1,32 @@
+/*
+ * SPDX-License-Identifier: ISC
+ *
+ * Copyright (c) 2025 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.
+ */
+
+comment = "DEFLATE (gzip) data compression library"
+
+desc = <<EOD
+zlib implements the DEFLATE data compression algorithm, as used in the
+GNU gzip(1) utility. DEFLATE is widely used in many situations, such
+as network protocols (including HTTP) that need to compress data in
+transit, and in utilities that compress data on disk.
+EOD
+
+licenses = [ "Zlib" ]
+
+annotations {
+ set = "minimal,minimal-jail"
+}
diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk
index a9f1e194389a..38c9963680ee 100644
--- a/release/scripts/mtree-to-plist.awk
+++ b/release/scripts/mtree-to-plist.awk
@@ -40,12 +40,6 @@
for (i in a) {
if (a[i] ~ /^package=/) {
pkgname=a[i]
- if ($1 ~ /^\/boot\//) {
- if (kernel != "" && $1 ~ /^\/boot\/dtb\//)
- pkgname="dtb"
- else if ($1 !~ /^\/boot\/firmware\//)
- pkgname="bootloader"
- }
gsub(/package=/, "", pkgname)
} else if (a[i] == "config") {
type="config"
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 99e1936296e1..3bfef585f613 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -97,7 +97,7 @@ vm_install_base() {
if [ -z "${NOPKGBASE}" ]; then
local pkg_cmd
- pkg_cmd="pkg --rootdir ${DESTDIR} --repo-conf-dir ${PKGBASE_REPO_DIR}
+ pkg_cmd="${PKG_CMD} --rootdir ${DESTDIR} --repo-conf-dir ${PKGBASE_REPO_DIR}
-o ASSUME_ALWAYS_YES=yes -o IGNORE_OSVERSION=yes
-o ABI=${PKG_ABI} -o INSTALL_AS_USER=yes "
if [ -n "${NO_ROOT}" ]; then
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 13:02:21 +0000