From 9547cc4b02510d5f04456a158e7435e5410445fb Mon Sep 17 00:00:00 2001
From: mazhiguo <mazhiguo@kylinsec.com.cn>
Date: Wed, 10 Aug 2022 17:51:18 +0800
Subject: [PATCH] add desktop comps for kiran

---
 desktop_normal_aarch64.xml | 148 +++++++++++++++++++++++++++++++++++++
 desktop_normal_x86_64.xml  | 148 +++++++++++++++++++++++++++++++++++++
 2 files changed, 296 insertions(+)

diff --git a/desktop_normal_aarch64.xml b/desktop_normal_aarch64.xml
index e69de29..f31b46a 100644
--- a/desktop_normal_aarch64.xml
+++ b/desktop_normal_aarch64.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE comps
+  PUBLIC '-//openEuler//DTD Comps info//EN'
+  'comps.dtd'>
+<comps>
+  <group>
+    <id>core</id>
+    <name>Core</name>
+    <name xml:lang="zh_CN">核心</name>
+    <description>Smallest possible installation</description>
+    <description xml:lang="zh_CN">最小安装</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">audit</packagereq>
+      <packagereq type="mandatory">kernel</packagereq>
+      <packagereq type="mandatory">basesystem</packagereq>
+      <packagereq type="mandatory">bash</packagereq>
+      <packagereq type="mandatory">coreutils</packagereq>
+      <packagereq type="mandatory">cronie</packagereq>
+      <packagereq type="mandatory">curl</packagereq>
+      <packagereq type="mandatory">dnf</packagereq>
+      <packagereq type="mandatory">e2fsprogs</packagereq>
+      <packagereq type="mandatory">filesystem</packagereq>
+      <packagereq type="mandatory">firewalld</packagereq>
+      <packagereq type="mandatory">glibc</packagereq>
+      <packagereq type="mandatory">grubby</packagereq>
+      <packagereq type="mandatory">hostname</packagereq>
+      <packagereq type="mandatory">initscripts</packagereq>
+      <packagereq type="mandatory">iproute</packagereq>
+      <packagereq type="mandatory">iprutils</packagereq>
+      <packagereq type="mandatory">iputils</packagereq>
+      <packagereq type="mandatory">irqbalance</packagereq>
+      <packagereq type="mandatory">kbd</packagereq>
+      <packagereq type="mandatory">kexec-tools</packagereq>
+      <packagereq type="mandatory">less</packagereq>
+      <packagereq type="mandatory">man-db</packagereq>
+      <packagereq type="mandatory">ncurses</packagereq>
+      <packagereq type="mandatory">openssh</packagereq>
+      <packagereq type="mandatory">openssh-server</packagereq>
+      <packagereq type="mandatory">openssh-clients</packagereq>
+      <packagereq type="mandatory">parted</packagereq>
+      <packagereq type="mandatory">passwd</packagereq>
+      <packagereq type="mandatory">policycoreutils</packagereq>
+      <packagereq type="mandatory">procps-ng</packagereq>
+      <packagereq type="mandatory">rng-tools</packagereq>
+      <packagereq type="mandatory">rootfiles</packagereq>
+      <packagereq type="mandatory">rpm</packagereq>
+      <packagereq type="mandatory">selinux-policy-targeted</packagereq>
+      <packagereq type="mandatory">setup</packagereq>
+      <packagereq type="mandatory">shadow</packagereq>
+      <packagereq type="mandatory">sssd</packagereq>
+      <packagereq type="mandatory">sudo</packagereq>
+      <packagereq type="mandatory">systemd</packagereq>
+      <packagereq type="mandatory">tuned</packagereq>
+      <packagereq type="mandatory">util-linux</packagereq>
+      <packagereq type="mandatory">vim-minimal</packagereq>
+      <packagereq type="mandatory">xfsprogs</packagereq>
+      <packagereq type="mandatory">yum</packagereq>
+      <packagereq type="mandatory">wget</packagereq>
+      <packagereq type="mandatory">openEuler-release</packagereq>
+      <packagereq type="mandatory">openEuler-performance</packagereq>
+      <packagereq type="mandatory">openEuler-latest-release</packagereq>
+      <packagereq type="default">NetworkManager</packagereq>
+      <packagereq type="default">NetworkManager-config-server</packagereq>
+      <packagereq type="default">authselect</packagereq>
+      <packagereq type="default">dnf-plugins-core</packagereq>
+      <packagereq type="default">dracut-config-rescue</packagereq>
+      <packagereq type="default">kernel-tools</packagereq>
+      <packagereq type="default">sysfsutils</packagereq>
+      <packagereq type="default">linux-firmware</packagereq>
+      <packagereq type="default">lshw</packagereq>
+      <packagereq type="default">lsscsi</packagereq>
+      <packagereq type="default">rsyslog</packagereq>
+      <packagereq type="default">security-tool</packagereq>
+      <packagereq type="default">sg3_utils</packagereq>
+      <packagereq type="optional">dracut-config-generic</packagereq>
+      <packagereq type="optional">dracut-network</packagereq>
+      <packagereq type="optional">rdma-core</packagereq>
+      <packagereq type="optional">selinux-policy-mls</packagereq>
+      <packagereq type="default">patch</packagereq>
+      <packagereq type="default">patch-help</packagereq>
+      <packagereq type="default">ntp</packagereq>
+      <packagereq type="default">ntp-help</packagereq>
+      <packagereq type="default">ntp-perl</packagereq>
+      <packagereq type="default">iSulad</packagereq>
+      <packagereq type="default">tar</packagereq>
+      <packagereq type="default">socat</packagereq>
+      <packagereq type="default">socat-help</packagereq>
+      <packagereq type="default">conntrack-tools</packagereq>
+      <packagereq type="default">conntrack-tools-help</packagereq>
+      <packagereq type="optional">vim-X11</packagereq>
+      <packagereq type="default">vim-common</packagereq>
+      <packagereq type="optional">vim-enhanced</packagereq>
+      <packagereq type="optional">vim-filesystem</packagereq>
+      <packagereq type="optional">vim-minimal</packagereq>
+      <packagereq type="optional">efibootmgr</packagereq>
+      <packagereq type="optional">efibootmgr-help</packagereq>
+      <packagereq type="optional">cjson</packagereq>
+      <packagereq type="optional">cjson-devel</packagereq>
+      <packagereq type="optional">mosquitto</packagereq>
+      <packagereq type="optional">chrony</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>desktop-base</id>
+    <name>Desktop-base</name>
+    <name xml:lang="zh_CN">桌面基础包</name>
+    <description>Base packages for Desktop</description>
+    <description xml:lang="zh_CN">桌面基础包</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">kubernetes</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>kiran</id>
+    <name>kiran</name>
+    <name xml:lang="zh_CN">kiran桌面环境</name>
+    <description>kiran Desktop</description>
+    <description xml:lang="zh_CN">kiran桌面环境</description>
+    <default>true</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">kiran-desktop</packagereq>
+      <packagereq type="mandatory">libstdc++</packagereq>
+      <packagereq type="mandatory">eclipse-jdt</packagereq>
+      <packagereq type="mandatory">pycharm-community</packagereq>
+      <packagereq type="mandatory">virt-manager</packagereq>
+    </packagelist>
+  </group>
+  <environment>
+    <id>desktop-environment</id>
+    <name>Develop Desktop</name>
+    <name xml:lang="zh_CN">开发者桌面</name>
+    <description>Develop Desktop</description>
+    <description xml:lang="zh_CN">开发者桌面</description>
+    <display_order>1</display_order>
+    <grouplist>
+      <groupid>core</groupid>
+      <groupid>desktop-base</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>kiran</groupid>
+    </optionlist>
+  </environment>
+</comps>
diff --git a/desktop_normal_x86_64.xml b/desktop_normal_x86_64.xml
index e69de29..92c84d2 100644
--- a/desktop_normal_x86_64.xml
+++ b/desktop_normal_x86_64.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE comps
+  PUBLIC '-//openEuler//DTD Comps info//EN'
+  'comps.dtd'>
+<comps>
+  <group>
+    <id>core</id>
+    <name>Core</name>
+    <name xml:lang="zh_CN">核心</name>
+    <description>Smallest possible installation</description>
+    <description xml:lang="zh_CN">最小安装</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">audit</packagereq>
+      <packagereq type="mandatory">kernel</packagereq>
+      <packagereq type="mandatory">basesystem</packagereq>
+      <packagereq type="mandatory">bash</packagereq>
+      <packagereq type="mandatory">coreutils</packagereq>
+      <packagereq type="mandatory">cronie</packagereq>
+      <packagereq type="mandatory">curl</packagereq>
+      <packagereq type="mandatory">dnf</packagereq>
+      <packagereq type="mandatory">e2fsprogs</packagereq>
+      <packagereq type="mandatory">filesystem</packagereq>
+      <packagereq type="mandatory">firewalld</packagereq>
+      <packagereq type="mandatory">glibc</packagereq>
+      <packagereq type="mandatory">grubby</packagereq>
+      <packagereq type="mandatory">hostname</packagereq>
+      <packagereq type="mandatory">initscripts</packagereq>
+      <packagereq type="mandatory">iproute</packagereq>
+      <packagereq type="mandatory">iprutils</packagereq>
+      <packagereq type="mandatory">iputils</packagereq>
+      <packagereq type="mandatory">irqbalance</packagereq>
+      <packagereq type="mandatory">kbd</packagereq>
+      <packagereq type="mandatory">kexec-tools</packagereq>
+      <packagereq type="mandatory">less</packagereq>
+      <packagereq type="mandatory">man-db</packagereq>
+      <packagereq type="mandatory">ncurses</packagereq>
+      <packagereq type="mandatory">openssh</packagereq>
+      <packagereq type="mandatory">openssh-server</packagereq>
+      <packagereq type="mandatory">openssh-clients</packagereq>
+      <packagereq type="mandatory">openEuler-release</packagereq>
+      <packagereq type="mandatory">openEuler-performance</packagereq>
+      <packagereq type="mandatory">openEuler-latest-release</packagereq>
+      <packagereq type="mandatory">parted</packagereq>
+      <packagereq type="mandatory">passwd</packagereq>
+      <packagereq type="mandatory">policycoreutils</packagereq>
+      <packagereq type="mandatory">procps-ng</packagereq>
+      <packagereq type="mandatory">rng-tools</packagereq>
+      <packagereq type="mandatory">rootfiles</packagereq>
+      <packagereq type="mandatory">rpm</packagereq>
+      <packagereq type="mandatory">selinux-policy-targeted</packagereq>
+      <packagereq type="mandatory">setup</packagereq>
+      <packagereq type="mandatory">shadow</packagereq>
+      <packagereq type="mandatory">sssd</packagereq>
+      <packagereq type="mandatory">sudo</packagereq>
+      <packagereq type="mandatory">systemd</packagereq>
+      <packagereq type="mandatory">tuned</packagereq>
+      <packagereq type="mandatory">util-linux</packagereq>
+      <packagereq type="mandatory">vim-minimal</packagereq>
+      <packagereq type="mandatory">xfsprogs</packagereq>
+      <packagereq type="mandatory">yum</packagereq>
+      <packagereq type="mandatory">wget</packagereq>
+      <packagereq type="default">NetworkManager</packagereq>
+      <packagereq type="default">NetworkManager-config-server</packagereq>
+      <packagereq type="default">authselect</packagereq>
+      <packagereq type="default">dnf-plugins-core</packagereq>
+      <packagereq type="default">dracut-config-rescue</packagereq>
+      <packagereq type="default">kernel-tools</packagereq>
+      <packagereq type="default">sysfsutils</packagereq>
+      <packagereq type="default">linux-firmware</packagereq>
+      <packagereq type="default">lshw</packagereq>
+      <packagereq type="default">lsscsi</packagereq>
+      <packagereq type="default">rsyslog</packagereq>
+      <packagereq type="default">security-tool</packagereq>
+      <packagereq type="default">sg3_utils</packagereq>
+      <packagereq type="optional">dracut-config-generic</packagereq>
+      <packagereq type="optional">dracut-network</packagereq>
+      <packagereq type="optional">rdma-core</packagereq>
+      <packagereq type="optional">selinux-policy-mls</packagereq>
+      <packagereq type="default">patch</packagereq>
+      <packagereq type="default">patch-help</packagereq>
+      <packagereq type="default">ntp</packagereq>
+      <packagereq type="default">ntp-help</packagereq>
+      <packagereq type="default">ntp-perl</packagereq>
+      <packagereq type="default">iSulad</packagereq>
+      <packagereq type="default">tar</packagereq>
+      <packagereq type="default">socat</packagereq>
+      <packagereq type="default">socat-help</packagereq>
+      <packagereq type="default">conntrack-tools</packagereq>
+      <packagereq type="default">conntrack-tools-help</packagereq>
+      <packagereq type="optional">vim-X11</packagereq>
+      <packagereq type="default">vim-common</packagereq>
+      <packagereq type="optional">vim-enhanced</packagereq>
+      <packagereq type="optional">vim-filesystem</packagereq>
+      <packagereq type="optional">vim-minimal</packagereq>
+      <packagereq type="optional">efibootmgr</packagereq>
+      <packagereq type="optional">efibootmgr-help</packagereq>
+      <packagereq type="optional">cjson</packagereq>
+      <packagereq type="optional">cjson-devel</packagereq>
+      <packagereq type="optional">mosquitto</packagereq>
+      <packagereq type="optional">chrony</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>desktop-base</id>
+    <name>Desktop-base</name>
+    <name xml:lang="zh_CN">桌面基础包</name>
+    <description>Base packages for Desktop</description>
+    <description xml:lang="zh_CN">桌面基础包</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">kubernetes</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>kiran</id>
+    <name>kiran</name>
+    <name xml:lang="zh_CN">kiran桌面环境</name>
+    <description>kiran Desktop</description>
+    <description xml:lang="zh_CN">kiran桌面环境</description>
+    <default>true</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">kiran-desktop</packagereq>
+      <packagereq type="mandatory">libstdc++</packagereq>
+      <packagereq type="mandatory">eclipse-jdt</packagereq>
+      <packagereq type="mandatory">pycharm-community</packagereq>
+      <packagereq type="mandatory">virt-manager</packagereq>
+    </packagelist>
+  </group>
+  <environment>
+    <id>desktop-environment</id>
+    <name>Develop Desktop</name>
+    <name xml:lang="zh_CN">开发者桌面</name>
+    <description>Develop Desktop</description>
+    <description xml:lang="zh_CN">开发者桌面</description>
+    <display_order>1</display_order>
+    <grouplist>
+      <groupid>core</groupid>
+      <groupid>desktop-base</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>kiran</groupid>
+    </optionlist>
+  </environment>
+</comps>
-- 
Gitee