diff options
| author |  Neal Gompa <ngompa@fedoraproject.org>
| 2025-02-20 13:46:02 -0500 |
|---|---|---|
| committer | Neal Gompa <ngompa@fedoraproject.org>
| 2025-02-20 14:15:26 -0500 |
| commit | ada197be816585a10d11a895200d7684f1ca5450 (patch) | |
| tree | 7fd80d96ad3116c2716e6bfa1e42961960406bd1 /components | |
| parent | 2cb33874d1b568ea0ba102529af6da13d002dbe2 (diff) | |
| download | kiwi-descriptions-ada197be816585a10d11a895200d7684f1ca5450.tar.gz kiwi-descriptions-ada197be816585a10d11a895200d7684f1ca5450.zip | |
components, teams/server: Use a common profile for hardware support
It is hard to ensure that hardware support packages are pulled in
universally when it's splintered across different variant profiles.
To fix this and ensure Server benefits from this, unify everything
into a common profile and make everything require it.
Diffstat (limited to 'components')
| -rw-r--r-- | components/boot.xml | 2 | ||||
| -rw-r--r-- | components/common.xml | 5 | ||||
| -rw-r--r-- | components/desktops/common.xml | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/components/boot.xml b/components/boot.xml index d801c01..4b7db8e 100644 --- a/components/boot.xml +++ b/components/boot.xml @@ -4,6 +4,7 @@ <profile name="BootCoreUKI" description="Boot core packages for UKI"/> <profile name="BootDiskCore" description="Boot disk core configuration"> <requires profile="BaseCommon"/> + <requires profile="HardwareCommon"/> <requires profile="BootCore"/> </profile> </profiles> @@ -118,7 +119,6 @@ </packages> <packages type="image" patternType="plusRecommended" profiles="BootDiskCore"> <package name="arm-image-installer" arch="aarch64"/> - <package name="bcm283x-firmware" arch="aarch64"/> <package name="glibc-all-langpacks"/> <package name="kernel"/> <package name="kernel-modules"/> diff --git a/components/common.xml b/components/common.xml index 64316fa..dc1f34c 100644 --- a/components/common.xml +++ b/components/common.xml @@ -1,9 +1,14 @@ <image> <profiles> <profile name="BaseCommon" description="Base common packages"/> + <profile name="HardwareCommon" description="Base common packages for hardware support"/> </profiles> <packages type="image" patternType="plusRecommended" profiles="BaseCommon"> <namedCollection name="standard"/> <ignore name="qemu-user-static"/> <!-- Saves ~100MB --> </packages> + <packages type="image" patternType="plusRecommended" profiles="HardwareCommon"> + <namedCollection name="hardware-support"/> + <package name="bcm283x-firmware" arch="aarch64"/> + </packages> </image> diff --git a/components/desktops/common.xml b/components/desktops/common.xml index 4f31c0d..fed17c4 100644 --- a/components/desktops/common.xml +++ b/components/desktops/common.xml @@ -2,13 +2,13 @@ <profiles> <profile name="DesktopCommon" description="Common desktop packages"> <requires profile="BaseCommon"/> + <requires profile="HardwareCommon"/> </profile> </profiles> <packages type="image" patternType="plusRecommended" profiles="DesktopCommon"> <namedCollection name="fonts"/> <namedCollection name="multimedia"/> <namedCollection name="networkmanager-submodules"/> - <namedCollection name="hardware-support"/> <namedCollection name="printing"/> <namedCollection name="guest-desktop-agents"/> <package name="mediawriter"/> |