From a8ff81941a223315ce296eacc51949b06227049a Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 12 2025 13:57:46 +0000 Subject: [PATCH 1/4] Remove now unused compat symlinks The new names have now been in use for a while so drop the compat symlinks. See: https://pagure.io/pungi-fedora/pull-request/1292 See: https://pagure.io/fedora-infra/ansible/pull-request/2372 --- diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml deleted file mode 120000 index c2542a6..0000000 --- a/fedora-kinoite.yaml +++ /dev/null @@ -1 +0,0 @@ -kinoite-ostree.yaml \ No newline at end of file diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml deleted file mode 120000 index f9283ac..0000000 --- a/fedora-onyx.yaml +++ /dev/null @@ -1 +0,0 @@ -budgie-atomic-ostree.yaml \ No newline at end of file diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml deleted file mode 120000 index 0728c62..0000000 --- a/fedora-sericea.yaml +++ /dev/null @@ -1 +0,0 @@ -sway-atomic-ostree.yaml \ No newline at end of file diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml deleted file mode 120000 index 0c5ed77..0000000 --- a/fedora-silverblue.yaml +++ /dev/null @@ -1 +0,0 @@ -silverblue-ostree.yaml \ No newline at end of file From 093e6c493ba20c9321f2528ff3295bf3fdb40d5c Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 12 2025 14:05:06 +0000 Subject: [PATCH 2/4] Kinoite: Set variant to 'kinoite' by default The variable is overridden as needed in Kinoite Mobile manifests. This does not introduce any change to the final processed manifests. --- diff --git a/kinoite-common.yaml b/kinoite-common.yaml index a4c5c68..0d415ce 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -1,6 +1,10 @@ include: - common.yaml +# Default to Kinoite and override in Kinoite Mobile manifests +variables: + variant: "kinoite" + conditional-include: - if: variant == "kinoite" include: diff --git a/kinoite-ostree.yaml b/kinoite-ostree.yaml index 7cdfdcb..7d9f1c1 100644 --- a/kinoite-ostree.yaml +++ b/kinoite-ostree.yaml @@ -1,6 +1,5 @@ variables: bootable_container: false - variant: "kinoite" include: - kinoite-common.yaml diff --git a/kinoite.yaml b/kinoite.yaml index f335856..00939cb 100644 --- a/kinoite.yaml +++ b/kinoite.yaml @@ -1,7 +1,5 @@ variables: bootable_container: true - variant: "kinoite" - include: - kinoite-common.yaml From 2a1a92aae04b23c8892e8a1cc221aa652c1b259d Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 12 2025 14:09:08 +0000 Subject: [PATCH 3/4] common: Default to Bootable Containers, override as needed Default to building Bootable Containers and override as needed for the classic ostree manifests. This does not introduce any change to the final processed manifests. --- diff --git a/base-atomic.yaml b/base-atomic.yaml index 78eab0e..97d6b78 100644 --- a/base-atomic.yaml +++ b/base-atomic.yaml @@ -1,5 +1,4 @@ variables: - bootable_container: true variant: "base-atomic" include: diff --git a/budgie-atomic.yaml b/budgie-atomic.yaml index 5a2d9c0..66ccbfa 100644 --- a/budgie-atomic.yaml +++ b/budgie-atomic.yaml @@ -1,6 +1,3 @@ -variables: - bootable_container: true - include: - budgie-atomic-common.yaml diff --git a/cinnamon-atomic.yaml b/cinnamon-atomic.yaml index 846a8a1..29ce215 100644 --- a/cinnamon-atomic.yaml +++ b/cinnamon-atomic.yaml @@ -1,5 +1,4 @@ variables: - bootable_container: true variant: "cinnamon-atomic" include: diff --git a/common.yaml b/common.yaml index ff3565b..bcb82f8 100644 --- a/common.yaml +++ b/common.yaml @@ -2,6 +2,10 @@ releasever: 43 automatic-version-prefix: "${releasever}." mutate-os-release: "${releasever}" +variables: + # Default to Bootable Containers and override in classic ostree manifests + bootable_container: true + # Default to `bash` in our container, the same as other containers we ship. container-cmd: - /usr/bin/bash diff --git a/cosmic-atomic.yaml b/cosmic-atomic.yaml index d0242a7..40c485b 100644 --- a/cosmic-atomic.yaml +++ b/cosmic-atomic.yaml @@ -1,5 +1,4 @@ variables: - bootable_container: true variant: "cosmic-atomic" include: diff --git a/deepin-atomic.yaml b/deepin-atomic.yaml index 893de5f..d407020 100644 --- a/deepin-atomic.yaml +++ b/deepin-atomic.yaml @@ -1,5 +1,4 @@ variables: - bootable_container: true variant: "deepin-atomic" include: diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml index 2f6e948..b62dd13 100644 --- a/kinoite-mobile.yaml +++ b/kinoite-mobile.yaml @@ -1,5 +1,4 @@ variables: - bootable_container: true variant: "kinoite-mobile" include: diff --git a/kinoite.yaml b/kinoite.yaml index 00939cb..e72cc6d 100644 --- a/kinoite.yaml +++ b/kinoite.yaml @@ -1,5 +1,3 @@ -variables: - bootable_container: true include: - kinoite-common.yaml diff --git a/lxqt-atomic.yaml b/lxqt-atomic.yaml index 4c4c9ff..f4a77ea 100644 --- a/lxqt-atomic.yaml +++ b/lxqt-atomic.yaml @@ -1,5 +1,4 @@ variables: - bootable_container: true variant: "lxqt-atomic" include: diff --git a/mate-atomic.yaml b/mate-atomic.yaml index 57a8598..690eda8 100644 --- a/mate-atomic.yaml +++ b/mate-atomic.yaml @@ -1,5 +1,4 @@ variables: - bootable_container: true variant: "mate-atomic" include: diff --git a/silverblue.yaml b/silverblue.yaml index 54f175e..e014a10 100644 --- a/silverblue.yaml +++ b/silverblue.yaml @@ -1,6 +1,3 @@ -variables: - bootable_container: true - include: - silverblue-common.yaml diff --git a/sway-atomic.yaml b/sway-atomic.yaml index a41663d..b7b67e1 100644 --- a/sway-atomic.yaml +++ b/sway-atomic.yaml @@ -1,6 +1,3 @@ -variables: - bootable_container: true - include: - sway-atomic-common.yaml diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml index 33bae63..870ff06 100644 --- a/xfce-atomic.yaml +++ b/xfce-atomic.yaml @@ -1,5 +1,4 @@ variables: - bootable_container: true variant: "xfce-atomic" include: From 904c29ffcb2e2bf97c4a8898bf2c95d5c92a49ec Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 12 2025 14:10:13 +0000 Subject: [PATCH 4/4] XFCE & LXQt still require Perl --- diff --git a/common.yaml b/common.yaml index bcb82f8..779d2d4 100644 --- a/common.yaml +++ b/common.yaml @@ -5,6 +5,8 @@ mutate-os-release: "${releasever}" variables: # Default to Bootable Containers and override in classic ostree manifests bootable_container: true + # Exclude Perl by default and override for XFCE & LXQt + exclude_perl: true # Default to `bash` in our container, the same as other containers we ship. container-cmd: @@ -40,6 +42,9 @@ conditional-include: include: - bootc.yaml - dnf5.yaml + - if: exclude_perl == true + include: + - exclude-perl.yaml packages: # Ensure that we have a kernel. Kernel packages are not in any comps group @@ -150,9 +155,6 @@ exclude-packages: - qemu-kvm-core - qemu-device-display-virtio-gpu - qemu-device-display-virtio-vga - # Ensure that we do not include any Perl package - - perl-interpreter - - perl-libs postprocess: - | diff --git a/exclude-perl.yaml b/exclude-perl.yaml new file mode 100644 index 0000000..4b360c9 --- /dev/null +++ b/exclude-perl.yaml @@ -0,0 +1,4 @@ +# Ensure that we do not include any Perl package +exclude-packages: + - perl-interpreter + - perl-libs diff --git a/lxqt-atomic.yaml b/lxqt-atomic.yaml index f4a77ea..b8e53e7 100644 --- a/lxqt-atomic.yaml +++ b/lxqt-atomic.yaml @@ -1,5 +1,6 @@ variables: variant: "lxqt-atomic" + exclude_perl: false include: - common.yaml diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml index 870ff06..576fcdb 100644 --- a/xfce-atomic.yaml +++ b/xfce-atomic.yaml @@ -1,5 +1,6 @@ variables: variant: "xfce-atomic" + exclude_perl: false include: - common.yaml