| -rw-r--r-- | VARIANTS.md | 3 | ||||
| -rw-r--r-- | components/desktops/kde.xml | 1 | ||||
| -rw-r--r-- | teams/kde.xml | 11 | ||||
| -rw-r--r-- | tmt/plans/desktop/kde/build-desktop-disk.fmf | 8 | ||||
| -rw-r--r-- | tmt/plans/desktop/kde/build-desktop-live.fmf | 8 |
5 files changed, 4 insertions, 27 deletions
diff --git a/VARIANTS.md b/VARIANTS.md index c1ae75b..2cf470b 100644 --- a/VARIANTS.md +++ b/VARIANTS.md @@ -12,6 +12,5 @@ | | | `Container-Base-Generic-Minimal` | | | | `Container-Base-Generic` | | Toolbox Container | `oci` | `Container-Toolbox` | -| KDE Spin | `iso` | `KDE-Desktop-Live` | -| | `oem` | `KDE-Desktop-Disk` | +| KDE Spin | `iso` | `KDE-Live` | | Workstation Edition | `iso` | `Workstation-Live` | diff --git a/components/desktops/kde.xml b/components/desktops/kde.xml index fa45844..fb4a158 100644 --- a/components/desktops/kde.xml +++ b/components/desktops/kde.xml @@ -17,6 +17,7 @@ <package name="libreoffice-math"/> <package name="fuse"/> <package name="kde-l10n"/> + <package name="plasma-welcome-fedora"/> <ignore name="@admin-tools"/> <ignore name="gnome-disk-utility"/> <ignore name="system-config-printer"/> diff --git a/teams/kde.xml b/teams/kde.xml index 9ef8878..77749d1 100644 --- a/teams/kde.xml +++ b/teams/kde.xml @@ -1,18 +1,11 @@ <image> <profiles> - <profile name="KDE-Desktop-Live" description="KDE Plasma Desktop Spin Live DVD"> + <profile name="KDE-Live" description="KDE Plasma Spin Live DVD"> <requires profile="KDE-Desktop"/> <requires profile="LiveInstall"/> </profile> - <profile name="KDE-Desktop-Disk" description="KDE Plasma Desktop Spin Install Disk"> - <requires profile="BootDiskCore"/> - <requires profile="KDE-Desktop"/> - </profile> </profiles> - <packages type="bootstrap" patternType="plusRecommended" profiles="KDE-Desktop-Disk,KDE-Desktop-Live"> + <packages type="bootstrap" patternType="plusRecommended" profiles="KDE-Live"> <package name="fedora-release-kde"/> </packages> - <packages type="image" patternType="plusRecommended" profiles="KDE-Desktop-Disk,KDE-Desktop-Live"> - <package name="plasma-welcome-fedora"/> - </packages> </image> diff --git a/tmt/plans/desktop/kde/build-desktop-disk.fmf b/tmt/plans/desktop/kde/build-desktop-disk.fmf deleted file mode 100644 index fa3837e..0000000 --- a/tmt/plans/desktop/kde/build-desktop-disk.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build KDE Desktop disk image -discover: - how: fmf -environment: - image_type: oem - image_profile: KDE-Desktop-Disk -execute: - how: tmt diff --git a/tmt/plans/desktop/kde/build-desktop-live.fmf b/tmt/plans/desktop/kde/build-desktop-live.fmf deleted file mode 100644 index bdde89d..0000000 --- a/tmt/plans/desktop/kde/build-desktop-live.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build KDE Desktop live image -discover: - how: fmf -environment: - image_type: iso - image_profile: KDE-Desktop-Live -execute: - how: tmt |