aboutsummaryrefslogtreecommitdiff
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
-rw-r--r--Fedora.kiwi1
-rw-r--r--VARIANTS.md2
-rw-r--r--components/desktops/phosh.xml3
-rw-r--r--teams/phosh.xml15
4 files changed, 1 insertions, 20 deletions
diff --git a/Fedora.kiwi b/Fedora.kiwi
index c5ed527..a477059 100644
--- a/Fedora.kiwi
+++ b/Fedora.kiwi
@@ -56,7 +56,6 @@
<include from="this://./teams/asahi.xml"/>
<include from="this://./teams/python.xml"/>
<include from="this://./teams/scitech.xml"/>
- <include from="this://./teams/phosh.xml"/>
<packages type="bootstrap">
<package name="filesystem"/>
</packages>
diff --git a/VARIANTS.md b/VARIANTS.md
index 5056dbe..58dd107 100644
--- a/VARIANTS.md
+++ b/VARIANTS.md
@@ -37,5 +37,3 @@
| | `oem` | `Python-Classroom-Disk` |
| | `oem` | `Python-Classroom-Vagrant-libvirt` |
| | `oem` | `Python-Classroom-Vagrant-VirtualBox` |
-| Phosh Spin | `iso` | `Phosh-Desktop-Live` |
-| | `oem` | `Phosh-Desktop-Disk` |
diff --git a/components/desktops/phosh.xml b/components/desktops/phosh.xml
index 7362244..fe1456a 100644
--- a/components/desktops/phosh.xml
+++ b/components/desktops/phosh.xml
@@ -5,11 +5,10 @@
</profile>
</profiles>
<packages type="bootstrap" patternType="plusRecommended" profiles="Phosh-Desktop">
- <package name="fedora-release-mobility"/>
+ <package name="fedora-release-phosh"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="Phosh-Desktop">
<!-- install env-group to resolve RhBug:1891500 -->
<namedCollection name="phosh-desktop-environment"/>
- <package name="initial-setup-gui-wayland-generic"/>
</packages>
</image>
diff --git a/teams/phosh.xml b/teams/phosh.xml
deleted file mode 100644
index ce5e920..0000000
--- a/teams/phosh.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<image>
- <profiles>
- <profile name="Phosh-Live" description="Phosh Spin Live DVD">
- <requires profile="Phosh-Desktop"/>
- <requires profile="LiveInstall"/>
- </profile>
- <profile name="Phosh-Disk" description="Phosh Spin Install Disk">
- <requires profile="BootDiskCore"/>
- <requires profile="Phosh-Desktop"/>
- </profile>
- </profiles>
- <packages type="bootstrap" patternType="plusRecommended" profiles="Phosh-Disk,Phosh-Live">
- <package name="fedora-release-mobility"/>
- </packages>
-</image>