From 63f24c96a6b533a67e9bacd15a3e974e64b5f9a5 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 12 2025 17:32:32 +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 92999460804d807bfa69022c1ea3df88ea0e31a3 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 12 2025 17:32:32 +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 c54a299..f974d76 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 5472a77..13cbfe4 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 5faa660..4ad98be 100644 --- a/kinoite.yaml +++ b/kinoite.yaml @@ -1,7 +1,5 @@ variables: bootable_container: true - variant: "kinoite" - include: - kinoite-common.yaml From ffedc8e4ba78ea828aaf0c215baaf9389bb73ac3 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 12 2025 17:32:32 +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 e266c7c..ce44d94 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 557b77f..10fea8e 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 9fc6611..06903bc 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 9e9d860..7bcf132 100644 --- a/common.yaml +++ b/common.yaml @@ -2,6 +2,10 @@ releasever: 42 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 cabde69..f8d1363 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 72bdd9b..878efce 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 1c77053..0c785ac 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 4ad98be..2c3d5d1 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 3516cc2..8cad588 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 4f62a9b..ef8103f 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 6d03c23..8369a0a 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 5f4a507..1f1c228 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 4f9b782..b5b4b65 100644 --- a/xfce-atomic.yaml +++ b/xfce-atomic.yaml @@ -1,5 +1,4 @@ variables: - bootable_container: true variant: "xfce-atomic" include: From 2f8051e7f73c831cbbe811a6d0eda9255c984d89 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 12 2025 17:32:32 +0000 Subject: [PATCH 4/4] XFCE & LXQt still require Perl --- diff --git a/common.yaml b/common.yaml index 7bcf132..08591be 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 8cad588..b7ac02a 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 b5b4b65..e089bef 100644 --- a/xfce-atomic.yaml +++ b/xfce-atomic.yaml @@ -1,5 +1,6 @@ variables: variant: "xfce-atomic" + exclude_perl: false include: - common.yaml