From d12e6dab3d5051ac9dd7c291c0775a8f1c600480 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Sep 02 2024 16:28:43 +0000 Subject: [PATCH 1/5] Kinoite: Exclude mariadb-server-utils Those commands are non-essential server utilities that are not needed on a destkop. This is also one of the last packages requiring Perl. --- diff --git a/kinoite-common.yaml b/kinoite-common.yaml index 5e00c30..7d8ac81 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -45,3 +45,5 @@ exclude-packages: # Ensure we do not include X11 support - plasma-x11 - plasma-workspace-x11 + # Exclude mariadb server tools that bring in Perl + - mariadb-server-utils diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml index 4139514..5d89380 100644 --- a/kinoite-mobile.yaml +++ b/kinoite-mobile.yaml @@ -42,6 +42,8 @@ exclude-packages: # Ensure we do not include X11 support - plasma-x11 - plasma-workspace-x11 + # Exclude mariadb server tools that bring in Perl + - mariadb-server-utils # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: From b2a64a124441f90e92a414ed7c166a2ea34c3b40 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Sep 02 2024 16:28:46 +0000 Subject: [PATCH 2/5] kinoite-common: Update outdated comment --- diff --git a/kinoite-common.yaml b/kinoite-common.yaml index 7d8ac81..5aa1479 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -27,7 +27,6 @@ packages: # 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 # Explicitely not included via comps # See: https://pagure.io/fedora-kde/SIG/issue/295 From 49a33d660aa6baca19af96973b2d882514741ab0 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Sep 02 2024 16:28:46 +0000 Subject: [PATCH 3/5] Kinoite Mobile: Add plasma-welcome-fedora Match what is included in Fedora Kinoite. --- diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml index 5d89380..34a33f3 100644 --- a/kinoite-mobile.yaml +++ b/kinoite-mobile.yaml @@ -29,6 +29,9 @@ packages: - NetworkManager-ppp # Install gdb to make getting backtraces work with DrKonqi - gdb + # Explicitely not included via comps + # See: https://pagure.io/fedora-kde/SIG/issue/295 + - plasma-welcome-fedora # Make sure the following are not pulled in when Recommended by other packages exclude-packages: From ddfd5ad1b3dbc5b9a117b0393f1e92bef60d78da Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Sep 02 2024 16:29:53 +0000 Subject: [PATCH 4/5] Kinoite Mobile: Factor out common parts of the manifest Avoid having to sync the Kinoite & Mobile manifests by factoring out the common parts in the kinoite-common.yaml manifest. --- diff --git a/kinoite-common.yaml b/kinoite-common.yaml index 5aa1479..07bc97d 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -1,10 +1,15 @@ -variables: - variant: "kinoite" - include: - common.yaml - - kinoite-packages.yaml +conditional-include: + - if: variant == "kinoite" + include: + - kinoite-packages.yaml + - if: variant == "kinoite-mobile" + include: + - kinoite-mobile-packages.yaml + +# Default to Kinoite (Desktop). Overriden in the Kinoite Mobile manifest ref: fedora/41/${basearch}/kinoite rojig: name: fedora-kde diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml index 34a33f3..b5f1e6b 100644 --- a/kinoite-mobile.yaml +++ b/kinoite-mobile.yaml @@ -3,51 +3,15 @@ variables: variant: "kinoite-mobile" include: - - common.yaml - - kinoite-mobile-packages.yaml + - kinoite-common.yaml +# Override the default Kinoite ref from the kinoite-common.yaml manifest ref: fedora/41/${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 - # Explicitely not included via comps - # See: https://pagure.io/fedora-kde/SIG/issue/295 - - plasma-welcome-fedora - -# 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 - # Exclude mariadb server tools that bring in Perl - - mariadb-server-utils - # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-41 diff --git a/kinoite-ostree.yaml b/kinoite-ostree.yaml index 8b043db..b97bc8c 100644 --- a/kinoite-ostree.yaml +++ b/kinoite-ostree.yaml @@ -1,5 +1,6 @@ variables: bootable_container: false + variant: "kinoite" include: - kinoite-common.yaml diff --git a/kinoite.yaml b/kinoite.yaml index f45e926..3ae2806 100644 --- a/kinoite.yaml +++ b/kinoite.yaml @@ -1,5 +1,6 @@ variables: bootable_container: true + variant: "kinoite" include: - kinoite-common.yaml From e672c4dd8ce12b7130e3b0a0d05e68dbb2e8f0d0 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Sep 02 2024 16:29:56 +0000 Subject: [PATCH 5/5] Kinoite: Make sure rpm-ostree support is installed Likely a fallout from the dnf5 inclusion: ``` Supplements: ((%{name} and rpm-ostree) unless dnf) ``` --- diff --git a/kinoite-common.yaml b/kinoite-common.yaml index 07bc97d..7544350 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -36,6 +36,8 @@ packages: # Explicitely not included via comps # See: https://pagure.io/fedora-kde/SIG/issue/295 - plasma-welcome-fedora + # Make sure rpm-ostree support is installed + - plasma-discover-rpm-ostree # Make sure the following are not pulled in when Recommended by other packages exclude-packages: