From 6afb59b43620351f8b08b2f953cb84a3cddd0e64 Mon Sep 17 00:00:00 2001 From: unitexe Date: Sun, 19 Apr 2026 02:36:19 -0500 Subject: Move images from recipes-unit/images to recipes-core/images --- .../images/core-image-unit-initramfs.bb | 31 ++++++++++++++++++++++ .../recipes-core/images/core-image-unit.bb | 7 +++++ .../recipes-core/images/unit-image-base.inc | 16 +++++++++++ .../images/core-image-unit-initramfs.bb | 31 ---------------------- .../recipes-unit/images/core-image-unit.bb | 7 ----- .../recipes-unit/images/unit-image-base.inc | 16 ----------- 6 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 meta-unit-core/recipes-core/images/core-image-unit-initramfs.bb create mode 100644 meta-unit-core/recipes-core/images/core-image-unit.bb create mode 100644 meta-unit-core/recipes-core/images/unit-image-base.inc delete mode 100644 meta-unit-core/recipes-unit/images/core-image-unit-initramfs.bb delete mode 100644 meta-unit-core/recipes-unit/images/core-image-unit.bb delete mode 100644 meta-unit-core/recipes-unit/images/unit-image-base.inc (limited to 'meta-unit-core') diff --git a/meta-unit-core/recipes-core/images/core-image-unit-initramfs.bb b/meta-unit-core/recipes-core/images/core-image-unit-initramfs.bb new file mode 100644 index 0000000..7c664aa --- /dev/null +++ b/meta-unit-core/recipes-core/images/core-image-unit-initramfs.bb @@ -0,0 +1,31 @@ +SUMMARY = "Initramfs to boot a fully-featured rootfs" +DESCRIPTION = "Small initramfs that contains udev and init to find the real rootfs" +LICENSE = "MIT" + +inherit image + +INITRAMFS_SCRIPTS ?= "\ + initramfs-module-debug \ + initramfs-module-udev \ + initramfs-module-kmod \ +" + +PACKAGE_INSTALL = "\ + ${INITRAMFS_SCRIPTS} \ + ${VIRTUAL-RUNTIME_base-utils} \ + base-passwd \ +" + +# Ensure the initramfs only contains the bare minimum +IMAGE_FEATURES = "" +IMAGE_LINGUAS = "" + +# Don't allow the initramfs to contain a kernel, as kernel modules will depend +# on the kernel image. +PACKAGE_EXCLUDE = "kernel-image-*" + +IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +IMAGE_FSTYPES:remove:rpi = "wic.zst" +IMAGE_NAME_SUFFIX ?= "" +IMAGE_ROOTFS_SIZE = "24576" +IMAGE_ROOTFS_EXTRA_SPACE = "0" diff --git a/meta-unit-core/recipes-core/images/core-image-unit.bb b/meta-unit-core/recipes-core/images/core-image-unit.bb new file mode 100644 index 0000000..8dea4ce --- /dev/null +++ b/meta-unit-core/recipes-core/images/core-image-unit.bb @@ -0,0 +1,7 @@ +SUMMARY = "Unit image" + +LICENSE = "MIT" + +inherit fix-unitexe-home-dir-ownership + +require unit-image-base.inc diff --git a/meta-unit-core/recipes-core/images/unit-image-base.inc b/meta-unit-core/recipes-core/images/unit-image-base.inc new file mode 100644 index 0000000..5ff6c4d --- /dev/null +++ b/meta-unit-core/recipes-core/images/unit-image-base.inc @@ -0,0 +1,16 @@ +inherit core-image +inherit image-buildinfo + +IMAGE_FEATURES[validitems] += "boot-splash" +IMAGE_FEATURES[validitems] += "observability" + +IMAGE_INSTALL:append = " packagegroup-unit-networking" +IMAGE_INSTALL:append = " packagegroup-unit-system" +IMAGE_INSTALL:append = " packagegroup-unit-systemd" +IMAGE_INSTALL:append = " packagegroup-unit-users" +IMAGE_INSTALL:append = " packagegroup-unit-utils" + +# Allow for 4GB of extra space for misc. purposes (ex. container image storage) +IMAGE_ROOTFS_EXTRA_SPACE = "4194304" + +IMAGE_FEATURES:append = " splash" diff --git a/meta-unit-core/recipes-unit/images/core-image-unit-initramfs.bb b/meta-unit-core/recipes-unit/images/core-image-unit-initramfs.bb deleted file mode 100644 index 7c664aa..0000000 --- a/meta-unit-core/recipes-unit/images/core-image-unit-initramfs.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Initramfs to boot a fully-featured rootfs" -DESCRIPTION = "Small initramfs that contains udev and init to find the real rootfs" -LICENSE = "MIT" - -inherit image - -INITRAMFS_SCRIPTS ?= "\ - initramfs-module-debug \ - initramfs-module-udev \ - initramfs-module-kmod \ -" - -PACKAGE_INSTALL = "\ - ${INITRAMFS_SCRIPTS} \ - ${VIRTUAL-RUNTIME_base-utils} \ - base-passwd \ -" - -# Ensure the initramfs only contains the bare minimum -IMAGE_FEATURES = "" -IMAGE_LINGUAS = "" - -# Don't allow the initramfs to contain a kernel, as kernel modules will depend -# on the kernel image. -PACKAGE_EXCLUDE = "kernel-image-*" - -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" -IMAGE_FSTYPES:remove:rpi = "wic.zst" -IMAGE_NAME_SUFFIX ?= "" -IMAGE_ROOTFS_SIZE = "24576" -IMAGE_ROOTFS_EXTRA_SPACE = "0" diff --git a/meta-unit-core/recipes-unit/images/core-image-unit.bb b/meta-unit-core/recipes-unit/images/core-image-unit.bb deleted file mode 100644 index 8dea4ce..0000000 --- a/meta-unit-core/recipes-unit/images/core-image-unit.bb +++ /dev/null @@ -1,7 +0,0 @@ -SUMMARY = "Unit image" - -LICENSE = "MIT" - -inherit fix-unitexe-home-dir-ownership - -require unit-image-base.inc diff --git a/meta-unit-core/recipes-unit/images/unit-image-base.inc b/meta-unit-core/recipes-unit/images/unit-image-base.inc deleted file mode 100644 index 5ff6c4d..0000000 --- a/meta-unit-core/recipes-unit/images/unit-image-base.inc +++ /dev/null @@ -1,16 +0,0 @@ -inherit core-image -inherit image-buildinfo - -IMAGE_FEATURES[validitems] += "boot-splash" -IMAGE_FEATURES[validitems] += "observability" - -IMAGE_INSTALL:append = " packagegroup-unit-networking" -IMAGE_INSTALL:append = " packagegroup-unit-system" -IMAGE_INSTALL:append = " packagegroup-unit-systemd" -IMAGE_INSTALL:append = " packagegroup-unit-users" -IMAGE_INSTALL:append = " packagegroup-unit-utils" - -# Allow for 4GB of extra space for misc. purposes (ex. container image storage) -IMAGE_ROOTFS_EXTRA_SPACE = "4194304" - -IMAGE_FEATURES:append = " splash" -- cgit v1.2.3