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.
This commit is contained in:
Timothée Ravier 2024-09-02 18:00:45 +02:00
parent 223669cfac
commit fd45b5ecff
4 changed files with 13 additions and 42 deletions

View file

@ -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/rawhide/${basearch}/kinoite
rojig:
name: fedora-kde

View file

@ -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/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
# 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-rawhide

View file

@ -1,5 +1,6 @@
variables:
bootable_container: false
variant: "kinoite"
include:
- kinoite-common.yaml

View file

@ -1,5 +1,6 @@
variables:
bootable_container: true
variant: "kinoite"
include:
- kinoite-common.yaml