diff options
| -rw-r--r-- | Fedora.kiwi | 1 | ||||
| -rw-r--r-- | components/boot.xml | 1 | ||||
| -rw-r--r-- | components/common.xml | 8 | ||||
| -rw-r--r-- | components/desktops/common.xml | 5 | ||||
| -rw-r--r-- | components/liveinstall.xml | 1 | ||||
| -rw-r--r-- | teams/server.xml | 1 |
6 files changed, 15 insertions, 2 deletions
diff --git a/Fedora.kiwi b/Fedora.kiwi index 5e9b832..ab31548 100644 --- a/Fedora.kiwi +++ b/Fedora.kiwi @@ -15,6 +15,7 @@ <release-version>rawhide</release-version> </preferences> <include from="this://./repositories/core.xml"/> + <include from="this://./components/common.xml"/> <include from="this://./components/boot.xml"/> <include from="this://./components/desktops/common.xml"/> <include from="this://./components/desktops/gnome.xml"/> diff --git a/components/boot.xml b/components/boot.xml index 2427eb7..ee27d4f 100644 --- a/components/boot.xml +++ b/components/boot.xml @@ -3,6 +3,7 @@ <profile name="BootCore" description="Boot core packages"/> <profile name="BootCoreUKI" description="Boot core packages for UKI"/> <profile name="BootDiskCore" description="Boot disk core configuration"> + <requires profile="BaseCommon"/> <requires profile="BootCore"/> </profile> </profiles> diff --git a/components/common.xml b/components/common.xml new file mode 100644 index 0000000..72bfb41 --- /dev/null +++ b/components/common.xml @@ -0,0 +1,8 @@ +<image> + <profiles> + <profile name="BaseCommon" description="Base common packages"/> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="BaseCommon"> + <namedCollection name="standard"/> + </packages> +</image> diff --git a/components/desktops/common.xml b/components/desktops/common.xml index 398666d..4f31c0d 100644 --- a/components/desktops/common.xml +++ b/components/desktops/common.xml @@ -1,6 +1,8 @@ <image> <profiles> - <profile name="DesktopCommon" description="Common desktop packages"/> + <profile name="DesktopCommon" description="Common desktop packages"> + <requires profile="BaseCommon"/> + </profile> </profiles> <packages type="image" patternType="plusRecommended" profiles="DesktopCommon"> <namedCollection name="fonts"/> @@ -9,7 +11,6 @@ <namedCollection name="hardware-support"/> <namedCollection name="printing"/> <namedCollection name="guest-desktop-agents"/> - <namedCollection name="standard"/> <package name="mediawriter"/> <ignore name="gfs2-utils"/> <ignore name="reiserfs-utils"/> diff --git a/components/liveinstall.xml b/components/liveinstall.xml index 12891ff..a53b36b 100644 --- a/components/liveinstall.xml +++ b/components/liveinstall.xml @@ -1,6 +1,7 @@ <image> <profiles> <profile name="LiveInstall" description="Live Install ISO"> + <requires profile="BaseCommon"/> <requires profile="BootCore"/> </profile> </profiles> diff --git a/teams/server.xml b/teams/server.xml index 70820e8..cc58b37 100644 --- a/teams/server.xml +++ b/teams/server.xml @@ -1,6 +1,7 @@ <image> <profiles> <profile name="ServerCore" description="Server Edition core packages"> + <requires profile="BaseCommon"/> <requires profile="BootCore"/> </profile> <profile name="ServerVMDisk" description="Server Edition VM disk configuration"> |