From 00037e7a750a39c84396f995e4bfe8d25421ab13 Mon Sep 17 00:00:00 2001
From: wangchong1995924 <15229716099@163.com>
Date: Fri, 5 Aug 2022 16:41:54 +0800
Subject: [PATCH] modify desktop xml
---
desktop_normal_aarch64.xml | 157 +++++++++++++++++++++++++++++++++++++
desktop_normal_x86_64.xml | 157 +++++++++++++++++++++++++++++++++++++
oemaker.spec | 9 ++-
rpmlist.xml | 34 ++++++++
4 files changed, 355 insertions(+), 2 deletions(-)
diff --git a/desktop_normal_aarch64.xml b/desktop_normal_aarch64.xml
index e69de29..6763e29 100644
--- a/desktop_normal_aarch64.xml
+++ b/desktop_normal_aarch64.xml
@@ -0,0 +1,157 @@
+
+
+
+
+ core
+ Core
+ 核心
+ Smallest possible installation
+ 最小安装
+ true
+ false
+
+ audit
+ kernel
+ basesystem
+ bash
+ coreutils
+ cronie
+ curl
+ dnf
+ e2fsprogs
+ filesystem
+ firewalld
+ glibc
+ grubby
+ hostname
+ initscripts
+ iproute
+ iprutils
+ iputils
+ irqbalance
+ kbd
+ kexec-tools
+ less
+ man-db
+ ncurses
+ openssh
+ openssh-server
+ openssh-clients
+ parted
+ passwd
+ policycoreutils
+ procps-ng
+ rng-tools
+ rootfiles
+ rpm
+ selinux-policy-targeted
+ setup
+ shadow
+ sssd
+ sudo
+ systemd
+ tuned
+ util-linux
+ vim-minimal
+ xfsprogs
+ yum
+ wget
+ openEuler-release
+ openEuler-performance
+ openEuler-latest-release
+ NetworkManager
+ NetworkManager-config-server
+ authselect
+ dnf-plugins-core
+ dracut-config-rescue
+ kernel-tools
+ sysfsutils
+ linux-firmware
+ lshw
+ lsscsi
+ rsyslog
+ security-tool
+ sg3_utils
+ dracut-config-generic
+ dracut-network
+ rdma-core
+ selinux-policy-mls
+ patch
+ patch-help
+ ntp
+ ntp-help
+ ntp-perl
+ iSulad
+ tar
+ socat
+ socat-help
+ conntrack-tools
+ conntrack-tools-help
+ vim-X11
+ vim-common
+ vim-enhanced
+ vim-filesystem
+ vim-minimal
+ efibootmgr
+ efibootmgr-help
+ cjson
+ cjson-devel
+ mosquitto
+ chrony
+
+
+
+ desktop-base
+ Desktop-base
+ 桌面基础包
+ Base packages for Desktop
+ 桌面基础包
+ true
+ false
+
+ kubernetes
+
+
+
+ ukui
+ UKUI
+
+ Ukui packages
+ 麒麟相关包
+ true
+ false
+
+ mdadm
+
+
+
+ uos
+ UOS
+
+ Uos packages
+ 统信相关包
+ true
+ false
+
+ kubernetes-node
+
+
+
+ desktop-environment
+ Develop Desktop
+ 开发者桌面
+ Develop Desktop
+ 开发者桌面
+ 1
+
+ core
+ desktop-base
+
+
+ ukui
+ uos
+
+
+
diff --git a/desktop_normal_x86_64.xml b/desktop_normal_x86_64.xml
index e69de29..6763e29 100644
--- a/desktop_normal_x86_64.xml
+++ b/desktop_normal_x86_64.xml
@@ -0,0 +1,157 @@
+
+
+
+
+ core
+ Core
+ 核心
+ Smallest possible installation
+ 最小安装
+ true
+ false
+
+ audit
+ kernel
+ basesystem
+ bash
+ coreutils
+ cronie
+ curl
+ dnf
+ e2fsprogs
+ filesystem
+ firewalld
+ glibc
+ grubby
+ hostname
+ initscripts
+ iproute
+ iprutils
+ iputils
+ irqbalance
+ kbd
+ kexec-tools
+ less
+ man-db
+ ncurses
+ openssh
+ openssh-server
+ openssh-clients
+ parted
+ passwd
+ policycoreutils
+ procps-ng
+ rng-tools
+ rootfiles
+ rpm
+ selinux-policy-targeted
+ setup
+ shadow
+ sssd
+ sudo
+ systemd
+ tuned
+ util-linux
+ vim-minimal
+ xfsprogs
+ yum
+ wget
+ openEuler-release
+ openEuler-performance
+ openEuler-latest-release
+ NetworkManager
+ NetworkManager-config-server
+ authselect
+ dnf-plugins-core
+ dracut-config-rescue
+ kernel-tools
+ sysfsutils
+ linux-firmware
+ lshw
+ lsscsi
+ rsyslog
+ security-tool
+ sg3_utils
+ dracut-config-generic
+ dracut-network
+ rdma-core
+ selinux-policy-mls
+ patch
+ patch-help
+ ntp
+ ntp-help
+ ntp-perl
+ iSulad
+ tar
+ socat
+ socat-help
+ conntrack-tools
+ conntrack-tools-help
+ vim-X11
+ vim-common
+ vim-enhanced
+ vim-filesystem
+ vim-minimal
+ efibootmgr
+ efibootmgr-help
+ cjson
+ cjson-devel
+ mosquitto
+ chrony
+
+
+
+ desktop-base
+ Desktop-base
+ 桌面基础包
+ Base packages for Desktop
+ 桌面基础包
+ true
+ false
+
+ kubernetes
+
+
+
+ ukui
+ UKUI
+
+ Ukui packages
+ 麒麟相关包
+ true
+ false
+
+ mdadm
+
+
+
+ uos
+ UOS
+
+ Uos packages
+ 统信相关包
+ true
+ false
+
+ kubernetes-node
+
+
+
+ desktop-environment
+ Develop Desktop
+ 开发者桌面
+ Develop Desktop
+ 开发者桌面
+ 1
+
+ core
+ desktop-base
+
+
+ ukui
+ uos
+
+
+
diff --git a/oemaker.spec b/oemaker.spec
index d8da8d6..2a986ed 100644
--- a/oemaker.spec
+++ b/oemaker.spec
@@ -11,7 +11,7 @@ Summary: a duilding tool for DVD ISO making and ISO cutting
License: Mulan PSL v2
Group: System/Management
Version: 2.0.3
-Release: 17
+Release: 18
BuildRoot: %{_tmppath}/%{name}
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -144,10 +144,15 @@ rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name}
%changelog
+* Fri Aug 5 2022 wangchong - 2.0.3-18
+- ID:NA
+- SUG:NA
+- DESC: modify desktop xml
+
* Fri Jul 29 2022 wangchong - 2.0.3-17
- ID:NA
- SUG:NA
-- DESC: support Desktop isp
+- DESC: support Desktop iso
* Fri Jul 15 2022 caodongxia - 2.0.3-16
- ID:NA
diff --git a/rpmlist.xml b/rpmlist.xml
index 2b92f73..a6aaeb9 100644
--- a/rpmlist.xml
+++ b/rpmlist.xml
@@ -1425,4 +1425,38 @@
dosfstools-help
dosfstools
+
+ grub2-efi-aa64
+ grub2-efi-aa64-cdboot
+ grub2-efi-aa64-modules
+
+
+ grub2-pc
+ grub2-pc-modules
+
+
+ kubernetes
+ kubernetes-client
+ kubernetes-help
+ kubernetes-kubeadm
+ kubernetes-kubelet
+ kubernetes-master
+ kubernetes-node
+ kubeedge-cloudcore
+ kubeedge-edgecore
+ kubeedge-edgesite
+ kubeedge-keadm
+ grub2-common
+ grub2-tools-minimal
+ grub2-tools-extra
+ grub2-tools
+ grub2-help
+ lvm2-help
+ lvm2
+ shim
+ mdadm
+ mdadm-help
+ dosfstools-help
+ dosfstools
+
--
Gitee