From f3f8fdb52101e15e72f1f09ca116da524db9160e Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jun 13 2024 09:30:19 +0000 Subject: [PATCH 1/8] initramfs.yaml: Misc empty line fixup --- diff --git a/initramfs.yaml b/initramfs.yaml index 002d77a..a1c7972 100644 --- a/initramfs.yaml +++ b/initramfs.yaml @@ -1,7 +1,6 @@ # Set dracut configuration for the initramfs # See: https://gitlab.com/fedora/bootc/base-images/-/blob/main/tier-0/initramfs.yaml # See: https://github.com/coreos/fedora-coreos-config/tree/testing-devel/overlay.d/05core/usr/lib/dracut/dracut.conf.d -# postprocess: - | #!/usr/bin/env bash From 28bf47caa9034962ef4fed894a4bb64b523f965f Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jun 13 2024 09:30:19 +0000 Subject: [PATCH 2/8] Move common manifest includes to variants manifests - Rename common manifests to remove fedora prefix & ostree mention - Directly include the common manifest in each variant manifest to reduces the number of level of indirection for the manifests --- diff --git a/README.md b/README.md index 8503afd..8205f2b 100644 --- a/README.md +++ b/README.md @@ -187,7 +187,7 @@ Make a PR similar to ``` sed -i "s/41/42/g" *.repo comps-sync.py -sed -i "s/releasever: 41/releasever: 42/" fedora-common-ostree.yaml +sed -i "s/releasever: 41/releasever: 42/" common.yaml sed -i "s/# - fedora-41/# - fedora-42/" fedora-*.yaml mv fedora-41.repo fedora-42.repo mv fedora-41-updates.repo fedora-42-updates.repo diff --git a/budgie-desktop-pkgs.yaml b/budgie-desktop-pkgs.yaml index b194ffa..bc40b71 100644 --- a/budgie-desktop-pkgs.yaml +++ b/budgie-desktop-pkgs.yaml @@ -1,5 +1,4 @@ # DO NOT EDIT! This content is generated from comps-sync.py -include: fedora-common-ostree.yaml packages: - ModemManager - NetworkManager-adsl diff --git a/cinnamon-desktop-pkgs.yaml b/cinnamon-desktop-pkgs.yaml index 4c94c90..a6d80e0 100644 --- a/cinnamon-desktop-pkgs.yaml +++ b/cinnamon-desktop-pkgs.yaml @@ -1,5 +1,4 @@ # DO NOT EDIT! This content is generated from comps-sync.py -include: fedora-common-ostree.yaml packages: - NetworkManager-adsl - NetworkManager-bluetooth diff --git a/common-packages.yaml b/common-packages.yaml new file mode 100644 index 0000000..2f551de --- /dev/null +++ b/common-packages.yaml @@ -0,0 +1,210 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - NetworkManager + - NetworkManager-bluetooth + - NetworkManager-config-connectivity-fedora + - NetworkManager-wifi + - NetworkManager-wwan + - acl + - alsa-ucm + - alsa-utils + - amd-gpu-firmware + - at-spi2-atk + - at-spi2-core + - atheros-firmware + - attr + - audit + - b43-fwcutter + - b43-openfwwf + - basesystem + - bash + - bash-color-prompt + - bash-completion + - bc + - bind-utils + - bluez-cups + - brcmfmac-firmware + - brltty + - btrfs-progs + - bzip2 + - chrony + - cifs-utils + - colord + - compsize + - coreutils + - cpio + - cryptsetup + - cups + - cups-browsed + - cups-filters + - curl + - cyrus-sasl-plain + - default-editor + - default-fonts-cjk-mono + - default-fonts-cjk-sans + - default-fonts-cjk-serif + - default-fonts-core-emoji + - default-fonts-core-math + - default-fonts-core-mono + - default-fonts-core-sans + - default-fonts-core-serif + - default-fonts-other-mono + - default-fonts-other-sans + - default-fonts-other-serif + - dhcp-client + - dnsmasq + - e2fsprogs + - ethtool + - exfatprogs + - fedora-bookmarks + - fedora-chromium-config + - fedora-flathub-remote + - fedora-workstation-backgrounds + - fedora-workstation-repositories + - file + - filesystem + - firefox + - firewalld + - fpaste + - fros-gnome + - fwupd + - gamemode + - glibc + - glibc-all-langpacks + - gnupg2 + - gstreamer1-plugin-libav + - gstreamer1-plugins-bad-free + - gstreamer1-plugins-good + - gstreamer1-plugins-ugly-free + - gutenprint + - gutenprint-cups + - hostname + - hplip + - hunspell + - ibus-anthy + - ibus-gtk3 + - ibus-gtk4 + - ibus-hangul + - ibus-libpinyin + - ibus-libzhuyin + - ibus-m17n + - ibus-typing-booster + - intel-gpu-firmware + - iproute + - iptables-nft + - iptstate + - iputils + - iwlegacy-firmware + - iwlwifi-dvm-firmware + - iwlwifi-mvm-firmware + - kbd + - less + - libertas-firmware + - libglvnd-gles + - linux-firmware + - logrotate + - lrzsz + - lsof + - man-db + - man-pages + - mdadm + - mpage + - mt7xxx-firmware + - mtr + - nfs-utils + - nss-altfiles + - nss-mdns + - ntfs-3g + - ntfsprogs + - nvidia-gpu-firmware + - nxpwireless-firmware + - opensc + - openssh-clients + - openssh-server + - orca + - ostree-grub2 + - pam_afs_session + - paps + - passwdqc + - pciutils + - pinfo + - pipewire-alsa + - pipewire-gstreamer + - pipewire-pulseaudio + - pipewire-utils + - plocate + - plymouth + - plymouth-system-theme + - policycoreutils + - policycoreutils-python-utils + - procps-ng + - psmisc + - qemu-guest-agent + - qt5-qtbase + - qt5-qtbase-gui + - qt5-qtdeclarative + - qt5-qtxmlpatterns + - quota + - realmd + - realtek-firmware + - rootfiles + - rpm + - rpm-ostree + - rsync + - samba-client + - selinux-policy-targeted + - setup + - shadow-utils + - sos + - speech-dispatcher + - spice-vdagent + - spice-webdavd + - sssd-common + - sssd-kcm + - sudo + - system-config-printer-udev + - systemd + - systemd-oomd-defaults + - systemd-resolved + - systemd-udev + - tar + - time + - tiwilink-firmware + - toolbox + - tree + - unzip + - uresourced + - usb_modeswitch + - usbutils + - util-linux + - vim-minimal + - wget2-wget + - which + - whois + - wireplumber + - words + - wpa_supplicant + - zip + - zram-generator-defaults +packages-x86_64: + - alsa-sof-firmware + - amd-ucode-firmware + - cirrus-audio-firmware + - hyperv-daemons + - intel-audio-firmware + - libva-intel-media-driver + - mcelog + - microcode_ctl + - open-vm-tools-desktop + - thermald + - virtualbox-guest-additions +packages-aarch64: + - hyperv-daemons + - open-vm-tools-desktop + - pd-mapper + - qcom-firmware + - qrtr + - rmtfs +packages-ppc64le: + - lsvpd + - powerpc-utils diff --git a/common.yaml b/common.yaml new file mode 100644 index 0000000..0a3a203 --- /dev/null +++ b/common.yaml @@ -0,0 +1,147 @@ +releasever: 41 +automatic-version-prefix: "${releasever}." +mutate-os-release: "${releasever}" + +# Default to `bash` in our container, the same as other containers we ship. +container-cmd: + - /usr/bin/bash + +include: + # Packages common to all variants + - common-packages.yaml + # See: https://gitlab.com/fedora/ostree/sig/-/issues/1 + # - bootupd.yaml + # Dracut configuration for the initramfs + - initramfs.yaml + # Read only sysroot + - sysroot-ro.yaml + +packages: + # Ensure that we have a kernel. Kernel packages are not in any comps group + - kernel + - kernel-modules + - kernel-modules-extra + # Do not include "full" Git as it brings in Perl + - git-core + # Explicitely add Git docs + - git-core-doc + - lvm2 + # Required for compatibility with old bootloaders until we have bootupd + # See https://github.com/fedora-silverblue/issue-tracker/issues/120 + - ostree-grub2 + # Required until we've completed the move to systemd-sysusers + # See: https://github.com/fedora-silverblue/issue-tracker/issues/362 + - nss-altfiles + # Container management + - buildah + - podman + - skopeo + # Keep slirp4netns for rootless containers until it's fully deprecated in podman + # See: https://github.com/fedora-silverblue/issue-tracker/issues/547 + - slirp4netns + # See: https://github.com/fedora-silverblue/issue-tracker/issues/503 + - systemd-container + # Provides terminal tools like clear, reset, tput, and tset + - ncurses + # Flatpak support + - flatpak + - xdg-desktop-portal + # HFS filesystem tools for Apple hardware + # See https://github.com/projectatomic/rpm-ostree/issues/1380 + - hfsplus-tools + # Contains default ostree remote config to be used on client's + # system for fetching ostree update + - fedora-repos-ostree + # the archive repo for more reliable package layering + # https://github.com/coreos/fedora-coreos-tracker/issues/400 + - fedora-repos-archive + # Always include at least full English language support by default + # https://gitlab.com/fedora/ostree/sig/-/issues/14 + - langpacks-en + +selinux: true +documentation: true +boot-location: modules +etc-group-members: + - wheel +tmp-is-dir: true + +ignore-removed-users: + - root +ignore-removed-groups: + - root +check-passwd: + type: file + filename: passwd +check-groups: + type: file + filename: group + +default_target: graphical.target + +packages-aarch64: + - grub2-efi + - efibootmgr + - shim +packages-ppc64le: + - grub2 +packages-x86_64: + - grub2-efi-ia32 + - grub2-efi-x64 + - grub2-pc + - efibootmgr + - shim-ia32 + - shim-x64 + +# Make sure the following are not pulled in when Recommended by other packages +exclude-packages: + - PackageKit + # We can not include openh264. See https://fedoraproject.org/wiki/OpenH264 + - gstreamer1-plugin-openh264 + - mozilla-openh264 + - openh264 + # Always exclude dnf when pulled in as a dependency + - dnf + - dnf-plugins-core + - dnf5 + - dnf5-plugins + # https://github.com/fedora-silverblue/issue-tracker/issues/517 + - grubby + - sdubby + +postprocess: + - | + #!/usr/bin/env bash + set -xeuo pipefail + + # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295 + # From https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf + install -dm0755 /usr/lib/systemd/journald.conf.d/ + echo -e "[Journal]\nStorage=persistent" > /usr/lib/systemd/journald.conf.d/10-persistent.conf + + # See: https://src.fedoraproject.org/rpms/glibc/pull-request/4 + # Basically that program handles deleting old shared library directories + # mid-transaction, which never applies to rpm-ostree. This is structured as a + # loop/glob to avoid hardcoding (or trying to match) the architecture. + for x in /usr/sbin/glibc_post_upgrade.*; do + if test -f ${x}; then + ln -srf /usr/bin/true ${x} + fi + done + + # Remove loader directory causing issues in Anaconda in unified core mode + # Will be obsolete once we start using bootupd + rm -rf /usr/lib/ostree-boot/loader + + # Undo RPM scripts enabling units; we want the presets to be canonical + # https://github.com/projectatomic/rpm-ostree/issues/1803 + rm -rf /etc/systemd/system/* + systemctl preset-all + rm -rf /etc/systemd/user/* + systemctl --user --global preset-all + + # Fix triggerin for samba-client in cups package (not supported by rpm-ostree yet) + # https://github.com/fedora-silverblue/issue-tracker/issues/532 + ln -snf /usr/libexec/samba/cups_backend_smb /usr/lib/cups/backend/smb + +postprocess-script: "postprocess.sh" diff --git a/comps-sync.py b/comps-sync.py index fc4d88e..b3708bb 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -32,12 +32,10 @@ def format_pkgtype(pkgtype): return 'mandatory' assert False -def write_manifest(fpath, pkgs, include=None): +def write_manifest(fpath, pkgs): '''Write the package list in a manifest.''' with open(fpath, 'w', encoding='UTF-8') as f: f.write("# DO NOT EDIT! This content is generated from comps-sync.py\n") - if include is not None: - f.write(f'include: {include}\n') f.write("packages:\n") for pkg in sorted(pkgs['all']): f.write(f' - {pkg}\n') @@ -154,10 +152,7 @@ def update_manifests_from_groups(comps, groups, path, desktop, save, comps_exclu if (n_manifest_new > 0 or n_comps_new > 0): if save: - if desktop == "common": - write_manifest(path, manifest_packages) - else: - write_manifest(path, manifest_packages, include="fedora-common-ostree.yaml") + write_manifest(path, manifest_packages) return 1 return 0 @@ -194,7 +189,7 @@ def main(): # Return code indicates if changes have or would have been done ret = 0 - ret += update_manifests_from_groups(comps, groups, 'fedora-common-ostree-pkgs.yaml', "common", args.save, comps_exclude_list, comps_exclude_list_all) + ret += update_manifests_from_groups(comps, groups, 'common-packages.yaml', "common", args.save, comps_exclude_list, comps_exclude_list_all) # List of comps groups used for each desktop desktops_comps_groups = { diff --git a/deepin-desktop-pkgs.yaml b/deepin-desktop-pkgs.yaml index dc1fa9e..16882ee 100644 --- a/deepin-desktop-pkgs.yaml +++ b/deepin-desktop-pkgs.yaml @@ -1,5 +1,4 @@ # DO NOT EDIT! This content is generated from comps-sync.py -include: fedora-common-ostree.yaml packages: - deepin-calculator - deepin-calendar diff --git a/fedora-base.yaml b/fedora-base.yaml index 6d0b132..5c058c3 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -1,4 +1,6 @@ -include: fedora-common-ostree.yaml +include: + - common.yaml + ref: fedora/rawhide/${basearch}/base rojig: name: fedora-base diff --git a/fedora-cinnamon.yaml b/fedora-cinnamon.yaml index b94e15d..0485db7 100644 --- a/fedora-cinnamon.yaml +++ b/fedora-cinnamon.yaml @@ -1,4 +1,7 @@ -include: cinnamon-desktop-pkgs.yaml +include: + - common.yaml + - cinnamon-desktop-pkgs.yaml + ref: fedora/rawhide/${basearch}/cinnamon rojig: name: fedora-cinnamon diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml deleted file mode 100644 index 2f551de..0000000 --- a/fedora-common-ostree-pkgs.yaml +++ /dev/null @@ -1,210 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager - - NetworkManager-bluetooth - - NetworkManager-config-connectivity-fedora - - NetworkManager-wifi - - NetworkManager-wwan - - acl - - alsa-ucm - - alsa-utils - - amd-gpu-firmware - - at-spi2-atk - - at-spi2-core - - atheros-firmware - - attr - - audit - - b43-fwcutter - - b43-openfwwf - - basesystem - - bash - - bash-color-prompt - - bash-completion - - bc - - bind-utils - - bluez-cups - - brcmfmac-firmware - - brltty - - btrfs-progs - - bzip2 - - chrony - - cifs-utils - - colord - - compsize - - coreutils - - cpio - - cryptsetup - - cups - - cups-browsed - - cups-filters - - curl - - cyrus-sasl-plain - - default-editor - - default-fonts-cjk-mono - - default-fonts-cjk-sans - - default-fonts-cjk-serif - - default-fonts-core-emoji - - default-fonts-core-math - - default-fonts-core-mono - - default-fonts-core-sans - - default-fonts-core-serif - - default-fonts-other-mono - - default-fonts-other-sans - - default-fonts-other-serif - - dhcp-client - - dnsmasq - - e2fsprogs - - ethtool - - exfatprogs - - fedora-bookmarks - - fedora-chromium-config - - fedora-flathub-remote - - fedora-workstation-backgrounds - - fedora-workstation-repositories - - file - - filesystem - - firefox - - firewalld - - fpaste - - fros-gnome - - fwupd - - gamemode - - glibc - - glibc-all-langpacks - - gnupg2 - - gstreamer1-plugin-libav - - gstreamer1-plugins-bad-free - - gstreamer1-plugins-good - - gstreamer1-plugins-ugly-free - - gutenprint - - gutenprint-cups - - hostname - - hplip - - hunspell - - ibus-anthy - - ibus-gtk3 - - ibus-gtk4 - - ibus-hangul - - ibus-libpinyin - - ibus-libzhuyin - - ibus-m17n - - ibus-typing-booster - - intel-gpu-firmware - - iproute - - iptables-nft - - iptstate - - iputils - - iwlegacy-firmware - - iwlwifi-dvm-firmware - - iwlwifi-mvm-firmware - - kbd - - less - - libertas-firmware - - libglvnd-gles - - linux-firmware - - logrotate - - lrzsz - - lsof - - man-db - - man-pages - - mdadm - - mpage - - mt7xxx-firmware - - mtr - - nfs-utils - - nss-altfiles - - nss-mdns - - ntfs-3g - - ntfsprogs - - nvidia-gpu-firmware - - nxpwireless-firmware - - opensc - - openssh-clients - - openssh-server - - orca - - ostree-grub2 - - pam_afs_session - - paps - - passwdqc - - pciutils - - pinfo - - pipewire-alsa - - pipewire-gstreamer - - pipewire-pulseaudio - - pipewire-utils - - plocate - - plymouth - - plymouth-system-theme - - policycoreutils - - policycoreutils-python-utils - - procps-ng - - psmisc - - qemu-guest-agent - - qt5-qtbase - - qt5-qtbase-gui - - qt5-qtdeclarative - - qt5-qtxmlpatterns - - quota - - realmd - - realtek-firmware - - rootfiles - - rpm - - rpm-ostree - - rsync - - samba-client - - selinux-policy-targeted - - setup - - shadow-utils - - sos - - speech-dispatcher - - spice-vdagent - - spice-webdavd - - sssd-common - - sssd-kcm - - sudo - - system-config-printer-udev - - systemd - - systemd-oomd-defaults - - systemd-resolved - - systemd-udev - - tar - - time - - tiwilink-firmware - - toolbox - - tree - - unzip - - uresourced - - usb_modeswitch - - usbutils - - util-linux - - vim-minimal - - wget2-wget - - which - - whois - - wireplumber - - words - - wpa_supplicant - - zip - - zram-generator-defaults -packages-x86_64: - - alsa-sof-firmware - - amd-ucode-firmware - - cirrus-audio-firmware - - hyperv-daemons - - intel-audio-firmware - - libva-intel-media-driver - - mcelog - - microcode_ctl - - open-vm-tools-desktop - - thermald - - virtualbox-guest-additions -packages-aarch64: - - hyperv-daemons - - open-vm-tools-desktop - - pd-mapper - - qcom-firmware - - qrtr - - rmtfs -packages-ppc64le: - - lsvpd - - powerpc-utils diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml deleted file mode 100644 index d3baf9b..0000000 --- a/fedora-common-ostree.yaml +++ /dev/null @@ -1,146 +0,0 @@ -releasever: 41 -automatic-version-prefix: "${releasever}." -mutate-os-release: "${releasever}" - -# Default to `bash` in our container, the same as other containers we ship. -container-cmd: - - /usr/bin/bash - -include: - - fedora-common-ostree-pkgs.yaml - # See: https://gitlab.com/fedora/ostree/sig/-/issues/1 - # - bootupd.yaml - # Dracut configuration for the initramfs - - initramfs.yaml - # Read only sysroot - - sysroot-ro.yaml - -packages: - # Ensure that we have a kernel. Kernel packages are not in any comps group - - kernel - - kernel-modules - - kernel-modules-extra - # Do not include "full" Git as it brings in Perl - - git-core - # Explicitely add Git docs - - git-core-doc - - lvm2 - # Required for compatibility with old bootloaders until we have bootupd - # See https://github.com/fedora-silverblue/issue-tracker/issues/120 - - ostree-grub2 - # Required until we've completed the move to systemd-sysusers - # See: https://github.com/fedora-silverblue/issue-tracker/issues/362 - - nss-altfiles - # Container management - - buildah - - podman - - skopeo - # Keep slirp4netns for rootless containers until it's fully deprecated in podman - # See: https://github.com/fedora-silverblue/issue-tracker/issues/547 - - slirp4netns - # See: https://github.com/fedora-silverblue/issue-tracker/issues/503 - - systemd-container - # Provides terminal tools like clear, reset, tput, and tset - - ncurses - # Flatpak support - - flatpak - - xdg-desktop-portal - # HFS filesystem tools for Apple hardware - # See https://github.com/projectatomic/rpm-ostree/issues/1380 - - hfsplus-tools - # Contains default ostree remote config to be used on client's - # system for fetching ostree update - - fedora-repos-ostree - # the archive repo for more reliable package layering - # https://github.com/coreos/fedora-coreos-tracker/issues/400 - - fedora-repos-archive - # Always include at least full English language support by default - # https://gitlab.com/fedora/ostree/sig/-/issues/14 - - langpacks-en - -selinux: true -documentation: true -boot-location: modules -etc-group-members: - - wheel -tmp-is-dir: true - -ignore-removed-users: - - root -ignore-removed-groups: - - root -check-passwd: - type: file - filename: passwd -check-groups: - type: file - filename: group - -default_target: graphical.target - -packages-aarch64: - - grub2-efi - - efibootmgr - - shim -packages-ppc64le: - - grub2 -packages-x86_64: - - grub2-efi-ia32 - - grub2-efi-x64 - - grub2-pc - - efibootmgr - - shim-ia32 - - shim-x64 - -# Make sure the following are not pulled in when Recommended by other packages -exclude-packages: - - PackageKit - # We can not include openh264. See https://fedoraproject.org/wiki/OpenH264 - - gstreamer1-plugin-openh264 - - mozilla-openh264 - - openh264 - # Always exclude dnf when pulled in as a dependency - - dnf - - dnf-plugins-core - - dnf5 - - dnf5-plugins - # https://github.com/fedora-silverblue/issue-tracker/issues/517 - - grubby - - sdubby - -postprocess: - - | - #!/usr/bin/env bash - set -xeuo pipefail - - # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295 - # From https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf - install -dm0755 /usr/lib/systemd/journald.conf.d/ - echo -e "[Journal]\nStorage=persistent" > /usr/lib/systemd/journald.conf.d/10-persistent.conf - - # See: https://src.fedoraproject.org/rpms/glibc/pull-request/4 - # Basically that program handles deleting old shared library directories - # mid-transaction, which never applies to rpm-ostree. This is structured as a - # loop/glob to avoid hardcoding (or trying to match) the architecture. - for x in /usr/sbin/glibc_post_upgrade.*; do - if test -f ${x}; then - ln -srf /usr/bin/true ${x} - fi - done - - # Remove loader directory causing issues in Anaconda in unified core mode - # Will be obsolete once we start using bootupd - rm -rf /usr/lib/ostree-boot/loader - - # Undo RPM scripts enabling units; we want the presets to be canonical - # https://github.com/projectatomic/rpm-ostree/issues/1803 - rm -rf /etc/systemd/system/* - systemctl preset-all - rm -rf /etc/systemd/user/* - systemctl --user --global preset-all - - # Fix triggerin for samba-client in cups package (not supported by rpm-ostree yet) - # https://github.com/fedora-silverblue/issue-tracker/issues/532 - ln -snf /usr/libexec/samba/cups_backend_smb /usr/lib/cups/backend/smb - -postprocess-script: "postprocess.sh" diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index 2db7a5e..80e8eb9 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -1,4 +1,7 @@ -include: deepin-desktop-pkgs.yaml +include: + - common.yaml + - deepin-desktop-pkgs.yaml + ref: fedora/rawhide/${basearch}/deepin rojig: name: fedora-deepin diff --git a/fedora-kinoite-mobile.yaml b/fedora-kinoite-mobile.yaml index 1c78551..4204005 100644 --- a/fedora-kinoite-mobile.yaml +++ b/fedora-kinoite-mobile.yaml @@ -1,4 +1,5 @@ include: + - common.yaml - kde-mobile-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/kinoite-mobile diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index b3543b6..a2dfd9e 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -1,4 +1,7 @@ -include: kde-desktop-pkgs.yaml +include: + - common.yaml + - kde-desktop-pkgs.yaml + ref: fedora/rawhide/${basearch}/kinoite rojig: name: fedora-kde diff --git a/fedora-lazurite.yaml b/fedora-lazurite.yaml index d03a14c..9c40215 100644 --- a/fedora-lazurite.yaml +++ b/fedora-lazurite.yaml @@ -1,4 +1,7 @@ -include: lxqt-desktop-pkgs.yaml +include: + - common.yaml + - lxqt-desktop-pkgs.yaml + ref: fedora/rawhide/${basearch}/lazurite rojig: name: fedora-lxqt diff --git a/fedora-mate.yaml b/fedora-mate.yaml index cdfd0f4..1059ac8 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -1,4 +1,7 @@ -include: mate-desktop-pkgs.yaml +include: + - common.yaml + - mate-desktop-pkgs.yaml + ref: fedora/rawhide/${basearch}/mate rojig: name: fedora-mate diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml index 5f39a79..b449751 100644 --- a/fedora-onyx.yaml +++ b/fedora-onyx.yaml @@ -1,4 +1,7 @@ -include: budgie-desktop-pkgs.yaml +include: + - common.yaml + - budgie-desktop-pkgs.yaml + ref: fedora/rawhide/${basearch}/onyx rojig: name: fedora-onyx diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml index 653ca1c..0ecf7f8 100644 --- a/fedora-sericea.yaml +++ b/fedora-sericea.yaml @@ -1,4 +1,7 @@ -include: sway-desktop-pkgs.yaml +include: + - common.yaml + - sway-desktop-pkgs.yaml + ref: fedora/rawhide/${basearch}/sericea rojig: name: fedora-sericea diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 1dc0b8c..4232aa8 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -1,4 +1,7 @@ -include: gnome-desktop-pkgs.yaml +include: + - common.yaml + - gnome-desktop-pkgs.yaml + ref: fedora/rawhide/${basearch}/silverblue rojig: name: fedora-silverblue diff --git a/fedora-vauxite.yaml b/fedora-vauxite.yaml index 8858139..28734bc 100644 --- a/fedora-vauxite.yaml +++ b/fedora-vauxite.yaml @@ -1,4 +1,7 @@ -include: xfce-desktop-pkgs.yaml +include: + - common.yaml + - xfce-desktop-pkgs.yaml + ref: fedora/rawhide/${basearch}/vauxite rojig: name: fedora-vauxite diff --git a/gnome-desktop-pkgs.yaml b/gnome-desktop-pkgs.yaml index ed2d9f0..eb33b6e 100644 --- a/gnome-desktop-pkgs.yaml +++ b/gnome-desktop-pkgs.yaml @@ -1,5 +1,4 @@ # DO NOT EDIT! This content is generated from comps-sync.py -include: fedora-common-ostree.yaml packages: - ModemManager - NetworkManager-adsl diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 4fbb69a..10e6cb5 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -1,5 +1,4 @@ # DO NOT EDIT! This content is generated from comps-sync.py -include: fedora-common-ostree.yaml packages: - NetworkManager-config-connectivity-fedora - adwaita-gtk2-theme diff --git a/kde-mobile-desktop-pkgs.yaml b/kde-mobile-desktop-pkgs.yaml index ffe547e..8ccc5c6 100644 --- a/kde-mobile-desktop-pkgs.yaml +++ b/kde-mobile-desktop-pkgs.yaml @@ -1,5 +1,4 @@ # DO NOT EDIT! This content is generated from comps-sync.py -include: fedora-common-ostree.yaml packages: - elisa-player - haruna diff --git a/lxqt-desktop-pkgs.yaml b/lxqt-desktop-pkgs.yaml index 2704dde..d95c35c 100644 --- a/lxqt-desktop-pkgs.yaml +++ b/lxqt-desktop-pkgs.yaml @@ -1,5 +1,4 @@ # DO NOT EDIT! This content is generated from comps-sync.py -include: fedora-common-ostree.yaml packages: - breeze-cursor-theme - breeze-gtk diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml index 26aa961..45acba8 100644 --- a/mate-desktop-pkgs.yaml +++ b/mate-desktop-pkgs.yaml @@ -1,5 +1,4 @@ # DO NOT EDIT! This content is generated from comps-sync.py -include: fedora-common-ostree.yaml packages: - NetworkManager-adsl - NetworkManager-bluetooth diff --git a/sway-desktop-pkgs.yaml b/sway-desktop-pkgs.yaml index 472fbb2..cc75bca 100644 --- a/sway-desktop-pkgs.yaml +++ b/sway-desktop-pkgs.yaml @@ -1,5 +1,4 @@ # DO NOT EDIT! This content is generated from comps-sync.py -include: fedora-common-ostree.yaml packages: - NetworkManager-l2tp-gnome - NetworkManager-libreswan-gnome diff --git a/xfce-desktop-pkgs.yaml b/xfce-desktop-pkgs.yaml index bb2b581..644e743 100644 --- a/xfce-desktop-pkgs.yaml +++ b/xfce-desktop-pkgs.yaml @@ -1,5 +1,4 @@ # DO NOT EDIT! This content is generated from comps-sync.py -include: fedora-common-ostree.yaml packages: - NetworkManager-openconnect-gnome - NetworkManager-openvpn-gnome From 3a9a0760ef029c01ea80289a2986c214dbd2cc67 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jun 13 2024 09:30:19 +0000 Subject: [PATCH 3/8] Update manifests names for variants and their package lists - Strip the 'fedora' prefix from variant names - Name the packages list manifest for each variant accordingly --- diff --git a/README.md b/README.md index 8205f2b..3919ad4 100644 --- a/README.md +++ b/README.md @@ -188,7 +188,7 @@ Make a PR similar to ``` sed -i "s/41/42/g" *.repo comps-sync.py sed -i "s/releasever: 41/releasever: 42/" common.yaml -sed -i "s/# - fedora-41/# - fedora-42/" fedora-*.yaml +sed -i "s/# - fedora-41/# - fedora-42/" *.yaml mv fedora-41.repo fedora-42.repo mv fedora-41-updates.repo fedora-42-updates.repo sed -i "s/42/42/g" README.md @@ -200,8 +200,8 @@ sed -i "s/41/42/g" README.md ``` rm fedora-rawhide.repo sed -i "/- fedora-rawhide/d" fedora-*.yaml -sed -i "s/# - fedora-41/- fedora-41/" fedora-*.yaml -sed -i "s/ref: fedora\/rawhide/ref: fedora\/41/" fedora-*.yaml +sed -i "s/# - fedora-41/- fedora-41/" *.yaml +sed -i "s/ref: fedora\/rawhide/ref: fedora\/41/" *.yaml ``` ## Historical references diff --git a/base.yaml b/base.yaml new file mode 100644 index 0000000..5c058c3 --- /dev/null +++ b/base.yaml @@ -0,0 +1,24 @@ +include: + - common.yaml + +ref: fedora/rawhide/${basearch}/base +rojig: + name: fedora-base + summary: "Fedora Base Atomic" + license: MIT + +packages: + # Generic release package for desktop variants + - fedora-release + - fedora-release-ostree-desktop + # XWayland support + - xorg-x11-server-Xwayland + # Portals for Flatpak + - xdg-desktop-portal + - xdg-desktop-portal-gtk + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/budgie-atomic-packages.yaml b/budgie-atomic-packages.yaml new file mode 100644 index 0000000..bc40b71 --- /dev/null +++ b/budgie-atomic-packages.yaml @@ -0,0 +1,71 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - ModemManager + - NetworkManager-adsl + - NetworkManager-openconnect-gnome + - NetworkManager-openvpn-gnome + - NetworkManager-ppp + - NetworkManager-pptp-gnome + - NetworkManager-ssh-gnome + - NetworkManager-vpnc-gnome + - NetworkManager-wwan + - budgie-backgrounds + - budgie-control-center + - budgie-desktop + - budgie-desktop-defaults + - budgie-desktop-view + - budgie-screensaver + - dconf + - firefox + - fprintd-pam + - gedit + - glib-networking + - glx-utils + - gnome-bluetooth + - gnome-color-manager + - gnome-disk-utility + - gnome-keyring-pam + - gnome-settings-daemon + - gnome-software + - gnome-system-monitor + - gnome-terminal + - gvfs-afc + - gvfs-afp + - gvfs-archive + - gvfs-fuse + - gvfs-goa + - gvfs-gphoto2 + - gvfs-mtp + - gvfs-smb + - lightdm + - mesa-dri-drivers + - mesa-vulkan-drivers + - nemo + - nemo-fileroller + - nemo-seahorse + - network-manager-applet + - plymouth-system-theme + - polkit + - seahorse + - slick-greeter + - xdg-desktop-portal + - xdg-desktop-portal-gtk + - xdg-user-dirs-gtk + - xorg-x11-drv-amdgpu + - xorg-x11-drv-ati + - xorg-x11-drv-evdev + - xorg-x11-drv-fbdev + - xorg-x11-drv-libinput + - xorg-x11-drv-nouveau + - xorg-x11-drv-qxl + - xorg-x11-drv-wacom + - xorg-x11-server-Xorg + - xorg-x11-xauth + - xorg-x11-xinit +packages-x86_64: + - xorg-x11-drv-intel + - xorg-x11-drv-openchrome + - xorg-x11-drv-vesa + - xorg-x11-drv-vmware +packages-aarch64: + - xorg-x11-drv-armsoc diff --git a/budgie-desktop-pkgs.yaml b/budgie-desktop-pkgs.yaml deleted file mode 100644 index bc40b71..0000000 --- a/budgie-desktop-pkgs.yaml +++ /dev/null @@ -1,71 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - ModemManager - - NetworkManager-adsl - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-ppp - - NetworkManager-pptp-gnome - - NetworkManager-ssh-gnome - - NetworkManager-vpnc-gnome - - NetworkManager-wwan - - budgie-backgrounds - - budgie-control-center - - budgie-desktop - - budgie-desktop-defaults - - budgie-desktop-view - - budgie-screensaver - - dconf - - firefox - - fprintd-pam - - gedit - - glib-networking - - glx-utils - - gnome-bluetooth - - gnome-color-manager - - gnome-disk-utility - - gnome-keyring-pam - - gnome-settings-daemon - - gnome-software - - gnome-system-monitor - - gnome-terminal - - gvfs-afc - - gvfs-afp - - gvfs-archive - - gvfs-fuse - - gvfs-goa - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-smb - - lightdm - - mesa-dri-drivers - - mesa-vulkan-drivers - - nemo - - nemo-fileroller - - nemo-seahorse - - network-manager-applet - - plymouth-system-theme - - polkit - - seahorse - - slick-greeter - - xdg-desktop-portal - - xdg-desktop-portal-gtk - - xdg-user-dirs-gtk - - xorg-x11-drv-amdgpu - - xorg-x11-drv-ati - - xorg-x11-drv-evdev - - xorg-x11-drv-fbdev - - xorg-x11-drv-libinput - - xorg-x11-drv-nouveau - - xorg-x11-drv-qxl - - xorg-x11-drv-wacom - - xorg-x11-server-Xorg - - xorg-x11-xauth - - xorg-x11-xinit -packages-x86_64: - - xorg-x11-drv-intel - - xorg-x11-drv-openchrome - - xorg-x11-drv-vesa - - xorg-x11-drv-vmware -packages-aarch64: - - xorg-x11-drv-armsoc diff --git a/cinnamon-atomic-packages.yaml b/cinnamon-atomic-packages.yaml new file mode 100644 index 0000000..a6d80e0 --- /dev/null +++ b/cinnamon-atomic-packages.yaml @@ -0,0 +1,68 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - NetworkManager-adsl + - NetworkManager-bluetooth + - NetworkManager-openconnect-gnome + - NetworkManager-openvpn-gnome + - NetworkManager-ppp + - NetworkManager-pptp-gnome + - NetworkManager-vpnc-gnome + - NetworkManager-wifi + - NetworkManager-wwan + - blueman + - cinnamon + - cinnamon-control-center + - cinnamon-screensaver + - firefox + - firewall-config + - glx-utils + - gnome-disk-utility + - gnome-screenshot + - gnome-system-monitor + - gnome-terminal + - gstreamer1-plugins-ugly-free + - gvfs-archive + - gvfs-gphoto2 + - gvfs-mtp + - gvfs-smb + - imsettings-gsettings + - initial-setup-gui + - mesa-dri-drivers + - mesa-vulkan-drivers + - metacity + - nemo-fileroller + - nemo-image-converter + - nemo-preview + - nm-connection-editor + - pipewire-alsa + - pipewire-pulseaudio + - plymouth-system-theme + - powerline + - qgnomeplatform-qt5 + - redshift-gtk + - setroubleshoot + - slick-greeter + - slick-greeter-cinnamon + - system-config-printer + - totem-video-thumbnailer + - wireplumber + - xawtv + - xdg-user-dirs-gtk + - xorg-x11-drv-amdgpu + - xorg-x11-drv-ati + - xorg-x11-drv-evdev + - xorg-x11-drv-fbdev + - xorg-x11-drv-libinput + - xorg-x11-drv-nouveau + - xorg-x11-drv-qxl + - xorg-x11-drv-wacom + - xorg-x11-server-Xorg + - xorg-x11-xauth + - xorg-x11-xinit +packages-x86_64: + - xorg-x11-drv-intel + - xorg-x11-drv-openchrome + - xorg-x11-drv-vesa + - xorg-x11-drv-vmware +packages-aarch64: + - xorg-x11-drv-armsoc diff --git a/cinnamon-atomic.yaml b/cinnamon-atomic.yaml new file mode 100644 index 0000000..05ef3de --- /dev/null +++ b/cinnamon-atomic.yaml @@ -0,0 +1,21 @@ +include: + - common.yaml + - cinnamon-atomic-packages.yaml + +ref: fedora/rawhide/${basearch}/cinnamon +rojig: + name: fedora-cinnamon + summary: "Fedora Cinnamon Atomic" + license: MIT + +packages: + # Portals for Flatpak + - xdg-desktop-portal-gtk + # Include GUI to manage updates & Flatpaks + - gnome-software + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/cinnamon-desktop-pkgs.yaml b/cinnamon-desktop-pkgs.yaml deleted file mode 100644 index a6d80e0..0000000 --- a/cinnamon-desktop-pkgs.yaml +++ /dev/null @@ -1,68 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager-adsl - - NetworkManager-bluetooth - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-ppp - - NetworkManager-pptp-gnome - - NetworkManager-vpnc-gnome - - NetworkManager-wifi - - NetworkManager-wwan - - blueman - - cinnamon - - cinnamon-control-center - - cinnamon-screensaver - - firefox - - firewall-config - - glx-utils - - gnome-disk-utility - - gnome-screenshot - - gnome-system-monitor - - gnome-terminal - - gstreamer1-plugins-ugly-free - - gvfs-archive - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-smb - - imsettings-gsettings - - initial-setup-gui - - mesa-dri-drivers - - mesa-vulkan-drivers - - metacity - - nemo-fileroller - - nemo-image-converter - - nemo-preview - - nm-connection-editor - - pipewire-alsa - - pipewire-pulseaudio - - plymouth-system-theme - - powerline - - qgnomeplatform-qt5 - - redshift-gtk - - setroubleshoot - - slick-greeter - - slick-greeter-cinnamon - - system-config-printer - - totem-video-thumbnailer - - wireplumber - - xawtv - - xdg-user-dirs-gtk - - xorg-x11-drv-amdgpu - - xorg-x11-drv-ati - - xorg-x11-drv-evdev - - xorg-x11-drv-fbdev - - xorg-x11-drv-libinput - - xorg-x11-drv-nouveau - - xorg-x11-drv-qxl - - xorg-x11-drv-wacom - - xorg-x11-server-Xorg - - xorg-x11-xauth - - xorg-x11-xinit -packages-x86_64: - - xorg-x11-drv-intel - - xorg-x11-drv-openchrome - - xorg-x11-drv-vesa - - xorg-x11-drv-vmware -packages-aarch64: - - xorg-x11-drv-armsoc diff --git a/comps-sync.py b/comps-sync.py index b3708bb..5632afb 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -118,7 +118,7 @@ def compare_comps_manifest_package_lists(comps_group_pkgs, manifest_packages): return comps_unknown, pkgs_added -def update_manifests_from_groups(comps, groups, path, desktop, save, comps_exclude_list, comps_exclude_list_all): +def update_manifests_from_groups(comps, groups, path, variant, save, comps_exclude_list, comps_exclude_list_all): manifest_packages = load_packages_from_manifest(path) comps_group_pkgs = {} @@ -131,10 +131,10 @@ def update_manifests_from_groups(comps, groups, path, desktop, save, comps_exclu n_manifest_new = len(comps_unknown) n_comps_new = len(pkgs_added) - if desktop == "common": + if variant == "common": print(f'Syncing common packages:\t+{n_comps_new}, -{n_manifest_new}') else: - print(f'Syncing packages for {desktop}:\t+{n_comps_new}, -{n_manifest_new}') + print(f'Syncing packages for {variant}:\t+{n_comps_new}, -{n_manifest_new}') if n_manifest_new != 0: for (pkg, arch) in sorted(comps_unknown, key = lambda x: x[0]): manifest_packages[arch].remove(pkg) @@ -191,24 +191,24 @@ def main(): ret += update_manifests_from_groups(comps, groups, 'common-packages.yaml', "common", args.save, comps_exclude_list, comps_exclude_list_all) - # List of comps groups used for each desktop - desktops_comps_groups = { - "gnome": ["gnome-desktop", "base-x"], - "kde": ["kde-desktop", "base-graphical"], - "kde-mobile": ["kde-mobile", "kde-mobile-apps", "base-graphical"], - "xfce": ["xfce-desktop", "xfce-apps", "xfce-extra-plugins", "base-x"], - "lxqt": ["lxqt-desktop", "base-graphical"], - "deepin": ["deepin-desktop", "base-x"], - "mate": ["mate-desktop", "base-x"], - "sway": ["swaywm", "swaywm-extended", "base-graphical"], - "cinnamon": ["cinnamon-desktop", "base-x"], - "budgie": ["budgie-desktop", "budgie-desktop-apps", "base-x"] + # List of comps groups used for each variant + variant_comps_groups = { + "budgie-atomic": ["budgie-desktop", "budgie-desktop-apps", "base-x"], + "cinnamon-atomic": ["cinnamon-desktop", "base-x"], + "deepin-atomic": ["deepin-desktop", "base-x"], + "kinoite": ["kde-desktop", "base-graphical"], + "kinoite-mobile": ["kde-mobile", "kde-mobile-apps", "base-graphical"], + "lxqt-atomic": ["lxqt-desktop", "base-graphical"], + "mate-atomic": ["mate-desktop", "base-x"], + "silverblue": ["gnome-desktop", "base-x"], + "sway-atomic": ["swaywm", "swaywm-extended", "base-graphical"], + "xfce-atomic": ["xfce-desktop", "xfce-apps", "xfce-extra-plugins", "base-x"], } - # Generate treefiles for all desktops - for desktop, groups in desktops_comps_groups.items(): + # Generate treefiles for all variants + for variant, groups in variant_comps_groups.items(): print() - ret += update_manifests_from_groups(comps, groups, f'{desktop}-desktop-pkgs.yaml', desktop, args.save, comps_desktop_exclude_list, comps_exclude_list_all) + ret += update_manifests_from_groups(comps, groups, f'{variant}-packages.yaml', variant, args.save, comps_desktop_exclude_list, comps_exclude_list_all) if not args.save and ret != 0: sys.exit(1) diff --git a/deepin-atomic-packages.yaml b/deepin-atomic-packages.yaml new file mode 100644 index 0000000..16882ee --- /dev/null +++ b/deepin-atomic-packages.yaml @@ -0,0 +1,37 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - deepin-calculator + - deepin-calendar + - deepin-desktop + - deepin-editor + - deepin-file-manager + - deepin-icon-theme + - deepin-image-viewer + - deepin-picker + - deepin-screenshot + - deepin-system-monitor + - firewall-config + - glx-utils + - mesa-dri-drivers + - mesa-vulkan-drivers + - plymouth-system-theme + - xorg-x11-drv-amdgpu + - xorg-x11-drv-ati + - xorg-x11-drv-evdev + - xorg-x11-drv-fbdev + - xorg-x11-drv-libinput + - xorg-x11-drv-nouveau + - xorg-x11-drv-qxl + - xorg-x11-drv-wacom + - xorg-x11-server-Xorg + - xorg-x11-xauth + - xorg-x11-xinit +packages-x86_64: + - chromium + - xorg-x11-drv-intel + - xorg-x11-drv-openchrome + - xorg-x11-drv-vesa + - xorg-x11-drv-vmware +packages-aarch64: + - chromium + - xorg-x11-drv-armsoc diff --git a/deepin-atomic.yaml b/deepin-atomic.yaml new file mode 100644 index 0000000..0498455 --- /dev/null +++ b/deepin-atomic.yaml @@ -0,0 +1,22 @@ +include: + - common.yaml + - deepin-atomic-packages.yaml + +ref: fedora/rawhide/${basearch}/deepin +rojig: + name: fedora-deepin + summary: "Fedora Deepin Atomic" + license: MIT + +packages: + # Generic release package for desktop variants + - fedora-release + - fedora-release-ostree-desktop + # GUI to manage updates & Flatpaks + - gnome-software + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/deepin-desktop-pkgs.yaml b/deepin-desktop-pkgs.yaml deleted file mode 100644 index 16882ee..0000000 --- a/deepin-desktop-pkgs.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - deepin-calculator - - deepin-calendar - - deepin-desktop - - deepin-editor - - deepin-file-manager - - deepin-icon-theme - - deepin-image-viewer - - deepin-picker - - deepin-screenshot - - deepin-system-monitor - - firewall-config - - glx-utils - - mesa-dri-drivers - - mesa-vulkan-drivers - - plymouth-system-theme - - xorg-x11-drv-amdgpu - - xorg-x11-drv-ati - - xorg-x11-drv-evdev - - xorg-x11-drv-fbdev - - xorg-x11-drv-libinput - - xorg-x11-drv-nouveau - - xorg-x11-drv-qxl - - xorg-x11-drv-wacom - - xorg-x11-server-Xorg - - xorg-x11-xauth - - xorg-x11-xinit -packages-x86_64: - - chromium - - xorg-x11-drv-intel - - xorg-x11-drv-openchrome - - xorg-x11-drv-vesa - - xorg-x11-drv-vmware -packages-aarch64: - - chromium - - xorg-x11-drv-armsoc diff --git a/fedora-base.yaml b/fedora-base.yaml deleted file mode 100644 index 5c058c3..0000000 --- a/fedora-base.yaml +++ /dev/null @@ -1,24 +0,0 @@ -include: - - common.yaml - -ref: fedora/rawhide/${basearch}/base -rojig: - name: fedora-base - summary: "Fedora Base Atomic" - license: MIT - -packages: - # Generic release package for desktop variants - - fedora-release - - fedora-release-ostree-desktop - # XWayland support - - xorg-x11-server-Xwayland - # Portals for Flatpak - - xdg-desktop-portal - - xdg-desktop-portal-gtk - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/fedora-cinnamon.yaml b/fedora-cinnamon.yaml deleted file mode 100644 index 0485db7..0000000 --- a/fedora-cinnamon.yaml +++ /dev/null @@ -1,21 +0,0 @@ -include: - - common.yaml - - cinnamon-desktop-pkgs.yaml - -ref: fedora/rawhide/${basearch}/cinnamon -rojig: - name: fedora-cinnamon - summary: "Fedora Cinnamon Atomic" - license: MIT - -packages: - # Portals for Flatpak - - xdg-desktop-portal-gtk - # Include GUI to manage updates & Flatpaks - - gnome-software - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml deleted file mode 100644 index 80e8eb9..0000000 --- a/fedora-deepin.yaml +++ /dev/null @@ -1,22 +0,0 @@ -include: - - common.yaml - - deepin-desktop-pkgs.yaml - -ref: fedora/rawhide/${basearch}/deepin -rojig: - name: fedora-deepin - summary: "Fedora Deepin Atomic" - license: MIT - -packages: - # Generic release package for desktop variants - - fedora-release - - fedora-release-ostree-desktop - # GUI to manage updates & Flatpaks - - gnome-software - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/fedora-kinoite-mobile.yaml b/fedora-kinoite-mobile.yaml deleted file mode 100644 index 4204005..0000000 --- a/fedora-kinoite-mobile.yaml +++ /dev/null @@ -1,46 +0,0 @@ -include: - - common.yaml - - kde-mobile-desktop-pkgs.yaml - -ref: fedora/rawhide/${basearch}/kinoite-mobile -rojig: - name: fedora-kde - summary: "Fedora Kinoite Mobile" - license: MIT - -packages: - - fedora-release-kinoite - # Install some minor optional tools for KInfoCenter - - vulkan-tools - - xdpyinfo - # Includes a KIO & KCM (can not be Flatpak'ed), used by Dolphin and Gwenview - # See https://pagure.io/fedora-kde/SIG/issue/291 - - kamera - # Make sure that previous Anaconda dependencies are kept in the image - # See: https://pagure.io/fedora-kde/SIG/issue/243 - - bcache-tools - - dmraid - - mobile-broadband-provider-info - # Make sure that modem support is installed - - NetworkManager-ppp - # Install gdb to make getting backtraces work with DrKonqi - - gdb - -# Make sure the following are not pulled in when Recommended by other packages -exclude-packages: - - plasma-discover-offline-updates - - plasma-discover-packagekit - - plasma-pk-updates - # Manually excluded as recommended by gtk3 (and likely gtk4 in the future) - # See https://pagure.io/fedora-kde/SIG/issue/124 - - tracker - - tracker-miners - # Ensure we do not include X11 support - - plasma-x11 - - plasma-workspace-x11 - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml deleted file mode 100644 index a2dfd9e..0000000 --- a/fedora-kinoite.yaml +++ /dev/null @@ -1,56 +0,0 @@ -include: - - common.yaml - - kde-desktop-pkgs.yaml - -ref: fedora/rawhide/${basearch}/kinoite -rojig: - name: fedora-kde - summary: "Fedora Kinoite" - license: MIT - -packages: - - fedora-release-kinoite - # Install some minor optional tools for KInfoCenter - - vulkan-tools - - xdpyinfo - # Includes a KIO & KCM (can not be Flatpak'ed), used by Dolphin and Gwenview - # See https://pagure.io/fedora-kde/SIG/issue/291 - - kamera - # Make sure that previous Anaconda dependencies are kept in the image - # See: https://pagure.io/fedora-kde/SIG/issue/243 - - bcache-tools - - dmraid - - mobile-broadband-provider-info - # Make sure that modem support is installed - - NetworkManager-ppp - # Install gdb to make getting backtraces work with DrKonqi - # The dnf dependency is excluded in the common manifest - - gdb - -# Make sure the following are not pulled in when Recommended by other packages -exclude-packages: - - plasma-discover-offline-updates - - plasma-discover-packagekit - - plasma-pk-updates - # Manually excluded as recommended by gtk3 (and likely gtk4 in the future) - # See https://pagure.io/fedora-kde/SIG/issue/124 - - tracker - - tracker-miners - # Ensure we do not include X11 support - - plasma-x11 - - plasma-workspace-x11 - -# Kinoite specific workarounds and configuration -postprocess: - - | - #!/bin/bash - set -xeuo pipefail - - # Enable auto updates in Discover - echo -e "[Global]\nUseUnattendedUpdates=true\n" > /etc/xdg/PlasmaDiscoverUpdates - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/fedora-lazurite.yaml b/fedora-lazurite.yaml deleted file mode 100644 index 9c40215..0000000 --- a/fedora-lazurite.yaml +++ /dev/null @@ -1,26 +0,0 @@ -include: - - common.yaml - - lxqt-desktop-pkgs.yaml - -ref: fedora/rawhide/${basearch}/lazurite -rojig: - name: fedora-lxqt - summary: "Fedora LXQt Atomic" - license: MIT - -packages: - # Generic release package for desktop variants - - fedora-release - - fedora-release-ostree-desktop - - libqtxdg - - kvantum - - kwin-wayland - - plasma-systemsettings - # Portals for Flatpak - - xdg-desktop-portal-kde - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/fedora-mate.yaml b/fedora-mate.yaml deleted file mode 100644 index 1059ac8..0000000 --- a/fedora-mate.yaml +++ /dev/null @@ -1,24 +0,0 @@ -include: - - common.yaml - - mate-desktop-pkgs.yaml - -ref: fedora/rawhide/${basearch}/mate -rojig: - name: fedora-mate - summary: "Fedora Mate Atomic" - license: MIT - -packages: - # Generic release sub package for desktop variants - - fedora-release-ostree-desktop - # Portals for Flatpak - - xdg-desktop-portal-gtk - -exclude-packages: - - python3-unbound - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml deleted file mode 100644 index b449751..0000000 --- a/fedora-onyx.yaml +++ /dev/null @@ -1,28 +0,0 @@ -include: - - common.yaml - - budgie-desktop-pkgs.yaml - -ref: fedora/rawhide/${basearch}/onyx -rojig: - name: fedora-onyx - summary: "Fedora Budgie Atomic" - license: MIT - -packages: - - fedora-release-budgie-atomic - # Make sure that GNOME Software's rpm-ostree plugin is always installed - - gnome-software-rpm-ostree - -# Make sure the following are not pulled in when Recommended by other packages -exclude-packages: - # Not needed in Budgie Desktop - - tracker - - tracker-miners - # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue - - gnome-software-fedora-langpacks - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml deleted file mode 100644 index 0ecf7f8..0000000 --- a/fedora-sericea.yaml +++ /dev/null @@ -1,28 +0,0 @@ -include: - - common.yaml - - sway-desktop-pkgs.yaml - -ref: fedora/rawhide/${basearch}/sericea -rojig: - name: fedora-sericea - summary: "Fedora Sway Atomic" - license: MIT - -packages: - - fedora-release-sway-atomic - # explicitly list some defaults - - firefox - -exclude-packages: - # already excluded in comps-sync-exclude-list - - PackageKit-glib - - grubby - # nothing in the tree would use these - - tracker - - tracker-miners - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml deleted file mode 100644 index 4232aa8..0000000 --- a/fedora-silverblue.yaml +++ /dev/null @@ -1,40 +0,0 @@ -include: - - common.yaml - - gnome-desktop-pkgs.yaml - -ref: fedora/rawhide/${basearch}/silverblue -rojig: - name: fedora-silverblue - summary: "Fedora Silverblue" - license: MIT - -packages: - - fedora-release-silverblue - - desktop-backgrounds-gnome - - gnome-shell-extension-background-logo - - pinentry-gnome3 - # Included for now to have layered Qt5 applications use a constistent style - # Manually included here as it is excluded from the workstation-product group - - qadwaitadecorations-qt5 - # Include evince-thumbnailer otherwise PDF thumbnails won't work in Nautilus - # https://github.com/fedora-silverblue/issue-tracker/issues/98 - - evince-thumbnailer - # Include evince-previewer otherwise print previews are broken in Evince - # https://github.com/fedora-silverblue/issue-tracker/issues/122 - - evince-previewer - # Include totem-video-thumbnailer for video thumbnailing in Nautilus - # https://pagure.io/fedora-workstation/issue/168 - - totem-video-thumbnailer - # Make sure that GNOME Software's rpm-ostree plugin is always installed - - gnome-software-rpm-ostree - -# Make sure the following are not pulled in when Recommended by other packages -exclude-packages: - # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue - - gnome-software-fedora-langpacks - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/fedora-vauxite.yaml b/fedora-vauxite.yaml deleted file mode 100644 index 28734bc..0000000 --- a/fedora-vauxite.yaml +++ /dev/null @@ -1,22 +0,0 @@ -include: - - common.yaml - - xfce-desktop-pkgs.yaml - -ref: fedora/rawhide/${basearch}/vauxite -rojig: - name: fedora-vauxite - summary: "Fedora XFCE Atomic" - license: MIT - -packages: - - fedora-release-xfce - # Generic release sub package for desktop variants - - fedora-release-ostree-desktop - # Portals for Flatpak - - xdg-desktop-portal-gtk - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/gnome-desktop-pkgs.yaml b/gnome-desktop-pkgs.yaml deleted file mode 100644 index eb33b6e..0000000 --- a/gnome-desktop-pkgs.yaml +++ /dev/null @@ -1,81 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - ModemManager - - NetworkManager-adsl - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-ppp - - NetworkManager-pptp-gnome - - NetworkManager-ssh-gnome - - NetworkManager-vpnc-gnome - - NetworkManager-wwan - - adobe-source-code-pro-fonts - - avahi - - dconf - - fprintd-pam - - gdm - - glib-networking - - glx-utils - - gnome-backgrounds - - gnome-bluetooth - - gnome-browser-connector - - gnome-classic-session - - gnome-classic-session-xsession - - gnome-color-manager - - gnome-control-center - - gnome-disk-utility - - gnome-initial-setup - - gnome-remote-desktop - - gnome-session-wayland-session - - gnome-session-xsession - - gnome-settings-daemon - - gnome-shell - - gnome-software - - gnome-system-monitor - - gnome-terminal - - gnome-terminal-nautilus - - gnome-user-docs - - gnome-user-share - - gvfs-afc - - gvfs-afp - - gvfs-archive - - gvfs-fuse - - gvfs-goa - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-smb - - librsvg2 - - libsane-hpaio - - mesa-dri-drivers - - mesa-libEGL - - mesa-vulkan-drivers - - nautilus - - plymouth-system-theme - - polkit - - rygel - - systemd-oomd-defaults - - tracker - - tracker-miners - - xdg-desktop-portal - - xdg-desktop-portal-gnome - - xdg-desktop-portal-gtk - - xdg-user-dirs-gtk - - xorg-x11-drv-amdgpu - - xorg-x11-drv-ati - - xorg-x11-drv-evdev - - xorg-x11-drv-fbdev - - xorg-x11-drv-libinput - - xorg-x11-drv-nouveau - - xorg-x11-drv-qxl - - xorg-x11-drv-wacom - - xorg-x11-server-Xorg - - xorg-x11-xauth - - xorg-x11-xinit - - yelp -packages-x86_64: - - xorg-x11-drv-intel - - xorg-x11-drv-openchrome - - xorg-x11-drv-vesa - - xorg-x11-drv-vmware -packages-aarch64: - - xorg-x11-drv-armsoc diff --git a/justfile b/justfile index e4b1a3f..cafa8c6 100644 --- a/justfile +++ b/justfile @@ -52,7 +52,7 @@ sync: fi default_variant={{default_variant}} - version="$(rpm-ostree compose tree --print-only --repo=repo fedora-${default_variant}.yaml | jq -r '."mutate-os-release"')" + version="$(rpm-ostree compose tree --print-only --repo=repo ${default_variant}.yaml | jq -r '."mutate-os-release"')" ./comps-sync.py --save fedora-comps/comps-f${version}.xml.in # Sync the manifests with the content of the comps groups @@ -70,7 +70,7 @@ comps-sync: fi default_variant={{default_variant}} - version="$(rpm-ostree compose tree --print-only --repo=repo fedora-${default_variant}.yaml | jq -r '."mutate-os-release"')" + version="$(rpm-ostree compose tree --print-only --repo=repo ${default_variant}.yaml | jq -r '."mutate-os-release"')" ./comps-sync.py --save fedora-comps/comps-f${version}.xml.in # Check if the manifests are in sync with the content of the comps groups @@ -88,7 +88,7 @@ comps-sync-check: fi default_variant={{default_variant}} - version="$(rpm-ostree compose tree --print-only --repo=repo fedora-${default_variant}.yaml | jq -r '."mutate-os-release"')" + version="$(rpm-ostree compose tree --print-only --repo=repo ${default_variant}.yaml | jq -r '."mutate-os-release"')" ./comps-sync.py fedora-comps/comps-f${version}.xml.in # Output the processed manifest for a given variant (defaults to Silverblue) @@ -104,7 +104,7 @@ manifest variant=default_variant: exit 1 fi - rpm-ostree compose tree --print-only --repo=repo fedora-{{variant}}.yaml + rpm-ostree compose tree --print-only --repo=repo {{variant}}.yaml # Perform dependency resolution for a given variant (defaults to Silverblue) compose-dry-run variant=default_variant: @@ -118,7 +118,7 @@ compose-dry-run variant=default_variant: popd > /dev/null || exit 1 fi - rpm-ostree compose tree --unified-core --repo=repo --dry-run fedora-{{variant}}.yaml + rpm-ostree compose tree --unified-core --repo=repo --dry-run {{variant}}.yaml # Alias/shortcut for compose-image command compose variant=default_variant: (compose-image variant) @@ -151,7 +151,7 @@ compose-legacy variant=default_variant: timestamp="$(date --iso-8601=sec)" echo "${buildid}" > .buildid - version="$(rpm-ostree compose tree --print-only --repo=repo fedora-${variant}.yaml | jq -r '."mutate-os-release"')" + version="$(rpm-ostree compose tree --print-only --repo=repo ${variant}.yaml | jq -r '."mutate-os-release"')" echo "Composing ${variant_pretty} ${version}.${buildid} ..." ARGS="--repo=repo --cachedir=cache" @@ -166,7 +166,7 @@ compose-legacy variant=default_variant: ${CMD} compose tree ${ARGS} \ --add-metadata-string="version=${variant_pretty} ${version}.${buildid}" \ - "fedora-${variant}.yaml" \ + "${variant}.yaml" \ |& tee "logs/${variant}_${version}_${buildid}.${timestamp}.log" if [[ ${EUID} -ne 0 ]]; then @@ -203,7 +203,7 @@ compose-image variant=default_variant: timestamp="$(date --iso-8601=sec)" echo "${buildid}" > .buildid - version="$(rpm-ostree compose tree --print-only --repo=repo fedora-${variant}.yaml | jq -r '."mutate-os-release"')" + version="$(rpm-ostree compose tree --print-only --repo=repo ${variant}.yaml | jq -r '."mutate-os-release"')" echo "Composing ${variant_pretty} ${version}.${buildid} ..." ARGS="--cachedir=cache --initialize" @@ -218,8 +218,8 @@ compose-image variant=default_variant: ${CMD} compose image ${ARGS} \ --label="quay.expires-after=4w" \ - "fedora-${variant}.yaml" \ - "fedora-${variant}.ociarchive" + "${variant}.yaml" \ + "${variant}.ociarchive" # Clean up everything clean-all: @@ -270,7 +270,7 @@ lorax variant=default_variant: popd > /dev/null || exit 1 fi - version_number="$(rpm-ostree compose tree --print-only --repo=repo fedora-${variant}.yaml | jq -r '."mutate-os-release"')" + version_number="$(rpm-ostree compose tree --print-only --repo=repo ${variant}.yaml | jq -r '."mutate-os-release"')" if [[ "$(git rev-parse --abbrev-ref HEAD)" == "main" ]] || [[ -f "fedora-rawhide.repo" ]]; then version_pretty="Rawhide" version="rawhide" @@ -363,7 +363,7 @@ upload-container variant=default_variant: if [[ "$(git rev-parse --abbrev-ref HEAD)" == "main" ]] || [[ -f "fedora-rawhide.repo" ]]; then version="rawhide" else - version="$(rpm-ostree compose tree --print-only --repo=repo fedora-${variant}.yaml | jq -r '."mutate-os-release"')" + version="$(rpm-ostree compose tree --print-only --repo=repo ${variant}.yaml | jq -r '."mutate-os-release"')" fi image="quay.io/fedora-ostree-desktops/${variant}" @@ -384,7 +384,8 @@ upload-container variant=default_variant: skopeo login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" quay.io # Copy fully versioned tag (major version, build date/id, git commit) - skopeo copy --retry-times 3 "oci-archive:fedora-${variant}.ociarchive" "docker://${image}:${version}.${buildid}.${git_commit}" + skopeo copy --retry-times 3 "oci-archive:${variant}.ociarchive" "docker://${image}:${version}.${buildid}.${git_commit}" + # Update "un-versioned" tag (only major version) skopeo copy --retry-times 3 "docker://${image}:${version}.${buildid}.${git_commit}" "docker://${image}:${version}" if [[ "${variant}" == "kinoite-nightly" ]]; then diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml deleted file mode 100644 index 10e6cb5..0000000 --- a/kde-desktop-pkgs.yaml +++ /dev/null @@ -1,93 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager-config-connectivity-fedora - - adwaita-gtk2-theme - - akonadi-server - - akonadi-server-mysql - - ark - - audiocd-kio - - bluedevil - - breeze-icon-theme - - colord-kde - - dolphin - - ffmpegthumbs - - filelight - - firewall-config - - flatpak-kcm - - fprintd-pam - - glibc-all-langpacks - - gnome-keyring-pam - - kaccounts-integration-qt6 - - kcharselect - - kde-connect - - kde-gtk-config - - kde-inotify-survey - - kde-partitionmanager - - kde-settings-pulseaudio - - kdebugsettings - - kdegraphics-thumbnailers - - kdeplasma-addons - - kdialog - - kdnssd - - kf6-baloo-file - - kfind - - kinfocenter - - kio-admin - - kjournald - - kmenuedit - - konsole - - krdp - - krfb - - kscreen - - kscreenlocker - - kwalletmanager5 - - kwin - - kwrite - - libappindicator-gtk3 - - mesa-dri-drivers - - mesa-vulkan-drivers - - pam-kwallet - - phonon-qt6-backend-vlc - - pinentry-qt - - plasma-breeze - - plasma-desktop - - plasma-desktop-doc - - plasma-discover - - plasma-discover-notifier - - plasma-disks - - plasma-drkonqi - - plasma-nm - - plasma-nm-openvpn - - plasma-nm-vpnc - - plasma-pa - - plasma-print-manager - - plasma-systemmonitor - - plasma-thunderbolt - - plasma-vault - - plasma-welcome - - plasma-workspace - - plasma-workspace-geolocation - - plasma-workspace-wallpapers - - plasma-workspace-wayland - - plymouth-system-theme - - polkit-kde - - sddm - - sddm-breeze - - sddm-kcm - - sddm-wayland-plasma - - signon-kwallet-extension - - spectacle - - systemd-oomd-defaults - - udisks2 - - vlc-plugin-gstreamer - - xwaylandvideobridge -packages-x86_64: - - kaccounts-providers - - khelpcenter - - kio-gdrive - - plasma-nm-openconnect -packages-aarch64: - - kaccounts-providers - - khelpcenter - - kio-gdrive - - plasma-nm-openconnect diff --git a/kde-mobile-desktop-pkgs.yaml b/kde-mobile-desktop-pkgs.yaml deleted file mode 100644 index 8ccc5c6..0000000 --- a/kde-mobile-desktop-pkgs.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - elisa-player - - haruna - - kalk - - kasts - - kclock - - keysmith - - koko - - krecorder - - kweather - - marknote - - mesa-dri-drivers - - mesa-vulkan-drivers - - neochat - - okular-mobile - - plasma-discover - - plasma-discover-notifier - - plasma-mobile - - plasma-mobile-sounds - - plymouth-system-theme - - qmlkonsole - - sddm - - sddm-themes - - sddm-wayland-plasma - - spacebar -packages-x86_64: - - angelfish - - arianna - - kaidan - - tokodon -packages-aarch64: - - angelfish - - arianna - - kaidan - - tokodon diff --git a/kinoite-mobile-packages.yaml b/kinoite-mobile-packages.yaml new file mode 100644 index 0000000..8ccc5c6 --- /dev/null +++ b/kinoite-mobile-packages.yaml @@ -0,0 +1,36 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - elisa-player + - haruna + - kalk + - kasts + - kclock + - keysmith + - koko + - krecorder + - kweather + - marknote + - mesa-dri-drivers + - mesa-vulkan-drivers + - neochat + - okular-mobile + - plasma-discover + - plasma-discover-notifier + - plasma-mobile + - plasma-mobile-sounds + - plymouth-system-theme + - qmlkonsole + - sddm + - sddm-themes + - sddm-wayland-plasma + - spacebar +packages-x86_64: + - angelfish + - arianna + - kaidan + - tokodon +packages-aarch64: + - angelfish + - arianna + - kaidan + - tokodon diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml new file mode 100644 index 0000000..f449b87 --- /dev/null +++ b/kinoite-mobile.yaml @@ -0,0 +1,46 @@ +include: + - common.yaml + - kinoite-mobile-packages.yaml + +ref: fedora/rawhide/${basearch}/kinoite-mobile +rojig: + name: fedora-kde + summary: "Fedora Kinoite Mobile" + license: MIT + +packages: + - fedora-release-kinoite + # Install some minor optional tools for KInfoCenter + - vulkan-tools + - xdpyinfo + # Includes a KIO & KCM (can not be Flatpak'ed), used by Dolphin and Gwenview + # See https://pagure.io/fedora-kde/SIG/issue/291 + - kamera + # Make sure that previous Anaconda dependencies are kept in the image + # See: https://pagure.io/fedora-kde/SIG/issue/243 + - bcache-tools + - dmraid + - mobile-broadband-provider-info + # Make sure that modem support is installed + - NetworkManager-ppp + # Install gdb to make getting backtraces work with DrKonqi + - gdb + +# Make sure the following are not pulled in when Recommended by other packages +exclude-packages: + - plasma-discover-offline-updates + - plasma-discover-packagekit + - plasma-pk-updates + # Manually excluded as recommended by gtk3 (and likely gtk4 in the future) + # See https://pagure.io/fedora-kde/SIG/issue/124 + - tracker + - tracker-miners + # Ensure we do not include X11 support + - plasma-x11 + - plasma-workspace-x11 + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/kinoite-packages.yaml b/kinoite-packages.yaml new file mode 100644 index 0000000..10e6cb5 --- /dev/null +++ b/kinoite-packages.yaml @@ -0,0 +1,93 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - NetworkManager-config-connectivity-fedora + - adwaita-gtk2-theme + - akonadi-server + - akonadi-server-mysql + - ark + - audiocd-kio + - bluedevil + - breeze-icon-theme + - colord-kde + - dolphin + - ffmpegthumbs + - filelight + - firewall-config + - flatpak-kcm + - fprintd-pam + - glibc-all-langpacks + - gnome-keyring-pam + - kaccounts-integration-qt6 + - kcharselect + - kde-connect + - kde-gtk-config + - kde-inotify-survey + - kde-partitionmanager + - kde-settings-pulseaudio + - kdebugsettings + - kdegraphics-thumbnailers + - kdeplasma-addons + - kdialog + - kdnssd + - kf6-baloo-file + - kfind + - kinfocenter + - kio-admin + - kjournald + - kmenuedit + - konsole + - krdp + - krfb + - kscreen + - kscreenlocker + - kwalletmanager5 + - kwin + - kwrite + - libappindicator-gtk3 + - mesa-dri-drivers + - mesa-vulkan-drivers + - pam-kwallet + - phonon-qt6-backend-vlc + - pinentry-qt + - plasma-breeze + - plasma-desktop + - plasma-desktop-doc + - plasma-discover + - plasma-discover-notifier + - plasma-disks + - plasma-drkonqi + - plasma-nm + - plasma-nm-openvpn + - plasma-nm-vpnc + - plasma-pa + - plasma-print-manager + - plasma-systemmonitor + - plasma-thunderbolt + - plasma-vault + - plasma-welcome + - plasma-workspace + - plasma-workspace-geolocation + - plasma-workspace-wallpapers + - plasma-workspace-wayland + - plymouth-system-theme + - polkit-kde + - sddm + - sddm-breeze + - sddm-kcm + - sddm-wayland-plasma + - signon-kwallet-extension + - spectacle + - systemd-oomd-defaults + - udisks2 + - vlc-plugin-gstreamer + - xwaylandvideobridge +packages-x86_64: + - kaccounts-providers + - khelpcenter + - kio-gdrive + - plasma-nm-openconnect +packages-aarch64: + - kaccounts-providers + - khelpcenter + - kio-gdrive + - plasma-nm-openconnect diff --git a/kinoite.yaml b/kinoite.yaml new file mode 100644 index 0000000..b1f4624 --- /dev/null +++ b/kinoite.yaml @@ -0,0 +1,56 @@ +include: + - common.yaml + - kinoite-packages.yaml + +ref: fedora/rawhide/${basearch}/kinoite +rojig: + name: fedora-kde + summary: "Fedora Kinoite" + license: MIT + +packages: + - fedora-release-kinoite + # Install some minor optional tools for KInfoCenter + - vulkan-tools + - xdpyinfo + # Includes a KIO & KCM (can not be Flatpak'ed), used by Dolphin and Gwenview + # See https://pagure.io/fedora-kde/SIG/issue/291 + - kamera + # Make sure that previous Anaconda dependencies are kept in the image + # See: https://pagure.io/fedora-kde/SIG/issue/243 + - bcache-tools + - dmraid + - mobile-broadband-provider-info + # Make sure that modem support is installed + - NetworkManager-ppp + # Install gdb to make getting backtraces work with DrKonqi + # The dnf dependency is excluded in the common manifest + - gdb + +# Make sure the following are not pulled in when Recommended by other packages +exclude-packages: + - plasma-discover-offline-updates + - plasma-discover-packagekit + - plasma-pk-updates + # Manually excluded as recommended by gtk3 (and likely gtk4 in the future) + # See https://pagure.io/fedora-kde/SIG/issue/124 + - tracker + - tracker-miners + # Ensure we do not include X11 support + - plasma-x11 + - plasma-workspace-x11 + +# Kinoite specific workarounds and configuration +postprocess: + - | + #!/bin/bash + set -xeuo pipefail + + # Enable auto updates in Discover + echo -e "[Global]\nUseUnattendedUpdates=true\n" > /etc/xdg/PlasmaDiscoverUpdates + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/lazurite.yaml b/lazurite.yaml new file mode 100644 index 0000000..cc9bf41 --- /dev/null +++ b/lazurite.yaml @@ -0,0 +1,26 @@ +include: + - common.yaml + - lxqt-atomic-packages.yaml + +ref: fedora/rawhide/${basearch}/lazurite +rojig: + name: fedora-lxqt + summary: "Fedora LXQt Atomic" + license: MIT + +packages: + # Generic release package for desktop variants + - fedora-release + - fedora-release-ostree-desktop + - libqtxdg + - kvantum + - kwin-wayland + - plasma-systemsettings + # Portals for Flatpak + - xdg-desktop-portal-kde + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/lxqt-atomic-packages.yaml b/lxqt-atomic-packages.yaml new file mode 100644 index 0000000..d95c35c --- /dev/null +++ b/lxqt-atomic-packages.yaml @@ -0,0 +1,40 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - breeze-cursor-theme + - breeze-gtk + - breeze-icon-theme + - firewall-config + - initial-setup-gui + - lxqt-about + - lxqt-archiver + - lxqt-config + - lxqt-globalkeys + - lxqt-notificationd + - lxqt-openssh-askpass + - lxqt-panel + - lxqt-policykit + - lxqt-powermanagement + - lxqt-qtplugin + - lxqt-runner + - lxqt-session + - lxqt-themes + - lxqt-themes-fedora + - mesa-dri-drivers + - mesa-vulkan-drivers + - network-manager-applet + - nm-connection-editor + - notification-daemon + - obconf + - openbox + - pcmanfm-qt + - perl-File-MimeInfo + - plymouth-system-theme + - qterminal + - sddm + - sddm-themes + - upower + - xdg-user-dirs +packages-x86_64: + - falkon +packages-aarch64: + - falkon diff --git a/lxqt-desktop-pkgs.yaml b/lxqt-desktop-pkgs.yaml deleted file mode 100644 index d95c35c..0000000 --- a/lxqt-desktop-pkgs.yaml +++ /dev/null @@ -1,40 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - breeze-cursor-theme - - breeze-gtk - - breeze-icon-theme - - firewall-config - - initial-setup-gui - - lxqt-about - - lxqt-archiver - - lxqt-config - - lxqt-globalkeys - - lxqt-notificationd - - lxqt-openssh-askpass - - lxqt-panel - - lxqt-policykit - - lxqt-powermanagement - - lxqt-qtplugin - - lxqt-runner - - lxqt-session - - lxqt-themes - - lxqt-themes-fedora - - mesa-dri-drivers - - mesa-vulkan-drivers - - network-manager-applet - - nm-connection-editor - - notification-daemon - - obconf - - openbox - - pcmanfm-qt - - perl-File-MimeInfo - - plymouth-system-theme - - qterminal - - sddm - - sddm-themes - - upower - - xdg-user-dirs -packages-x86_64: - - falkon -packages-aarch64: - - falkon diff --git a/mate-atomic-packages.yaml b/mate-atomic-packages.yaml new file mode 100644 index 0000000..45acba8 --- /dev/null +++ b/mate-atomic-packages.yaml @@ -0,0 +1,121 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - NetworkManager-adsl + - NetworkManager-bluetooth + - NetworkManager-openconnect-gnome + - NetworkManager-openvpn-gnome + - NetworkManager-ppp + - NetworkManager-pptp-gnome + - NetworkManager-ssh-gnome + - NetworkManager-vpnc-gnome + - NetworkManager-wifi + - NetworkManager-wwan + - atril + - atril-caja + - atril-thumbnailer + - blueman + - caja + - caja-actions + - caja-image-converter + - caja-open-terminal + - caja-sendto + - caja-wallpaper + - caja-xattr-tags + - dconf-editor + - engrampa + - eom + - f38-backgrounds-base + - f38-backgrounds-extras-base + - f38-backgrounds-extras-mate + - f38-backgrounds-mate + - fedora-release-matecompiz + - firefox + - firewall-config + - glx-utils + - gnome-epub-thumbnailer + - gnome-themes-extra + - gstreamer1-plugins-ugly-free + - gtk2-engines + - gucharmap + - gvfs-afc + - gvfs-afp + - gvfs-archive + - gvfs-fuse + - gvfs-gphoto2 + - gvfs-mtp + - gvfs-nfs + - gvfs-smb + - initial-setup-gui + - libmatekbd + - libmatemixer + - libmateweather + - libsecret + - lightdm + - lm_sensors + - marco + - mate-applets + - mate-backgrounds + - mate-calc + - mate-control-center + - mate-desktop + - mate-dictionary + - mate-disk-usage-analyzer + - mate-icon-theme + - mate-media + - mate-menus + - mate-menus-preferences-category-menu + - mate-notification-daemon + - mate-panel + - mate-polkit + - mate-power-manager + - mate-screensaver + - mate-screenshot + - mate-search-tool + - mate-session-manager + - mate-settings-daemon + - mate-system-log + - mate-system-monitor + - mate-terminal + - mate-themes + - mate-user-admin + - mate-user-guide + - mesa-dri-drivers + - mesa-vulkan-drivers + - mozo + - network-manager-applet + - nm-connection-editor + - parole + - pavucontrol + - pipewire-alsa + - pipewire-pulseaudio + - pluma + - plymouth-system-theme + - seahorse + - seahorse-caja + - setroubleshoot + - slick-greeter-mate + - system-config-language + - system-config-printer + - system-config-printer-applet + - usermode-gtk + - xdg-user-dirs-gtk + - xmodmap + - xorg-x11-drv-amdgpu + - xorg-x11-drv-ati + - xorg-x11-drv-evdev + - xorg-x11-drv-fbdev + - xorg-x11-drv-libinput + - xorg-x11-drv-nouveau + - xorg-x11-drv-qxl + - xorg-x11-drv-wacom + - xorg-x11-server-Xorg + - xorg-x11-xauth + - xorg-x11-xinit + - xrdb +packages-x86_64: + - xorg-x11-drv-intel + - xorg-x11-drv-openchrome + - xorg-x11-drv-vesa + - xorg-x11-drv-vmware +packages-aarch64: + - xorg-x11-drv-armsoc diff --git a/mate-atomic.yaml b/mate-atomic.yaml new file mode 100644 index 0000000..4fd935b --- /dev/null +++ b/mate-atomic.yaml @@ -0,0 +1,24 @@ +include: + - common.yaml + - mate-atomic-packages.yaml + +ref: fedora/rawhide/${basearch}/mate +rojig: + name: fedora-mate + summary: "Fedora Mate Atomic" + license: MIT + +packages: + # Generic release sub package for desktop variants + - fedora-release-ostree-desktop + # Portals for Flatpak + - xdg-desktop-portal-gtk + +exclude-packages: + - python3-unbound + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml deleted file mode 100644 index 45acba8..0000000 --- a/mate-desktop-pkgs.yaml +++ /dev/null @@ -1,121 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager-adsl - - NetworkManager-bluetooth - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-ppp - - NetworkManager-pptp-gnome - - NetworkManager-ssh-gnome - - NetworkManager-vpnc-gnome - - NetworkManager-wifi - - NetworkManager-wwan - - atril - - atril-caja - - atril-thumbnailer - - blueman - - caja - - caja-actions - - caja-image-converter - - caja-open-terminal - - caja-sendto - - caja-wallpaper - - caja-xattr-tags - - dconf-editor - - engrampa - - eom - - f38-backgrounds-base - - f38-backgrounds-extras-base - - f38-backgrounds-extras-mate - - f38-backgrounds-mate - - fedora-release-matecompiz - - firefox - - firewall-config - - glx-utils - - gnome-epub-thumbnailer - - gnome-themes-extra - - gstreamer1-plugins-ugly-free - - gtk2-engines - - gucharmap - - gvfs-afc - - gvfs-afp - - gvfs-archive - - gvfs-fuse - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-nfs - - gvfs-smb - - initial-setup-gui - - libmatekbd - - libmatemixer - - libmateweather - - libsecret - - lightdm - - lm_sensors - - marco - - mate-applets - - mate-backgrounds - - mate-calc - - mate-control-center - - mate-desktop - - mate-dictionary - - mate-disk-usage-analyzer - - mate-icon-theme - - mate-media - - mate-menus - - mate-menus-preferences-category-menu - - mate-notification-daemon - - mate-panel - - mate-polkit - - mate-power-manager - - mate-screensaver - - mate-screenshot - - mate-search-tool - - mate-session-manager - - mate-settings-daemon - - mate-system-log - - mate-system-monitor - - mate-terminal - - mate-themes - - mate-user-admin - - mate-user-guide - - mesa-dri-drivers - - mesa-vulkan-drivers - - mozo - - network-manager-applet - - nm-connection-editor - - parole - - pavucontrol - - pipewire-alsa - - pipewire-pulseaudio - - pluma - - plymouth-system-theme - - seahorse - - seahorse-caja - - setroubleshoot - - slick-greeter-mate - - system-config-language - - system-config-printer - - system-config-printer-applet - - usermode-gtk - - xdg-user-dirs-gtk - - xmodmap - - xorg-x11-drv-amdgpu - - xorg-x11-drv-ati - - xorg-x11-drv-evdev - - xorg-x11-drv-fbdev - - xorg-x11-drv-libinput - - xorg-x11-drv-nouveau - - xorg-x11-drv-qxl - - xorg-x11-drv-wacom - - xorg-x11-server-Xorg - - xorg-x11-xauth - - xorg-x11-xinit - - xrdb -packages-x86_64: - - xorg-x11-drv-intel - - xorg-x11-drv-openchrome - - xorg-x11-drv-vesa - - xorg-x11-drv-vmware -packages-aarch64: - - xorg-x11-drv-armsoc diff --git a/onyx.yaml b/onyx.yaml new file mode 100644 index 0000000..0396dbc --- /dev/null +++ b/onyx.yaml @@ -0,0 +1,28 @@ +include: + - common.yaml + - budgie-atomic-packages.yaml + +ref: fedora/rawhide/${basearch}/onyx +rojig: + name: fedora-onyx + summary: "Fedora Budgie Atomic" + license: MIT + +packages: + - fedora-release-budgie-atomic + # Make sure that GNOME Software's rpm-ostree plugin is always installed + - gnome-software-rpm-ostree + +# Make sure the following are not pulled in when Recommended by other packages +exclude-packages: + # Not needed in Budgie Desktop + - tracker + - tracker-miners + # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue + - gnome-software-fedora-langpacks + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/sericea.yaml b/sericea.yaml new file mode 100644 index 0000000..d996a79 --- /dev/null +++ b/sericea.yaml @@ -0,0 +1,28 @@ +include: + - common.yaml + - sway-atomic-packages.yaml + +ref: fedora/rawhide/${basearch}/sericea +rojig: + name: fedora-sericea + summary: "Fedora Sway Atomic" + license: MIT + +packages: + - fedora-release-sway-atomic + # explicitly list some defaults + - firefox + +exclude-packages: + # already excluded in comps-sync-exclude-list + - PackageKit-glib + - grubby + # nothing in the tree would use these + - tracker + - tracker-miners + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/silverblue-packages.yaml b/silverblue-packages.yaml new file mode 100644 index 0000000..eb33b6e --- /dev/null +++ b/silverblue-packages.yaml @@ -0,0 +1,81 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - ModemManager + - NetworkManager-adsl + - NetworkManager-openconnect-gnome + - NetworkManager-openvpn-gnome + - NetworkManager-ppp + - NetworkManager-pptp-gnome + - NetworkManager-ssh-gnome + - NetworkManager-vpnc-gnome + - NetworkManager-wwan + - adobe-source-code-pro-fonts + - avahi + - dconf + - fprintd-pam + - gdm + - glib-networking + - glx-utils + - gnome-backgrounds + - gnome-bluetooth + - gnome-browser-connector + - gnome-classic-session + - gnome-classic-session-xsession + - gnome-color-manager + - gnome-control-center + - gnome-disk-utility + - gnome-initial-setup + - gnome-remote-desktop + - gnome-session-wayland-session + - gnome-session-xsession + - gnome-settings-daemon + - gnome-shell + - gnome-software + - gnome-system-monitor + - gnome-terminal + - gnome-terminal-nautilus + - gnome-user-docs + - gnome-user-share + - gvfs-afc + - gvfs-afp + - gvfs-archive + - gvfs-fuse + - gvfs-goa + - gvfs-gphoto2 + - gvfs-mtp + - gvfs-smb + - librsvg2 + - libsane-hpaio + - mesa-dri-drivers + - mesa-libEGL + - mesa-vulkan-drivers + - nautilus + - plymouth-system-theme + - polkit + - rygel + - systemd-oomd-defaults + - tracker + - tracker-miners + - xdg-desktop-portal + - xdg-desktop-portal-gnome + - xdg-desktop-portal-gtk + - xdg-user-dirs-gtk + - xorg-x11-drv-amdgpu + - xorg-x11-drv-ati + - xorg-x11-drv-evdev + - xorg-x11-drv-fbdev + - xorg-x11-drv-libinput + - xorg-x11-drv-nouveau + - xorg-x11-drv-qxl + - xorg-x11-drv-wacom + - xorg-x11-server-Xorg + - xorg-x11-xauth + - xorg-x11-xinit + - yelp +packages-x86_64: + - xorg-x11-drv-intel + - xorg-x11-drv-openchrome + - xorg-x11-drv-vesa + - xorg-x11-drv-vmware +packages-aarch64: + - xorg-x11-drv-armsoc diff --git a/silverblue.yaml b/silverblue.yaml new file mode 100644 index 0000000..fc0d1c0 --- /dev/null +++ b/silverblue.yaml @@ -0,0 +1,40 @@ +include: + - common.yaml + - silverblue-packages.yaml + +ref: fedora/rawhide/${basearch}/silverblue +rojig: + name: fedora-silverblue + summary: "Fedora Silverblue" + license: MIT + +packages: + - fedora-release-silverblue + - desktop-backgrounds-gnome + - gnome-shell-extension-background-logo + - pinentry-gnome3 + # Included for now to have layered Qt5 applications use a constistent style + # Manually included here as it is excluded from the workstation-product group + - qadwaitadecorations-qt5 + # Include evince-thumbnailer otherwise PDF thumbnails won't work in Nautilus + # https://github.com/fedora-silverblue/issue-tracker/issues/98 + - evince-thumbnailer + # Include evince-previewer otherwise print previews are broken in Evince + # https://github.com/fedora-silverblue/issue-tracker/issues/122 + - evince-previewer + # Include totem-video-thumbnailer for video thumbnailing in Nautilus + # https://pagure.io/fedora-workstation/issue/168 + - totem-video-thumbnailer + # Make sure that GNOME Software's rpm-ostree plugin is always installed + - gnome-software-rpm-ostree + +# Make sure the following are not pulled in when Recommended by other packages +exclude-packages: + # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue + - gnome-software-fedora-langpacks + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/sway-atomic-packages.yaml b/sway-atomic-packages.yaml new file mode 100644 index 0000000..cc75bca --- /dev/null +++ b/sway-atomic-packages.yaml @@ -0,0 +1,48 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - NetworkManager-l2tp-gnome + - NetworkManager-libreswan-gnome + - NetworkManager-openconnect-gnome + - NetworkManager-openvpn-gnome + - NetworkManager-pptp-gnome + - NetworkManager-sstp-gnome + - NetworkManager-vpnc-gnome + - Thunar + - blueman + - bolt + - dunst + - foot + - fprintd-pam + - gnome-keyring-pam + - gnome-themes-extra + - grim + - imv + - kanshi + - lxqt-policykit + - mesa-dri-drivers + - mesa-vulkan-drivers + - network-manager-applet + - pavucontrol + - pinentry-gnome3 + - playerctl + - plymouth-system-theme + - polkit + - pulseaudio-utils + - sddm + - sddm-wayland-sway + - slurp + - sway + - sway-config-fedora + - swaybg + - swayidle + - swaylock + - system-config-printer + - thunar-archive-plugin + - waybar + - wev + - wl-clipboard + - wlr-randr + - wlsunset + - xdg-desktop-portal-gtk + - xdg-desktop-portal-wlr + - xorg-x11-server-Xwayland diff --git a/sway-desktop-pkgs.yaml b/sway-desktop-pkgs.yaml deleted file mode 100644 index cc75bca..0000000 --- a/sway-desktop-pkgs.yaml +++ /dev/null @@ -1,48 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager-l2tp-gnome - - NetworkManager-libreswan-gnome - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-pptp-gnome - - NetworkManager-sstp-gnome - - NetworkManager-vpnc-gnome - - Thunar - - blueman - - bolt - - dunst - - foot - - fprintd-pam - - gnome-keyring-pam - - gnome-themes-extra - - grim - - imv - - kanshi - - lxqt-policykit - - mesa-dri-drivers - - mesa-vulkan-drivers - - network-manager-applet - - pavucontrol - - pinentry-gnome3 - - playerctl - - plymouth-system-theme - - polkit - - pulseaudio-utils - - sddm - - sddm-wayland-sway - - slurp - - sway - - sway-config-fedora - - swaybg - - swayidle - - swaylock - - system-config-printer - - thunar-archive-plugin - - waybar - - wev - - wl-clipboard - - wlr-randr - - wlsunset - - xdg-desktop-portal-gtk - - xdg-desktop-portal-wlr - - xorg-x11-server-Xwayland diff --git a/vauxite.yaml b/vauxite.yaml new file mode 100644 index 0000000..1219e66 --- /dev/null +++ b/vauxite.yaml @@ -0,0 +1,22 @@ +include: + - common.yaml + - xfce-atomic-packages.yaml + +ref: fedora/rawhide/${basearch}/vauxite +rojig: + name: fedora-vauxite + summary: "Fedora XFCE Atomic" + license: MIT + +packages: + - fedora-release-xfce + # Generic release sub package for desktop variants + - fedora-release-ostree-desktop + # Portals for Flatpak + - xdg-desktop-portal-gtk + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/xfce-atomic-packages.yaml b/xfce-atomic-packages.yaml new file mode 100644 index 0000000..644e743 --- /dev/null +++ b/xfce-atomic-packages.yaml @@ -0,0 +1,97 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - NetworkManager-openconnect-gnome + - NetworkManager-openvpn-gnome + - NetworkManager-pptp-gnome + - NetworkManager-ssh-gnome + - NetworkManager-vpnc-gnome + - Thunar + - adwaita-gtk2-theme + - adwaita-icon-theme + - atril + - blueman + - desktop-backgrounds-compat + - firefox + - galculator + - glx-utils + - gnome-keyring-pam + - gparted + - greybird-dark-theme + - greybird-light-theme + - greybird-xfce4-notifyd-theme + - greybird-xfwm4-theme + - gtk-xfce-engine + - gvfs + - gvfs-archive + - gvfs-mtp + - initial-setup-gui + - lightdm-gtk + - mesa-dri-drivers + - mesa-vulkan-drivers + - mint-y-theme + - mousepad + - network-manager-applet + - nm-connection-editor + - plymouth-system-theme + - ristretto + - thunar-archive-plugin + - thunar-media-tags-plugin + - thunar-volman + - xarchiver + - xdg-user-dirs-gtk + - xfce4-about + - xfce4-appfinder + - xfce4-battery-plugin + - xfce4-clipman-plugin + - xfce4-cpugraph-plugin + - xfce4-datetime-plugin + - xfce4-dict-plugin + - xfce4-diskperf-plugin + - xfce4-eyes-plugin + - xfce4-fsguard-plugin + - xfce4-genmon-plugin + - xfce4-mailwatch-plugin + - xfce4-mount-plugin + - xfce4-netload-plugin + - xfce4-panel + - xfce4-panel-profiles + - xfce4-places-plugin + - xfce4-power-manager + - xfce4-pulseaudio-plugin + - xfce4-screensaver + - xfce4-screenshooter-plugin + - xfce4-sensors-plugin + - xfce4-session + - xfce4-settings + - xfce4-systemload-plugin + - xfce4-taskmanager + - xfce4-terminal + - xfce4-time-out-plugin + - xfce4-verve-plugin + - xfce4-weather-plugin + - xfce4-whiskermenu-plugin + - xfce4-xkb-plugin + - xfconf + - xfdashboard + - xfdashboard-themes + - xfdesktop + - xfwm4 + - xfwm4-themes + - xorg-x11-drv-amdgpu + - xorg-x11-drv-ati + - xorg-x11-drv-evdev + - xorg-x11-drv-fbdev + - xorg-x11-drv-libinput + - xorg-x11-drv-nouveau + - xorg-x11-drv-qxl + - xorg-x11-drv-wacom + - xorg-x11-server-Xorg + - xorg-x11-xauth + - xorg-x11-xinit +packages-x86_64: + - xorg-x11-drv-intel + - xorg-x11-drv-openchrome + - xorg-x11-drv-vesa + - xorg-x11-drv-vmware +packages-aarch64: + - xorg-x11-drv-armsoc diff --git a/xfce-desktop-pkgs.yaml b/xfce-desktop-pkgs.yaml deleted file mode 100644 index 644e743..0000000 --- a/xfce-desktop-pkgs.yaml +++ /dev/null @@ -1,97 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-pptp-gnome - - NetworkManager-ssh-gnome - - NetworkManager-vpnc-gnome - - Thunar - - adwaita-gtk2-theme - - adwaita-icon-theme - - atril - - blueman - - desktop-backgrounds-compat - - firefox - - galculator - - glx-utils - - gnome-keyring-pam - - gparted - - greybird-dark-theme - - greybird-light-theme - - greybird-xfce4-notifyd-theme - - greybird-xfwm4-theme - - gtk-xfce-engine - - gvfs - - gvfs-archive - - gvfs-mtp - - initial-setup-gui - - lightdm-gtk - - mesa-dri-drivers - - mesa-vulkan-drivers - - mint-y-theme - - mousepad - - network-manager-applet - - nm-connection-editor - - plymouth-system-theme - - ristretto - - thunar-archive-plugin - - thunar-media-tags-plugin - - thunar-volman - - xarchiver - - xdg-user-dirs-gtk - - xfce4-about - - xfce4-appfinder - - xfce4-battery-plugin - - xfce4-clipman-plugin - - xfce4-cpugraph-plugin - - xfce4-datetime-plugin - - xfce4-dict-plugin - - xfce4-diskperf-plugin - - xfce4-eyes-plugin - - xfce4-fsguard-plugin - - xfce4-genmon-plugin - - xfce4-mailwatch-plugin - - xfce4-mount-plugin - - xfce4-netload-plugin - - xfce4-panel - - xfce4-panel-profiles - - xfce4-places-plugin - - xfce4-power-manager - - xfce4-pulseaudio-plugin - - xfce4-screensaver - - xfce4-screenshooter-plugin - - xfce4-sensors-plugin - - xfce4-session - - xfce4-settings - - xfce4-systemload-plugin - - xfce4-taskmanager - - xfce4-terminal - - xfce4-time-out-plugin - - xfce4-verve-plugin - - xfce4-weather-plugin - - xfce4-whiskermenu-plugin - - xfce4-xkb-plugin - - xfconf - - xfdashboard - - xfdashboard-themes - - xfdesktop - - xfwm4 - - xfwm4-themes - - xorg-x11-drv-amdgpu - - xorg-x11-drv-ati - - xorg-x11-drv-evdev - - xorg-x11-drv-fbdev - - xorg-x11-drv-libinput - - xorg-x11-drv-nouveau - - xorg-x11-drv-qxl - - xorg-x11-drv-wacom - - xorg-x11-server-Xorg - - xorg-x11-xauth - - xorg-x11-xinit -packages-x86_64: - - xorg-x11-drv-intel - - xorg-x11-drv-openchrome - - xorg-x11-drv-vesa - - xorg-x11-drv-vmware -packages-aarch64: - - xorg-x11-drv-armsoc From 6b402254c980a51b1ec642684bc6a429320c16ba Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jun 19 2024 16:54:02 +0000 Subject: [PATCH 4/8] Use new Atomic names --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccf2279..242da66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,8 +22,8 @@ build: - silverblue - kinoite - kinoite-mobile - - sericea - - vauxite - - lazurite - - onyx - - base + - sway-atomic + - xfce-atomic + - lxqt-atomic + - budgie-atomic + - base-atomic diff --git a/base-atomic.yaml b/base-atomic.yaml new file mode 100644 index 0000000..5c058c3 --- /dev/null +++ b/base-atomic.yaml @@ -0,0 +1,24 @@ +include: + - common.yaml + +ref: fedora/rawhide/${basearch}/base +rojig: + name: fedora-base + summary: "Fedora Base Atomic" + license: MIT + +packages: + # Generic release package for desktop variants + - fedora-release + - fedora-release-ostree-desktop + # XWayland support + - xorg-x11-server-Xwayland + # Portals for Flatpak + - xdg-desktop-portal + - xdg-desktop-portal-gtk + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/base.yaml b/base.yaml deleted file mode 100644 index 5c058c3..0000000 --- a/base.yaml +++ /dev/null @@ -1,24 +0,0 @@ -include: - - common.yaml - -ref: fedora/rawhide/${basearch}/base -rojig: - name: fedora-base - summary: "Fedora Base Atomic" - license: MIT - -packages: - # Generic release package for desktop variants - - fedora-release - - fedora-release-ostree-desktop - # XWayland support - - xorg-x11-server-Xwayland - # Portals for Flatpak - - xdg-desktop-portal - - xdg-desktop-portal-gtk - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/budgie-atomic.yaml b/budgie-atomic.yaml new file mode 100644 index 0000000..0396dbc --- /dev/null +++ b/budgie-atomic.yaml @@ -0,0 +1,28 @@ +include: + - common.yaml + - budgie-atomic-packages.yaml + +ref: fedora/rawhide/${basearch}/onyx +rojig: + name: fedora-onyx + summary: "Fedora Budgie Atomic" + license: MIT + +packages: + - fedora-release-budgie-atomic + # Make sure that GNOME Software's rpm-ostree plugin is always installed + - gnome-software-rpm-ostree + +# Make sure the following are not pulled in when Recommended by other packages +exclude-packages: + # Not needed in Budgie Desktop + - tracker + - tracker-miners + # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue + - gnome-software-fedora-langpacks + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/ci/validate.yaml b/ci/validate.yaml index f263bb6..7db34b7 100644 --- a/ci/validate.yaml +++ b/ci/validate.yaml @@ -47,23 +47,23 @@ - name: Perform dependency resolution for Sway Atomic ansible.builtin.shell: chdir: "{{ zuul.project.src_dir }}" - cmd: "just compose-dry-run sericea && touch .zuulci.sericea" + cmd: "just compose-dry-run sway-atomic && touch .zuulci.sway-atomic" # Still run the next step if this one fails ignore_errors: true - name: Perform dependency resolution for Budgie Atomic ansible.builtin.shell: chdir: "{{ zuul.project.src_dir }}" - cmd: "just compose-dry-run onyx && touch .zuulci.onyx" + cmd: "just compose-dry-run budgie-atomic && touch .zuulci.budgie-atomic" # Still run the next step if this one fails ignore_errors: true - name: Compose the base variant ansible.builtin.command: chdir: "{{ zuul.project.src_dir }}" - cmd: just compose-legacy base + cmd: just compose-legacy base-atomic - name: Check if any previous dependency resolution steps failed ansible.builtin.shell: chdir: "{{ zuul.project.src_dir }}" - cmd: "[[ -f .zuulci.comps ]] && [[ -f .zuulci.silverblue ]] && [[ -f .zuulci.kinoite ]] && [[ -f .zuulci.sericea ]] && [[ -f .zuulci.onyx ]]" + cmd: "[[ -f .zuulci.comps ]] && [[ -f .zuulci.silverblue ]] && [[ -f .zuulci.kinoite ]] && [[ -f .zuulci.sway-atomic ]] && [[ -f .zuulci.budgie-atomic ]]" diff --git a/justfile b/justfile index cafa8c6..c16bb4e 100644 --- a/justfile +++ b/justfile @@ -14,11 +14,20 @@ pretty_names := '( [kinoite-nightly]="Kinoite" [kinoite-beta]="Kinoite" [kinoite-mobile]="Kinoite" - [sericea]="Sericea" - [onyx]="Onyx" - [vauxite]="Vauxite" - [lazurite]="Lazurite" - [base]="Base" + [sway-atomic]="Sway Atomic" + [budgie-atomic]="Budgie Atomic" + [xfce-atomic]="XFCE Atomic" + [lxqt-atomic]="LXQt Atomic" + [base-atomic]="Base Atomic" +)' + +# Legacy names, used to keep some references stable +legacy_names := '( + [base-atomic]="base" + [budgie-atomic]="onyx" + [lxqt-atomic]="lazurite" + [sway-atomic]="sericea" + [xfce-atomic]="vauxite" )' # subset of the map from https://pagure.io/pungi-fedora/blob/main/f/general.conf @@ -28,11 +37,11 @@ volume_id_substitutions := '( [kinoite-nightly]="Kin" [kinoite-beta]="Kin" [kinoite-mobile]="Kin" - [sericea]="Src" - [onyx]="Onyx" - [vauxite]="Vxt" - [lazurite]="Lzr" - [base]="Base" + [sway-atomic]="SwA" + [budgie-atomic]="BdA" + [xfce-atomic]="XfA" + [lxqt-atomic]="LxA" + [base-atomic]="BsA" )' # Default is to only validate the manifests @@ -342,8 +351,9 @@ upload-container variant=default_variant: #!/bin/bash set -euxo pipefail - declare -A pretty_names={{pretty_names}} variant={{variant}} + + declare -A pretty_names={{pretty_names}} variant_pretty=${pretty_names[$variant]-} if [[ -z $variant_pretty ]]; then echo "Unknown variant" @@ -366,7 +376,6 @@ upload-container variant=default_variant: version="$(rpm-ostree compose tree --print-only --repo=repo ${variant}.yaml | jq -r '."mutate-os-release"')" fi - image="quay.io/fedora-ostree-desktops/${variant}" buildid="" if [[ -f ".buildid" ]]; then buildid="$(< .buildid)" @@ -383,6 +392,10 @@ upload-container variant=default_variant: fi skopeo login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" quay.io + + # Copy to the new names + image="quay.io/fedora-ostree-desktops/${variant}" + # Copy fully versioned tag (major version, build date/id, git commit) skopeo copy --retry-times 3 "oci-archive:${variant}.ociarchive" "docker://${image}:${version}.${buildid}.${git_commit}" @@ -392,3 +405,16 @@ upload-container variant=default_variant: # Update latest tag for kinoite-nightly only skopeo copy --retry-times 3 "docker://${image}:${version}.${buildid}.${git_commit}" "docker://${image}:latest" fi + + # Copy to legacy names if needed + declare -A legacy_names={{legacy_names}} + variant_legacy=${legacy_names[$variant]-} + if [[ -n ${variant_legacy} ]]; then + image="quay.io/fedora-ostree-desktops/${variant_legacy}" + + # Copy fully versioned tag (major version, build date/id, git commit) + skopeo copy --retry-times 3 "oci-archive:${variant}.ociarchive" "docker://${image}:${version}.${buildid}.${git_commit}" + + # Update "un-versioned" tag (only major version) + skopeo copy --retry-times 3 "docker://${image}:${version}.${buildid}.${git_commit}" "docker://${image}:${version}" + fi diff --git a/lazurite.yaml b/lazurite.yaml deleted file mode 100644 index cc9bf41..0000000 --- a/lazurite.yaml +++ /dev/null @@ -1,26 +0,0 @@ -include: - - common.yaml - - lxqt-atomic-packages.yaml - -ref: fedora/rawhide/${basearch}/lazurite -rojig: - name: fedora-lxqt - summary: "Fedora LXQt Atomic" - license: MIT - -packages: - # Generic release package for desktop variants - - fedora-release - - fedora-release-ostree-desktop - - libqtxdg - - kvantum - - kwin-wayland - - plasma-systemsettings - # Portals for Flatpak - - xdg-desktop-portal-kde - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/lxqt-atomic.yaml b/lxqt-atomic.yaml new file mode 100644 index 0000000..cc9bf41 --- /dev/null +++ b/lxqt-atomic.yaml @@ -0,0 +1,26 @@ +include: + - common.yaml + - lxqt-atomic-packages.yaml + +ref: fedora/rawhide/${basearch}/lazurite +rojig: + name: fedora-lxqt + summary: "Fedora LXQt Atomic" + license: MIT + +packages: + # Generic release package for desktop variants + - fedora-release + - fedora-release-ostree-desktop + - libqtxdg + - kvantum + - kwin-wayland + - plasma-systemsettings + # Portals for Flatpak + - xdg-desktop-portal-kde + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/onyx.yaml b/onyx.yaml deleted file mode 100644 index 0396dbc..0000000 --- a/onyx.yaml +++ /dev/null @@ -1,28 +0,0 @@ -include: - - common.yaml - - budgie-atomic-packages.yaml - -ref: fedora/rawhide/${basearch}/onyx -rojig: - name: fedora-onyx - summary: "Fedora Budgie Atomic" - license: MIT - -packages: - - fedora-release-budgie-atomic - # Make sure that GNOME Software's rpm-ostree plugin is always installed - - gnome-software-rpm-ostree - -# Make sure the following are not pulled in when Recommended by other packages -exclude-packages: - # Not needed in Budgie Desktop - - tracker - - tracker-miners - # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue - - gnome-software-fedora-langpacks - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/sericea.yaml b/sericea.yaml deleted file mode 100644 index d996a79..0000000 --- a/sericea.yaml +++ /dev/null @@ -1,28 +0,0 @@ -include: - - common.yaml - - sway-atomic-packages.yaml - -ref: fedora/rawhide/${basearch}/sericea -rojig: - name: fedora-sericea - summary: "Fedora Sway Atomic" - license: MIT - -packages: - - fedora-release-sway-atomic - # explicitly list some defaults - - firefox - -exclude-packages: - # already excluded in comps-sync-exclude-list - - PackageKit-glib - - grubby - # nothing in the tree would use these - - tracker - - tracker-miners - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/sway-atomic.yaml b/sway-atomic.yaml new file mode 100644 index 0000000..d996a79 --- /dev/null +++ b/sway-atomic.yaml @@ -0,0 +1,28 @@ +include: + - common.yaml + - sway-atomic-packages.yaml + +ref: fedora/rawhide/${basearch}/sericea +rojig: + name: fedora-sericea + summary: "Fedora Sway Atomic" + license: MIT + +packages: + - fedora-release-sway-atomic + # explicitly list some defaults + - firefox + +exclude-packages: + # already excluded in comps-sync-exclude-list + - PackageKit-glib + - grubby + # nothing in the tree would use these + - tracker + - tracker-miners + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/vauxite.yaml b/vauxite.yaml deleted file mode 100644 index 1219e66..0000000 --- a/vauxite.yaml +++ /dev/null @@ -1,22 +0,0 @@ -include: - - common.yaml - - xfce-atomic-packages.yaml - -ref: fedora/rawhide/${basearch}/vauxite -rojig: - name: fedora-vauxite - summary: "Fedora XFCE Atomic" - license: MIT - -packages: - - fedora-release-xfce - # Generic release sub package for desktop variants - - fedora-release-ostree-desktop - # Portals for Flatpak - - xdg-desktop-portal-gtk - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-41 - # - fedora-41-updates diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml new file mode 100644 index 0000000..1219e66 --- /dev/null +++ b/xfce-atomic.yaml @@ -0,0 +1,22 @@ +include: + - common.yaml + - xfce-atomic-packages.yaml + +ref: fedora/rawhide/${basearch}/vauxite +rojig: + name: fedora-vauxite + summary: "Fedora XFCE Atomic" + license: MIT + +packages: + - fedora-release-xfce + # Generic release sub package for desktop variants + - fedora-release-ostree-desktop + # Portals for Flatpak + - xdg-desktop-portal-gtk + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates From 47170ee1691995a119858e914798873db099f926 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jun 19 2024 16:54:02 +0000 Subject: [PATCH 5/8] Split Bootable Containers manifest from classic ostree ones To be able to build images in the Fedora infrastructure with distinct changes in the container vs classic ostree case, we need to split those into a common manifest and a top level one that includes only the repos and other distinct includes. --- diff --git a/budgie-atomic-common.yaml b/budgie-atomic-common.yaml new file mode 100644 index 0000000..a5b3663 --- /dev/null +++ b/budgie-atomic-common.yaml @@ -0,0 +1,22 @@ +include: + - common.yaml + - budgie-atomic-packages.yaml + +ref: fedora/rawhide/${basearch}/onyx +rojig: + name: fedora-onyx + summary: "Fedora Budgie Atomic" + license: MIT + +packages: + - fedora-release-budgie-atomic + # Make sure that GNOME Software's rpm-ostree plugin is always installed + - gnome-software-rpm-ostree + +# Make sure the following are not pulled in when Recommended by other packages +exclude-packages: + # Not needed in Budgie Desktop + - tracker + - tracker-miners + # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue + - gnome-software-fedora-langpacks diff --git a/budgie-atomic-ostree.yaml b/budgie-atomic-ostree.yaml new file mode 100644 index 0000000..c9bc965 --- /dev/null +++ b/budgie-atomic-ostree.yaml @@ -0,0 +1,8 @@ +include: + - budgie-atomic-common.yaml + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/budgie-atomic.yaml b/budgie-atomic.yaml index 0396dbc..c9bc965 100644 --- a/budgie-atomic.yaml +++ b/budgie-atomic.yaml @@ -1,25 +1,5 @@ include: - - common.yaml - - budgie-atomic-packages.yaml - -ref: fedora/rawhide/${basearch}/onyx -rojig: - name: fedora-onyx - summary: "Fedora Budgie Atomic" - license: MIT - -packages: - - fedora-release-budgie-atomic - # Make sure that GNOME Software's rpm-ostree plugin is always installed - - gnome-software-rpm-ostree - -# Make sure the following are not pulled in when Recommended by other packages -exclude-packages: - # Not needed in Budgie Desktop - - tracker - - tracker-miners - # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue - - gnome-software-fedora-langpacks + - budgie-atomic-common.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/kinoite-common.yaml b/kinoite-common.yaml new file mode 100644 index 0000000..08a8668 --- /dev/null +++ b/kinoite-common.yaml @@ -0,0 +1,50 @@ +include: + - common.yaml + - kinoite-packages.yaml + +ref: fedora/rawhide/${basearch}/kinoite +rojig: + name: fedora-kde + summary: "Fedora Kinoite" + license: MIT + +packages: + - fedora-release-kinoite + # Install some minor optional tools for KInfoCenter + - vulkan-tools + - xdpyinfo + # Includes a KIO & KCM (can not be Flatpak'ed), used by Dolphin and Gwenview + # See https://pagure.io/fedora-kde/SIG/issue/291 + - kamera + # Make sure that previous Anaconda dependencies are kept in the image + # See: https://pagure.io/fedora-kde/SIG/issue/243 + - bcache-tools + - dmraid + - mobile-broadband-provider-info + # Make sure that modem support is installed + - NetworkManager-ppp + # Install gdb to make getting backtraces work with DrKonqi + # The dnf dependency is excluded in the common manifest + - gdb + +# Make sure the following are not pulled in when Recommended by other packages +exclude-packages: + - plasma-discover-offline-updates + - plasma-discover-packagekit + - plasma-pk-updates + # Manually excluded as recommended by gtk3 (and likely gtk4 in the future) + # See https://pagure.io/fedora-kde/SIG/issue/124 + - tracker + - tracker-miners + # Ensure we do not include X11 support + - plasma-x11 + - plasma-workspace-x11 + +# Kinoite specific workarounds and configuration +postprocess: + - | + #!/bin/bash + set -xeuo pipefail + + # Enable auto updates in Discover + echo -e "[Global]\nUseUnattendedUpdates=true\n" > /etc/xdg/PlasmaDiscoverUpdates diff --git a/kinoite-ostree.yaml b/kinoite-ostree.yaml new file mode 100644 index 0000000..a4ff11d --- /dev/null +++ b/kinoite-ostree.yaml @@ -0,0 +1,8 @@ +include: + - kinoite-common.yaml + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/kinoite.yaml b/kinoite.yaml index b1f4624..a4ff11d 100644 --- a/kinoite.yaml +++ b/kinoite.yaml @@ -1,53 +1,5 @@ include: - - common.yaml - - kinoite-packages.yaml - -ref: fedora/rawhide/${basearch}/kinoite -rojig: - name: fedora-kde - summary: "Fedora Kinoite" - license: MIT - -packages: - - fedora-release-kinoite - # Install some minor optional tools for KInfoCenter - - vulkan-tools - - xdpyinfo - # Includes a KIO & KCM (can not be Flatpak'ed), used by Dolphin and Gwenview - # See https://pagure.io/fedora-kde/SIG/issue/291 - - kamera - # Make sure that previous Anaconda dependencies are kept in the image - # See: https://pagure.io/fedora-kde/SIG/issue/243 - - bcache-tools - - dmraid - - mobile-broadband-provider-info - # Make sure that modem support is installed - - NetworkManager-ppp - # Install gdb to make getting backtraces work with DrKonqi - # The dnf dependency is excluded in the common manifest - - gdb - -# Make sure the following are not pulled in when Recommended by other packages -exclude-packages: - - plasma-discover-offline-updates - - plasma-discover-packagekit - - plasma-pk-updates - # Manually excluded as recommended by gtk3 (and likely gtk4 in the future) - # See https://pagure.io/fedora-kde/SIG/issue/124 - - tracker - - tracker-miners - # Ensure we do not include X11 support - - plasma-x11 - - plasma-workspace-x11 - -# Kinoite specific workarounds and configuration -postprocess: - - | - #!/bin/bash - set -xeuo pipefail - - # Enable auto updates in Discover - echo -e "[Global]\nUseUnattendedUpdates=true\n" > /etc/xdg/PlasmaDiscoverUpdates + - kinoite-common.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/silverblue-common.yaml b/silverblue-common.yaml new file mode 100644 index 0000000..220c019 --- /dev/null +++ b/silverblue-common.yaml @@ -0,0 +1,34 @@ +include: + - common.yaml + - silverblue-packages.yaml + +ref: fedora/rawhide/${basearch}/silverblue +rojig: + name: fedora-silverblue + summary: "Fedora Silverblue" + license: MIT + +packages: + - fedora-release-silverblue + - desktop-backgrounds-gnome + - gnome-shell-extension-background-logo + - pinentry-gnome3 + # Included for now to have layered Qt5 applications use a constistent style + # Manually included here as it is excluded from the workstation-product group + - qadwaitadecorations-qt5 + # Include evince-thumbnailer otherwise PDF thumbnails won't work in Nautilus + # https://github.com/fedora-silverblue/issue-tracker/issues/98 + - evince-thumbnailer + # Include evince-previewer otherwise print previews are broken in Evince + # https://github.com/fedora-silverblue/issue-tracker/issues/122 + - evince-previewer + # Include totem-video-thumbnailer for video thumbnailing in Nautilus + # https://pagure.io/fedora-workstation/issue/168 + - totem-video-thumbnailer + # Make sure that GNOME Software's rpm-ostree plugin is always installed + - gnome-software-rpm-ostree + +# Make sure the following are not pulled in when Recommended by other packages +exclude-packages: + # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue + - gnome-software-fedora-langpacks diff --git a/silverblue-ostree.yaml b/silverblue-ostree.yaml new file mode 100644 index 0000000..cf98244 --- /dev/null +++ b/silverblue-ostree.yaml @@ -0,0 +1,8 @@ +include: + - silverblue-common.yaml + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/silverblue.yaml b/silverblue.yaml index fc0d1c0..cf98244 100644 --- a/silverblue.yaml +++ b/silverblue.yaml @@ -1,37 +1,5 @@ include: - - common.yaml - - silverblue-packages.yaml - -ref: fedora/rawhide/${basearch}/silverblue -rojig: - name: fedora-silverblue - summary: "Fedora Silverblue" - license: MIT - -packages: - - fedora-release-silverblue - - desktop-backgrounds-gnome - - gnome-shell-extension-background-logo - - pinentry-gnome3 - # Included for now to have layered Qt5 applications use a constistent style - # Manually included here as it is excluded from the workstation-product group - - qadwaitadecorations-qt5 - # Include evince-thumbnailer otherwise PDF thumbnails won't work in Nautilus - # https://github.com/fedora-silverblue/issue-tracker/issues/98 - - evince-thumbnailer - # Include evince-previewer otherwise print previews are broken in Evince - # https://github.com/fedora-silverblue/issue-tracker/issues/122 - - evince-previewer - # Include totem-video-thumbnailer for video thumbnailing in Nautilus - # https://pagure.io/fedora-workstation/issue/168 - - totem-video-thumbnailer - # Make sure that GNOME Software's rpm-ostree plugin is always installed - - gnome-software-rpm-ostree - -# Make sure the following are not pulled in when Recommended by other packages -exclude-packages: - # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue - - gnome-software-fedora-langpacks + - silverblue-common.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/sway-atomic-common.yaml b/sway-atomic-common.yaml new file mode 100644 index 0000000..4967a75 --- /dev/null +++ b/sway-atomic-common.yaml @@ -0,0 +1,22 @@ +include: + - common.yaml + - sway-atomic-packages.yaml + +ref: fedora/rawhide/${basearch}/sericea +rojig: + name: fedora-sericea + summary: "Fedora Sway Atomic" + license: MIT + +packages: + - fedora-release-sway-atomic + # explicitly list some defaults + - firefox + +exclude-packages: + # already excluded in comps-sync-exclude-list + - PackageKit-glib + - grubby + # nothing in the tree would use these + - tracker + - tracker-miners diff --git a/sway-atomic-ostree.yaml b/sway-atomic-ostree.yaml new file mode 100644 index 0000000..5f34982 --- /dev/null +++ b/sway-atomic-ostree.yaml @@ -0,0 +1,8 @@ +include: + - sway-atomic-common.yaml + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates diff --git a/sway-atomic.yaml b/sway-atomic.yaml index d996a79..5f34982 100644 --- a/sway-atomic.yaml +++ b/sway-atomic.yaml @@ -1,25 +1,5 @@ include: - - common.yaml - - sway-atomic-packages.yaml - -ref: fedora/rawhide/${basearch}/sericea -rojig: - name: fedora-sericea - summary: "Fedora Sway Atomic" - license: MIT - -packages: - - fedora-release-sway-atomic - # explicitly list some defaults - - firefox - -exclude-packages: - # already excluded in comps-sync-exclude-list - - PackageKit-glib - - grubby - # nothing in the tree would use these - - tracker - - tracker-miners + - sway-atomic-common.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: From 98680de7cf19b50901a90ea8679117d05a9acaff Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jun 19 2024 16:54:02 +0000 Subject: [PATCH 6/8] Add compatibility symlinks for classic ostree manifests Keep stable names for the variants that are currently built in the Fedora infrastructure. We can remove those once we have landed the rename in this repo and the rename in the pungi-fedora config. --- diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml new file mode 120000 index 0000000..c2542a6 --- /dev/null +++ b/fedora-kinoite.yaml @@ -0,0 +1 @@ +kinoite-ostree.yaml \ No newline at end of file diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml new file mode 120000 index 0000000..f9283ac --- /dev/null +++ b/fedora-onyx.yaml @@ -0,0 +1 @@ +budgie-atomic-ostree.yaml \ No newline at end of file diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml new file mode 120000 index 0000000..0728c62 --- /dev/null +++ b/fedora-sericea.yaml @@ -0,0 +1 @@ +sway-atomic-ostree.yaml \ No newline at end of file diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml new file mode 120000 index 0000000..0c5ed77 --- /dev/null +++ b/fedora-silverblue.yaml @@ -0,0 +1 @@ +silverblue-ostree.yaml \ No newline at end of file From 85a0198db55e71b1fa1ffd024cdf23c366d9d57a Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jun 19 2024 16:54:02 +0000 Subject: [PATCH 7/8] Update justfile to compose -ostree for legacy --- diff --git a/justfile b/justfile index c16bb4e..f3d60eb 100644 --- a/justfile +++ b/justfile @@ -175,7 +175,7 @@ compose-legacy variant=default_variant: ${CMD} compose tree ${ARGS} \ --add-metadata-string="version=${variant_pretty} ${version}.${buildid}" \ - "${variant}.yaml" \ + "${variant}-ostree.yaml" \ |& tee "logs/${variant}_${version}_${buildid}.${timestamp}.log" if [[ ${EUID} -ne 0 ]]; then From 3bd5718f4a10211104202338ba3d18edd6b2756a Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jun 19 2024 16:54:02 +0000 Subject: [PATCH 8/8] ci/validate: Test by building a Bootable Container Switch to building a bootable container by default. --- diff --git a/ci/validate.yaml b/ci/validate.yaml index 7db34b7..a7b1bbb 100644 --- a/ci/validate.yaml +++ b/ci/validate.yaml @@ -61,7 +61,7 @@ - name: Compose the base variant ansible.builtin.command: chdir: "{{ zuul.project.src_dir }}" - cmd: just compose-legacy base-atomic + cmd: just compose-image base-atomic - name: Check if any previous dependency resolution steps failed ansible.builtin.shell: