diff options
30 files changed, 390 insertions, 239 deletions
diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml deleted file mode 100644 index dee059b..0000000 --- a/components/desktop-environments.xml +++ /dev/null @@ -1,186 +0,0 @@ -<image> - <profiles> - <profile name="DesktopCommon" description="Common desktop packages"/> - <profile name="GNOME-Desktop" description="GNOME Desktop"> - <requires profile="DesktopCommon"/> - </profile> - <profile name="KDE-Desktop" description="KDE Plasma Desktop"> - <requires profile="DesktopCommon"/> - </profile> - </profiles> - <packages type="image" patternType="plusRecommended" profiles="DesktopCommon"> - <namedCollection name="internet-browser"/> - <namedCollection name="fonts"/> - <namedCollection name="multimedia"/> - <namedCollection name="networkmanager-submodules"/> - <namedCollection name="office-suite"/> - <namedCollection name="hardware-support"/> - <namedCollection name="print-client"/> - <namedCollection name="guest-desktop-agents"/> - <namedCollection name="standard"/> - <ignore name="gfs2-utils"/> - <ignore name="reiserfs-utils"/> - </packages> - <packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop"> - <!-- install env-group to resolve RhBug:1891500 --> - <namedCollection name="workstation-product-environment"/> - <package name="fedora-release-workstation"/> - </packages> - <packages type="image" patternType="plusRecommended" profiles="KDE-Desktop"> - <!-- install env-group to resolve RhBug:1891500 --> - <namedCollection name="kde-desktop-environment"/> - <namedCollection name="kde-apps"/> - <namedCollection name="kde-media"/> - <namedCollection name="kde-spin-initial-setup"/> - <package name="fuse"/> - <package name="fedora-release-kde"/> - <package name="kde-l10n"/> - <ignore name="@admin-tools"/> - <ignore name="gnome-disk-utility"/> - <ignore name="system-config-printer"/> - </packages> - <packages type="image" patternType="plusRecommended" profiles="Budgie-Desktop"> - <!-- install env-group to resolve RhBug:1891500 --> - <namedCollection name="budgie-desktop-environment"/> - <namedCollection name="budgie-desktop-apps"/> - <namedCollection name="libreoffice"/> - <package name="fedora-release-budgie"/> - <package name="libreoffice-draw"/> - <package name="libreoffice-math"/> - <package name="thunderbird"/> - </packages> - <packages type="image" patternType="plusRecommended" profiles="Cinnamon-Desktop"> - <!-- install env-group to resolve RhBug:1891500 --> - <namedCollection name="cinnamon-desktop-environment"/> - <namedCollection name="libreoffice"/> - <package name="fedora-release-cinnamon"/> - <package name="rhythmbox"/> - <package name="f39-backgrounds-extras-gnome"/> <!-- extra backgrounds --> - </packages> - <packages type="image" patternType="plusRecommended" profiles="i3-Desktop"> - <!-- install env-group to resolve RhBug:1891500 --> - <namedCollection name="i3-desktop-environment"/> - <namedCollection name="admin-tools"/> - <package name="dex-autostart"/> - <package name="fedora-release-i3"/> - <package name="feh"/> - <package name="gnome-keyring-pam"/> <!-- unlock default keyring, FIXME: put in comps --> - <package name="system-config-printer"/> <!-- FIXME: put in comps --> - <package name="thunar"/> <!-- FIXME: put in comps --> - <package name="xfce-polkit"/> <!-- FIXME: put in comps --> - <package name="wget"/> <!-- FIXME: put in comps --> - </packages> - <packages type="image" patternType="plusRecommended" profiles="LXDE-Desktop"> - <!-- install env-group to resolve RhBug:1891500 --> - <namedCollection name="lxde-desktop-environment"/> - <namedCollection name="lxde-apps"/> - <namedCollection name="lxde-media"/> - <namedCollection name="lxde-office"/> - <package name="fedora-release-lxde"/> - <package name="lxpolkit"/> <!-- Ensure LXDE polkit agent is used --> - <package name="notification-daemon"/> <!-- Ensure correct notification daemon is used --> - <ignore name="PackageKit*"/> <!-- we use dnfdragora instead --> - <ignore name="fprintd-pam"/> <!-- pam-fprint causes segfaults in LXDM --> - </packages> - <packages type="image" patternType="plusRecommended" profiles="LXQt-Desktop"> - <!-- install env-group to resolve RhBug:1891500 --> - <namedCollection name="lxqt-desktop-environment"/> - <namedCollection name="lxqt-apps"/> - <namedCollection name="lxqt-media"/> - <namedCollection name="lxqt-l10n"/> - <package name="fedora-release-lxqt"/> - <package name="lximage-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group --> - <package name="obconf-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group --> - <package name="pavucontrol-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group --> - <package name="enki"/> <!-- FIXME: put in comps --> - <package name="udisks2"/> <!-- Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132 --> - <!-- remove unneeded stuff for a lightweight system --> - <package name="wqy-microhei-fonts"/> <!-- compact CJK font --> - <ignore name="naver-nanum-gothic-fonts"/> <!-- Korean: replaced by above --> - <ignore name="vlgothic-fonts"/> <!-- Japanese: replaced by above --> - <ignore name="adobe-source-han-sans-cn-fonts"/> <!-- Simplified Chinese: replaced by above --> - <ignore name="adobe-source-han-sans-tw-fonts"/> <!-- Traditional Chinese: replaced by above --> - <ignore name="pt-sans-fonts"/> <!-- Cyrillic (already supported by DejaVu) --> - <ignore name="@input-methods"/> - <ignore name="@admin-tools"/> - <ignore name="scim*"/> - <ignore name="m17n*"/> - <ignore name="iok"/> - </packages> - <packages type="image" patternType="plusRecommended" profiles="MATE_Compiz-Desktop"> - <!-- install env-group to resolve RhBug:1891500 --> - <namedCollection name="mate-desktop-environment"/> - <namedCollection name="compiz"/> - <namedCollection name="libreoffice"/> - <package name="fedora-release-matecompiz"/> - <package name="earlyoom"/> <!-- replaces systemd-oomd-defaults --> - <ignore name="systemd-oomd-defaults"/> <!-- replaced by earlyoom, see rhbz#2068699 and rhbz#1933494 --> - <ignore name="audacious"/> <!-- breaks the desktop --> - <!-- drop things for size --> - <ignore name="@3d-printing"/> - <ignore name="@admin-tools"/> - <ignore name="@mate-applications"/> - <ignore name="brasero"/> - <ignore name="fedora-icon-theme"/> - <ignore name="gnome-icon-theme"/> - <ignore name="gnome-icon-theme-symbolic"/> - <ignore name="gnome-logs"/> - <ignore name="gnome-software"/> - <ignore name="gnome-user-docs"/> - <ignore name="evolution-help"/> - <ignore name="telnet"/> <!-- Legacy cmdline thing we don't want --> - </packages> - <packages type="image" patternType="plusRecommended" profiles="Phosh-Desktop"> - <!-- install env-group to resolve RhBug:1891500 --> - <namedCollection name="phosh-desktop-environment"/> - <package name="fedora-release-phosh"/> - </packages> - <packages type="image" patternType="plusRecommended" profiles="SoaS-Desktop"> - <!-- install env-group to resolve RhBug:1891500 --> - <namedCollection name="sugar-desktop-environment"/> - <package name="fedora-release-soas"/> - <package name="dejavu-sans-fonts"/> - <package name="dejavu-sans-mono-fonts"/> - <package name="madan-fonts"/> - <package name="aajohan-comfortaa-fonts"/> - <package name="sil-abyssinica-fonts"/> - <package name="vlgothic-fonts"/> - <package name="rp-pppoe"/> <!-- See http://bugs.sugarlabs.org/ticket/1951 --> - <package name="livecd-tools"/> <!-- See http://bugs.sugarlabs.org/ticket/74 --> - <package name="xfce-polkit"/> - <ignore name="@gnome-desktop"/> - <ignore name="firefox"/> - <ignore name="ibus*"/> - <ignore name="openbox"/> - <ignore name="PackageKit"/> - <!-- Drop these to allow the Sugar boot screen --> - <ignore name="plymouth-system-theme"/> - <ignore name="plymouth-theme-charge"/> - </packages> - <packages type="image" patternType="plusRecommended" profiles="Sway-Desktop"> - <!-- install env-group to resolve RhBug:1891500 --> - <namedCollection name="sway-desktop-environment"/> - <namedCollection name="firefox"/> - <namedCollection name="swaywm-extended"/> - <package name="fedora-release-sway"/> - </packages> - <packages type="image" patternType="plusRecommended" profiles="Xfce-Desktop"> - <!-- install env-group to resolve RhBug:1891500 --> - <namedCollection name="xfce-desktop-environment"/> - <namedCollection name="xfce-apps"/> - <namedCollection name="xfce-extra-plugins"/> - <namedCollection name="xfce-media"/> - <namedCollection name="xfce-office"/> - <package name="fedora-release-xfce"/> - <package name="wget"/> - <package name="system-config-printer"/> - <!-- Save some space --> - <ignore name="autofs"/> - <ignore name="acpid"/> - <ignore name="gimp-help"/> - <ignore name="desktop-backgrounds-basic"/> - <ignore name="aspell-*"/> <!-- dictionaries are big --> - <ignore name="xfce4-sensors-plugin"/> - <ignore name="xfce4-eyes-plugin"/> - </packages> -</image> diff --git a/components/desktops/budgie.xml b/components/desktops/budgie.xml new file mode 100644 index 0000000..42ebab7 --- /dev/null +++ b/components/desktops/budgie.xml @@ -0,0 +1,17 @@ +<image> + <profiles> + <profile name="Budgie-Desktop" description="Budgie Desktop"> + <requires profile="DesktopCommon"/> + </profile> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="Budgie-Desktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="budgie-desktop-environment"/> + <namedCollection name="budgie-desktop-apps"/> + <namedCollection name="libreoffice"/> + <package name="fedora-release-budgie"/> + <package name="libreoffice-draw"/> + <package name="libreoffice-math"/> + <package name="thunderbird"/> + </packages> +</image> diff --git a/components/desktops/cinnamon.xml b/components/desktops/cinnamon.xml new file mode 100644 index 0000000..61fc852 --- /dev/null +++ b/components/desktops/cinnamon.xml @@ -0,0 +1,16 @@ +<image> + <profiles> + <profile name="DesktopCommon" description="Common desktop packages"/> + <profile name="Cinnamon-Desktop" description="Cinnamon Desktop"> + <requires profile="DesktopCommon"/> + </profile> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="Cinnamon-Desktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="cinnamon-desktop-environment"/> + <namedCollection name="libreoffice"/> + <package name="fedora-release-cinnamon"/> + <package name="rhythmbox"/> + <package name="f39-backgrounds-extras-gnome"/> <!-- extra backgrounds --> + </packages> +</image> diff --git a/components/desktops/common.xml b/components/desktops/common.xml new file mode 100644 index 0000000..08d6956 --- /dev/null +++ b/components/desktops/common.xml @@ -0,0 +1,18 @@ +<image> + <profiles> + <profile name="DesktopCommon" description="Common desktop packages"/> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="DesktopCommon"> + <namedCollection name="internet-browser"/> + <namedCollection name="fonts"/> + <namedCollection name="multimedia"/> + <namedCollection name="networkmanager-submodules"/> + <namedCollection name="office-suite"/> + <namedCollection name="hardware-support"/> + <namedCollection name="print-client"/> + <namedCollection name="guest-desktop-agents"/> + <namedCollection name="standard"/> + <ignore name="gfs2-utils"/> + <ignore name="reiserfs-utils"/> + </packages> +</image> diff --git a/components/desktops/gnome.xml b/components/desktops/gnome.xml new file mode 100644 index 0000000..f0836ed --- /dev/null +++ b/components/desktops/gnome.xml @@ -0,0 +1,13 @@ +<image> + <profiles> + <profile name="DesktopCommon" description="Common desktop packages"/> + <profile name="GNOME-Desktop" description="GNOME Desktop"> + <requires profile="DesktopCommon"/> + </profile> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="workstation-product-environment"/> + <package name="fedora-release-workstation"/> + </packages> +</image> diff --git a/components/desktops/i3.xml b/components/desktops/i3.xml new file mode 100644 index 0000000..ae2464d --- /dev/null +++ b/components/desktops/i3.xml @@ -0,0 +1,21 @@ +<image> + <profiles> + <profile name="DesktopCommon" description="Common desktop packages"/> + <profile name="i3-Desktop" description="i3 Desktop"> + <requires profile="DesktopCommon"/> + </profile> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="i3-Desktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="i3-desktop-environment"/> + <namedCollection name="admin-tools"/> + <package name="dex-autostart"/> + <package name="fedora-release-i3"/> + <package name="feh"/> + <package name="gnome-keyring-pam"/> <!-- unlock default keyring, FIXME: put in comps --> + <package name="system-config-printer"/> <!-- FIXME: put in comps --> + <package name="thunar"/> <!-- FIXME: put in comps --> + <package name="xfce-polkit"/> <!-- FIXME: put in comps --> + <package name="wget"/> <!-- FIXME: put in comps --> + </packages> +</image> diff --git a/components/desktops/kde.xml b/components/desktops/kde.xml new file mode 100644 index 0000000..df379ff --- /dev/null +++ b/components/desktops/kde.xml @@ -0,0 +1,21 @@ +<image> + <profiles> + <profile name="DesktopCommon" description="Common desktop packages"/> + <profile name="KDE-Desktop" description="KDE Plasma Desktop"> + <requires profile="DesktopCommon"/> + </profile> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="KDE-Desktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="kde-desktop-environment"/> + <namedCollection name="kde-apps"/> + <namedCollection name="kde-media"/> + <namedCollection name="kde-spin-initial-setup"/> + <package name="fuse"/> + <package name="fedora-release-kde"/> + <package name="kde-l10n"/> + <ignore name="@admin-tools"/> + <ignore name="gnome-disk-utility"/> + <ignore name="system-config-printer"/> + </packages> +</image> diff --git a/components/desktops/lxde.xml b/components/desktops/lxde.xml new file mode 100644 index 0000000..dc527ae --- /dev/null +++ b/components/desktops/lxde.xml @@ -0,0 +1,20 @@ +<image> + <profiles> + <profile name="DesktopCommon" description="Common desktop packages"/> + <profile name="LXDE-Desktop" description="LXDE Desktop"> + <requires profile="DesktopCommon"/> + </profile> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="LXDE-Desktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="lxde-desktop-environment"/> + <namedCollection name="lxde-apps"/> + <namedCollection name="lxde-media"/> + <namedCollection name="lxde-office"/> + <package name="fedora-release-lxde"/> + <package name="lxpolkit"/> <!-- Ensure LXDE polkit agent is used --> + <package name="notification-daemon"/> <!-- Ensure correct notification daemon is used --> + <ignore name="PackageKit*"/> <!-- we use dnfdragora instead --> + <ignore name="fprintd-pam"/> <!-- pam-fprint causes segfaults in LXDM --> + </packages> +</image> diff --git a/components/desktops/lxqt.xml b/components/desktops/lxqt.xml new file mode 100644 index 0000000..6cf7462 --- /dev/null +++ b/components/desktops/lxqt.xml @@ -0,0 +1,33 @@ +<image> + <profiles> + <profile name="DesktopCommon" description="Common desktop packages"/> + <profile name="LXQt-Desktop" description="LXQt Desktop"> + <requires profile="DesktopCommon"/> + </profile> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="LXQt-Desktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="lxqt-desktop-environment"/> + <namedCollection name="lxqt-apps"/> + <namedCollection name="lxqt-media"/> + <namedCollection name="lxqt-l10n"/> + <package name="fedora-release-lxqt"/> + <package name="lximage-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group --> + <package name="obconf-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group --> + <package name="pavucontrol-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group --> + <package name="enki"/> <!-- FIXME: put in comps --> + <package name="udisks2"/> <!-- Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132 --> + <!-- remove unneeded stuff for a lightweight system --> + <package name="wqy-microhei-fonts"/> <!-- compact CJK font --> + <ignore name="naver-nanum-gothic-fonts"/> <!-- Korean: replaced by above --> + <ignore name="vlgothic-fonts"/> <!-- Japanese: replaced by above --> + <ignore name="adobe-source-han-sans-cn-fonts"/> <!-- Simplified Chinese: replaced by above --> + <ignore name="adobe-source-han-sans-tw-fonts"/> <!-- Traditional Chinese: replaced by above --> + <ignore name="pt-sans-fonts"/> <!-- Cyrillic (already supported by DejaVu) --> + <ignore name="@input-methods"/> + <ignore name="@admin-tools"/> + <ignore name="scim*"/> + <ignore name="m17n*"/> + <ignore name="iok"/> + </packages> +</image> diff --git a/components/desktops/mate-compiz.xml b/components/desktops/mate-compiz.xml new file mode 100644 index 0000000..c5c9a75 --- /dev/null +++ b/components/desktops/mate-compiz.xml @@ -0,0 +1,31 @@ +<image> + <profiles> + <profile name="DesktopCommon" description="Common desktop packages"/> + <profile name="MATE_Compiz-Desktop" description="MATE_Compiz Desktop"> + <requires profile="DesktopCommon"/> + </profile> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="MATE_Compiz-Desktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="mate-desktop-environment"/> + <namedCollection name="compiz"/> + <namedCollection name="libreoffice"/> + <package name="fedora-release-matecompiz"/> + <package name="earlyoom"/> <!-- replaces systemd-oomd-defaults --> + <ignore name="systemd-oomd-defaults"/> <!-- replaced by earlyoom, see rhbz#2068699 and rhbz#1933494 --> + <ignore name="audacious"/> <!-- breaks the desktop --> + <!-- drop things for size --> + <ignore name="@3d-printing"/> + <ignore name="@admin-tools"/> + <ignore name="@mate-applications"/> + <ignore name="brasero"/> + <ignore name="fedora-icon-theme"/> + <ignore name="gnome-icon-theme"/> + <ignore name="gnome-icon-theme-symbolic"/> + <ignore name="gnome-logs"/> + <ignore name="gnome-software"/> + <ignore name="gnome-user-docs"/> + <ignore name="evolution-help"/> + <ignore name="telnet"/> <!-- Legacy cmdline thing we don't want --> + </packages> +</image> diff --git a/components/desktops/phosh.xml b/components/desktops/phosh.xml new file mode 100644 index 0000000..1d3c7a5 --- /dev/null +++ b/components/desktops/phosh.xml @@ -0,0 +1,13 @@ +<image> + <profiles> + <profile name="DesktopCommon" description="Common desktop packages"/> + <profile name="Phosh-Desktop" description="Phosh Desktop"> + <requires profile="DesktopCommon"/> + </profile> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="Phosh-Desktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="phosh-desktop-environment"/> + <package name="fedora-release-phosh"/> + </packages> +</image> diff --git a/components/desktops/soas.xml b/components/desktops/soas.xml new file mode 100644 index 0000000..b4d6763 --- /dev/null +++ b/components/desktops/soas.xml @@ -0,0 +1,30 @@ +<image> + <profiles> + <profile name="DesktopCommon" description="Common desktop packages"/> + <profile name="SoaS-Desktop" description="SoaS Desktop"> + <requires profile="DesktopCommon"/> + </profile> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="SoaS-Desktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="sugar-desktop-environment"/> + <package name="fedora-release-soas"/> + <package name="dejavu-sans-fonts"/> + <package name="dejavu-sans-mono-fonts"/> + <package name="madan-fonts"/> + <package name="aajohan-comfortaa-fonts"/> + <package name="sil-abyssinica-fonts"/> + <package name="vlgothic-fonts"/> + <package name="rp-pppoe"/> <!-- See http://bugs.sugarlabs.org/ticket/1951 --> + <package name="livecd-tools"/> <!-- See http://bugs.sugarlabs.org/ticket/74 --> + <package name="xfce-polkit"/> + <ignore name="@gnome-desktop"/> + <ignore name="firefox"/> + <ignore name="ibus*"/> + <ignore name="openbox"/> + <ignore name="PackageKit"/> + <!-- Drop these to allow the Sugar boot screen --> + <ignore name="plymouth-system-theme"/> + <ignore name="plymouth-theme-charge"/> + </packages> +</image> diff --git a/components/desktops/sway.xml b/components/desktops/sway.xml new file mode 100644 index 0000000..64b5084 --- /dev/null +++ b/components/desktops/sway.xml @@ -0,0 +1,15 @@ +<image> + <profiles> + <profile name="DesktopCommon" description="Common desktop packages"/> + <profile name="Sway-Desktop" description="Sway Desktop"> + <requires profile="DesktopCommon"/> + </profile> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="Sway-Desktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="sway-desktop-environment"/> + <namedCollection name="firefox"/> + <namedCollection name="swaywm-extended"/> + <package name="fedora-release-sway"/> + </packages> +</image> diff --git a/components/desktops/xfce.xml b/components/desktops/xfce.xml new file mode 100644 index 0000000..a7e0229 --- /dev/null +++ b/components/desktops/xfce.xml @@ -0,0 +1,27 @@ +<image> + <profiles> + <profile name="DesktopCommon" description="Common desktop packages"/> + <profile name="Xfce-Desktop" description="Xfce Desktop"> + <requires profile="DesktopCommon"/> + </profile> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="Xfce-Desktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="xfce-desktop-environment"/> + <namedCollection name="xfce-apps"/> + <namedCollection name="xfce-extra-plugins"/> + <namedCollection name="xfce-media"/> + <namedCollection name="xfce-office"/> + <package name="fedora-release-xfce"/> + <package name="wget"/> + <package name="system-config-printer"/> + <!-- Save some space --> + <ignore name="autofs"/> + <ignore name="acpid"/> + <ignore name="gimp-help"/> + <ignore name="desktop-backgrounds-basic"/> + <ignore name="aspell-*"/> <!-- dictionaries are big --> + <ignore name="xfce4-sensors-plugin"/> + <ignore name="xfce4-eyes-plugin"/> + </packages> +</image> @@ -16,13 +16,35 @@ </preferences> <include from="this://./repositories/core.xml"/> <include from="this://./components/boot.xml"/> - <include from="this://./components/desktop-environments.xml"/> + <include from="this://./components/desktops/common.xml"/> + <include from="this://./components/desktops/gnome.xml"/> + <include from="this://./components/desktops/kde.xml"/> + <include from="this://./components/desktops/xfce.xml"/> + <include from="this://./components/desktops/cinnamon.xml"/> + <include from="this://./components/desktops/mate-compiz.xml"/> + <include from="this://./components/desktops/i3.xml"/> + <include from="this://./components/desktops/lxqt.xml"/> + <include from="this://./components/desktops/lxde.xml"/> + <include from="this://./components/desktops/soas.xml"/> + <include from="this://./components/desktops/phosh.xml"/> + <include from="this://./components/desktops/sway.xml"/> + <include from="this://./components/desktops/budgie.xml"/> <include from="this://./components/liveinstall.xml"/> <include from="this://./components/users.xml"/> - <include from="this://./platforms/cloud.xml"/> - <include from="this://./platforms/container.xml"/> - <include from="this://./platforms/vagrant.xml"/> - <include from="this://./platforms/workstation.xml"/> + <include from="this://./teams/cloud/cloud.xml"/> + <include from="this://./teams/cloud/container.xml"/> + <include from="this://./teams/cloud/vagrant.xml"/> + <include from="this://./teams/workstation.xml"/> + <include from="this://./teams/kde.xml"/> + <include from="this://./teams/xfce.xml"/> + <include from="this://./teams/cinnamon.xml"/> + <include from="this://./teams/mate-compiz.xml"/> + <include from="this://./teams/i3.xml"/> + <include from="this://./teams/lxqt.xml"/> + <include from="this://./teams/lxde.xml"/> + <include from="this://./teams/soas.xml"/> + <include from="this://./teams/sway.xml"/> + <include from="this://./teams/budgie.xml"/> <packages type="bootstrap"> <package name="basesystem"/> <package name="filesystem"/> diff --git a/platforms/workstation.xml b/platforms/workstation.xml deleted file mode 100644 index 5c5f43d..0000000 --- a/platforms/workstation.xml +++ /dev/null @@ -1,48 +0,0 @@ -<image> - <profiles> - <profile name="Workstation-Live" description="Workstation Edition Live DVD"> - <requires profile="GNOME-Desktop"/> - <requires profile="LiveInstall"/> - </profile> - <profile name="KDE-Live" description="KDE Plasma Spin Live DVD"> - <requires profile="KDE-Desktop"/> - <requires profile="LiveInstall"/> - </profile> - <profile name="Budgie-Live" description="Budgie Spin Live DVD"> - <requires profile="Budgie-Desktop"/> - <requires profile="LiveInstall"/> - </profile> - <profile name="Cinnamon-Live" description="Cinnamon Spin Live DVD"> - <requires profile="Cinnamon-Desktop"/> - <requires profile="LiveInstall"/> - </profile> - <profile name="i3-Live" description="i3 Spin Live DVD"> - <requires profile="i3-Desktop"/> - <requires profile="LiveInstall"/> - </profile> - <profile name="LXDE-Live" description="LXDE Spin Live DVD"> - <requires profile="LXDE-Desktop"/> - <requires profile="LiveInstall"/> - </profile> - <profile name="LXQt-Live" description="LXQt Spin Live DVD"> - <requires profile="LXQt-Desktop"/> - <requires profile="LiveInstall"/> - </profile> - <profile name="MATE_Compiz-Live" description="MATE-Compiz Spin Live DVD"> - <requires profile="MATE_Compiz-Desktop"/> - <requires profile="LiveInstall"/> - </profile> - <profile name="SoaS-Live" description="Sugar on a Stick Live DVD"> - <requires profile="SoaS-Desktop"/> - <requires profile="LiveInstall"/> - </profile> - <profile name="Sway-Live" description="Sway Spin Live DVD"> - <requires profile="Sway-Desktop"/> - <requires profile="LiveInstall"/> - </profile> - <profile name="Xfce-Live" description="Xfce Spin Live DVD"> - <requires profile="Xfce-Desktop"/> - <requires profile="LiveInstall"/> - </profile> - </profiles> -</image> diff --git a/teams/budgie.xml b/teams/budgie.xml new file mode 100644 index 0000000..665ca4b --- /dev/null +++ b/teams/budgie.xml @@ -0,0 +1,8 @@ +<image> + <profiles> + <profile name="Budgie-Live" description="Budgie Spin Live DVD"> + <requires profile="Budgie-Desktop"/> + <requires profile="LiveInstall"/> + </profile> + </profiles> +</image> diff --git a/teams/cinnamon.xml b/teams/cinnamon.xml new file mode 100644 index 0000000..18c5cd2 --- /dev/null +++ b/teams/cinnamon.xml @@ -0,0 +1,8 @@ +<image> + <profiles> + <profile name="Cinnamon-Live" description="Cinnamon Spin Live DVD"> + <requires profile="Cinnamon-Desktop"/> + <requires profile="LiveInstall"/> + </profile> + </profiles> +</image> diff --git a/platforms/cloud.xml b/teams/cloud/cloud.xml index 32534f4..32534f4 100644 --- a/platforms/cloud.xml +++ b/teams/cloud/cloud.xml diff --git a/platforms/container.xml b/teams/cloud/container.xml index 2291a51..2291a51 100644 --- a/platforms/container.xml +++ b/teams/cloud/container.xml diff --git a/platforms/vagrant.xml b/teams/cloud/vagrant.xml index 9c784ff..9c784ff 100644 --- a/platforms/vagrant.xml +++ b/teams/cloud/vagrant.xml diff --git a/teams/i3.xml b/teams/i3.xml new file mode 100644 index 0000000..6a21728 --- /dev/null +++ b/teams/i3.xml @@ -0,0 +1,8 @@ +<image> + <profiles> + <profile name="i3-Live" description="i3 Spin Live DVD"> + <requires profile="i3-Desktop"/> + <requires profile="LiveInstall"/> + </profile> + </profiles> +</image> diff --git a/teams/kde.xml b/teams/kde.xml new file mode 100644 index 0000000..114f269 --- /dev/null +++ b/teams/kde.xml @@ -0,0 +1,8 @@ +<image> + <profiles> + <profile name="KDE-Live" description="KDE Plasma Spin Live DVD"> + <requires profile="KDE-Desktop"/> + <requires profile="LiveInstall"/> + </profile> + </profiles> +</image> diff --git a/teams/lxde.xml b/teams/lxde.xml new file mode 100644 index 0000000..f77f8ea --- /dev/null +++ b/teams/lxde.xml @@ -0,0 +1,8 @@ +<image> + <profiles> + <profile name="LXDE-Live" description="LXDE Spin Live DVD"> + <requires profile="LXDE-Desktop"/> + <requires profile="LiveInstall"/> + </profile> + </profiles> +</image> diff --git a/teams/lxqt.xml b/teams/lxqt.xml new file mode 100644 index 0000000..ec974ab --- /dev/null +++ b/teams/lxqt.xml @@ -0,0 +1,8 @@ +<image> + <profiles> + <profile name="LXQt-Live" description="LXQt Spin Live DVD"> + <requires profile="LXQt-Desktop"/> + <requires profile="LiveInstall"/> + </profile> + </profiles> +</image> diff --git a/teams/mate-compiz.xml b/teams/mate-compiz.xml new file mode 100644 index 0000000..d5caa6a --- /dev/null +++ b/teams/mate-compiz.xml @@ -0,0 +1,8 @@ +<image> + <profiles> + <profile name="MATE_Compiz-Live" description="MATE-Compiz Spin Live DVD"> + <requires profile="MATE_Compiz-Desktop"/> + <requires profile="LiveInstall"/> + </profile> + </profiles> +</image> diff --git a/teams/soas.xml b/teams/soas.xml new file mode 100644 index 0000000..48878e4 --- /dev/null +++ b/teams/soas.xml @@ -0,0 +1,8 @@ +<image> + <profiles> + <profile name="SoaS-Live" description="Sugar on a Stick Live DVD"> + <requires profile="SoaS-Desktop"/> + <requires profile="LiveInstall"/> + </profile> + </profiles> +</image> diff --git a/teams/sway.xml b/teams/sway.xml new file mode 100644 index 0000000..9e9603d --- /dev/null +++ b/teams/sway.xml @@ -0,0 +1,8 @@ +<image> + <profiles> + <profile name="Sway-Live" description="Sway Spin Live DVD"> + <requires profile="Sway-Desktop"/> + <requires profile="LiveInstall"/> + </profile> + </profiles> +</image> diff --git a/teams/workstation.xml b/teams/workstation.xml new file mode 100644 index 0000000..ad362cd --- /dev/null +++ b/teams/workstation.xml @@ -0,0 +1,8 @@ +<image> + <profiles> + <profile name="Workstation-Live" description="Workstation Edition Live DVD"> + <requires profile="GNOME-Desktop"/> + <requires profile="LiveInstall"/> + </profile> + </profiles> +</image> diff --git a/teams/xfce.xml b/teams/xfce.xml new file mode 100644 index 0000000..c563bbc --- /dev/null +++ b/teams/xfce.xml @@ -0,0 +1,8 @@ +<image> + <profiles> + <profile name="Xfce-Live" description="Xfce Spin Live DVD"> + <requires profile="Xfce-Desktop"/> + <requires profile="LiveInstall"/> + </profile> + </profiles> +</image> |