Page MenuHomeFreeBSD
Files F142998243

D51471.diff
No OneTemporary
Actions

D51471.diff
View Options

diff --git a/release/Makefile.oci b/release/Makefile.oci
--- a/release/Makefile.oci
+++ b/release/Makefile.oci
@@ -3,7 +3,7 @@
#
.if defined(WITH_OCIIMAGES) && !empty(WITH_OCIIMAGES)
-OCI_IMAGES= static dynamic runtime
+OCI_IMAGES= static dynamic runtime notoolchain toolchain
.endif
oci-install:
@@ -16,8 +16,10 @@
OCI_TARGETS=
OCI_DEPS_static=
-OCI_DEPS_dynamic= container-image-static.txz
-OCI_DEPS_runtime= container-image-dynamic.txz
+OCI_DEPS_dynamic=container-image-static.txz
+OCI_DEPS_runtime=container-image-dynamic.txz
+OCI_DEPS_notoolchain=container-image-runtime.txz
+OCI_DEPS_toolchain=container-image-notoolchain.txz
.for _IMG in ${OCI_IMAGES}
OCI_TARGETS+= container-image-${_IMG}.txz
diff --git a/release/scripts/make-oci-image.sh b/release/scripts/make-oci-image.sh
--- a/release/scripts/make-oci-image.sh
+++ b/release/scripts/make-oci-image.sh
@@ -47,7 +47,7 @@
# metadata for what was installed). This trims more than 40Mb from the
# resulting image.
env IGNORE_OSVERSION=yes ABI=${abi} pkg --rootdir ${rootdir} --repo-conf-dir ${workdir}/repos \
- install -yq "$@" || exit $?
+ install -yq -g "$@" || exit $?
rm -rf ${rootdir}/var/db/pkg/repos
}
diff --git a/release/tools/oci-image-notoolchain.conf b/release/tools/oci-image-notoolchain.conf
new file mode 100644
--- /dev/null
+++ b/release/tools/oci-image-notoolchain.conf
@@ -0,0 +1,68 @@
+#! /bin/sh
+
+# Build OCI container image with almost all packages suitable for jails, excluding compiler
+
+OCI_BASE_IMAGE=runtime
+
+oci_image_build() {
+ set_cmd ${workdir} /bin/sh
+ install_packages ${abi} ${workdir} \
+ FreeBSD-acct \
+ FreeBSD-at \
+ FreeBSD-audit \
+ FreeBSD-autofs \
+ FreeBSD-blocklist \
+ FreeBSD-bsnmp \
+ FreeBSD-caroot \
+ FreeBSD-certctl \
+ FreeBSD-clibs \
+ FreeBSD-console-tools \
+ FreeBSD-cron \
+ FreeBSD-csh \
+ FreeBSD-dma \
+ FreeBSD-ee \
+ FreeBSD-fd \
+ FreeBSD-fetch \
+ FreeBSD-ftp \
+ FreeBSD-ftpd \
+ FreeBSD-inetd \
+ FreeBSD-ipf \
+ FreeBSD-ipfw \
+ FreeBSD-iscsi \
+ FreeBSD-jail \
+ FreeBSD-kerberos \
+ FreeBSD-kerberos-lib \
+ FreeBSD-libarchive \
+ FreeBSD-libcompiler_rt-dev \
+ FreeBSD-libexecinfo \
+ FreeBSD-libucl \
+ FreeBSD-locales \
+ FreeBSD-lp \
+ FreeBSD-mtree \
+ FreeBSD-natd \
+ FreeBSD-netmap \
+ FreeBSD-newsyslog \
+ FreeBSD-nfs \
+ FreeBSD-nuageinit \
+ FreeBSD-openssl \
+ FreeBSD-periodic \
+ FreeBSD-pf \
+ FreeBSD-pkg-bootstrap \
+ FreeBSD-quotacheck \
+ FreeBSD-rc \
+ FreeBSD-rcmds \
+ FreeBSD-rescue \
+ FreeBSD-resolvconf \
+ FreeBSD-runtime \
+ FreeBSD-ssh \
+ FreeBSD-syslogd \
+ FreeBSD-tcpd \
+ FreeBSD-telnet \
+ FreeBSD-ufs \
+ FreeBSD-unbound \
+ FreeBSD-utilities \
+ FreeBSD-vi \
+ FreeBSD-yp \
+ FreeBSD-zfs \
+ FreeBSD-zoneinfo
+}
diff --git a/release/tools/oci-image-toolchain.conf b/release/tools/oci-image-toolchain.conf
new file mode 100644
--- /dev/null
+++ b/release/tools/oci-image-toolchain.conf
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+# Build Open Container Initiative (OCI) container image with almost all of FreeBSD base.txz
+
+OCI_BASE_IMAGE=notoolchain
+
+oci_image_build() {
+ set_cmd ${workdir} /bin/sh
+ install_packages ${abi} ${workdir} \
+ FreeBSD-clang \
+ FreeBSD-ctf-tools \
+ FreeBSD-lld \
+ FreeBSD-lldb \
+ FreeBSD-toolchain \
+ FreeBSD-*-dev
+}

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 26, 4:24 AM (18 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28000209
Default Alt Text
D51471.diff (3 KB)

Event Timeline