From 1c6ea2c89f69b924e866dc901a2183068e44297f Mon Sep 17 00:00:00 2001 From: unitexe Date: Sun, 11 Jan 2026 14:24:57 -0600 Subject: Fix circular dependency between banner-quadlet and add-user-svc --- .../recipes-containers/banner-quadlet/banner-quadlet.bb | 5 ++--- .../recipes-containers/packagegroups/packagegroup-unit-quadlets.bb | 5 +++++ .../recipes-unit/images/core-image-unit.bbappend | 1 + .../virtualization-layer/recipes-users/useradd/add-user-svc.bbappend | 2 -- 4 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 meta-unit-core/dynamic-layers/virtualization-layer/recipes-containers/packagegroups/packagegroup-unit-quadlets.bb (limited to 'meta-unit-core/dynamic-layers') diff --git a/meta-unit-core/dynamic-layers/virtualization-layer/recipes-containers/banner-quadlet/banner-quadlet.bb b/meta-unit-core/dynamic-layers/virtualization-layer/recipes-containers/banner-quadlet/banner-quadlet.bb index 67c2246..e0c3fb6 100644 --- a/meta-unit-core/dynamic-layers/virtualization-layer/recipes-containers/banner-quadlet/banner-quadlet.bb +++ b/meta-unit-core/dynamic-layers/virtualization-layer/recipes-containers/banner-quadlet/banner-quadlet.bb @@ -1,4 +1,5 @@ SUMMARY = "Banner quadlet" +DESCRIPTION = "A quadlet for a banner container that runs rootless" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=a0e6886d263a557228f8d3c5bef21837" @@ -18,6 +19,4 @@ do_install() { install -D -m 0644 ${UNPACKDIR}/banner.container ${D}/home/${ROOTLESS_USER_NAME}/.config/containers/systemd/banner.container } -FILES:${PN} = "\ - /home/${ROOTLESS_USER_NAME}/.config/containers/systemd/banner.container \ -" +FILES:${PN} = "/home/${ROOTLESS_USER_NAME}/.config/containers/systemd/banner.container" diff --git a/meta-unit-core/dynamic-layers/virtualization-layer/recipes-containers/packagegroups/packagegroup-unit-quadlets.bb b/meta-unit-core/dynamic-layers/virtualization-layer/recipes-containers/packagegroups/packagegroup-unit-quadlets.bb new file mode 100644 index 0000000..aae5c43 --- /dev/null +++ b/meta-unit-core/dynamic-layers/virtualization-layer/recipes-containers/packagegroups/packagegroup-unit-quadlets.bb @@ -0,0 +1,5 @@ +SUMMARY = "Unit quadlet packages" + +inherit packagegroup + +RDEPENDS:${PN}:append = " banner-quadlet" diff --git a/meta-unit-core/dynamic-layers/virtualization-layer/recipes-unit/images/core-image-unit.bbappend b/meta-unit-core/dynamic-layers/virtualization-layer/recipes-unit/images/core-image-unit.bbappend index ee336ce..01cc401 100644 --- a/meta-unit-core/dynamic-layers/virtualization-layer/recipes-unit/images/core-image-unit.bbappend +++ b/meta-unit-core/dynamic-layers/virtualization-layer/recipes-unit/images/core-image-unit.bbappend @@ -1 +1,2 @@ IMAGE_INSTALL:append = " packagegroup-unit-containers" +IMAGE_INSTALL:append = " packagegroup-unit-quadlets" diff --git a/meta-unit-core/dynamic-layers/virtualization-layer/recipes-users/useradd/add-user-svc.bbappend b/meta-unit-core/dynamic-layers/virtualization-layer/recipes-users/useradd/add-user-svc.bbappend index 6c79ab4..23fe467 100644 --- a/meta-unit-core/dynamic-layers/virtualization-layer/recipes-users/useradd/add-user-svc.bbappend +++ b/meta-unit-core/dynamic-layers/virtualization-layer/recipes-users/useradd/add-user-svc.bbappend @@ -1,4 +1,2 @@ inherit enable-linger inherit set-xdg-env - -RDEPENDS:${PN}:append = " banner-quadlet" -- cgit v1.2.3