upgrade version

0001-change-source-iso-method.patch

@@ -1,92 +0,0 @@
-From d2181a8bd05e2761827f0cc9451992d137828095 Mon Sep 17 00:00:00 2001
-From: miao_kaibo <miaokaibo@outlook.com>
-Date: Wed, 10 Mar 2021 09:16:00 +0800
-Subject: [PATCH] change source iso method
-
----
- config/rpmlist.xml | 11 +++++++++++
- rpm.sh             | 21 +++++++++++++--------
- 2 files changed, 24 insertions(+), 8 deletions(-)
-
-diff --git a/config/rpmlist.xml b/config/rpmlist.xml
-index d5fcf8a..a6ac01b 100644
---- a/config/rpmlist.xml
-+++ b/config/rpmlist.xml
-@@ -32,6 +32,17 @@
-         <packagereq>texlive-scheme-gust</packagereq>
-         <packagereq>texlive-scheme-medium</packagereq>
-         <packagereq>texlive-scheme-tetex</packagereq>
-+        <packagereq>totem</packagereq>
-+        <packagereq>gimp</packagereq>
-+        <packagereq>python3-nni</packagereq>
-+        <packagereq>ceph-mgr-rook</packagereq>
-+        <packagereq>ceph-mgr-ssh</packagereq>
-+        <packagereq>ceph-mgr-dashboard</packagereq>
-+        <packagereq>ceph-mgr-k8sevents</packagereq>
-+    </packagelist>
-+    <packagelist type="src_exclude">
-+        <packagereq>totem</packagereq>
-+        <packagereq>gimp</packagereq>
-     </packagelist>
-     <packagelist type="aarch64">
-         <packagereq>edk2-aarch64</packagereq>
-diff --git a/rpm.sh b/rpm.sh
-index 7e4a7e2..f8cf92e 100755
---- a/rpm.sh
-+++ b/rpm.sh
-@@ -154,7 +154,7 @@ function get_everything_rpms()
-     if [ -s parsed_rpmlist_exclude ];then
-         for rpmname in $(cat parsed_rpmlist_exclude)
-         do
--            sed -i "/^${rpmname}/d" ava_every_lst
-+            sed -i "/^${rpmname}\./d" ava_every_lst
-         done
-     fi 
-     if [ -s conflict_list ];then
-@@ -165,7 +165,7 @@ function get_everything_rpms()
-     if [ -s parsed_rpmlist_conflict ];then
-         for rpmname in $(cat parsed_rpmlist_conflict)
-         do
--            sed -i "/^${rpmname}/d" ava_every_lst
-+            sed -i "/^${rpmname}\./d" ava_every_lst
-             echo "${rpmname}" >> conflict_list
-         done
-     fi 
-@@ -174,7 +174,7 @@ function get_everything_rpms()
-     if [ -s parsed_rpmlist_everything_conflict ];then
-         for rpmname in $(cat parsed_rpmlist_everything_conflict)
-         do
--            sed -i "/^${rpmname}/d" ava_every_lst
-+            sed -i "/^${rpmname}\./d" ava_every_lst
-             echo "${rpmname}" >> conflict_list
-         done
-     fi 
-@@ -197,15 +197,20 @@ function everything_rpms_download()
- function everything_source_rpms_download()
- {
-     mkdir ${EVERY_SRC_DIR}
--    get_everything_rpms
--    yumdownloader --resolve --installroot="${BUILD}"/tmp --destdir="${EVERY_SRC_DIR}" --source $(cat ava_every_lst | tr '\n' ' ')
-+    yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep ".src" > ava_every_lst
-+    parse_rpmlist_xml "src_exclude"
-+    cat parsed_rpmlist_src_exclude
-+    if [ -s parsed_rpmlist_src_exclude ];then
-+        for rpmname in $(cat parsed_rpmlist_src_exclude)
-+        do
-+            sed -i "/^${rpmname}\./d" ava_every_lst
-+        done
-+    fi 
-+    yumdownloader --installroot="${BUILD}"/tmp --destdir="${EVERY_SRC_DIR}" --source $(cat ava_every_lst | tr '\n' ' ')
-     if [ $? != 0 ] || [ $(ls ${EVERY_SRC_DIR} | wc -l) == 0 ]; then
-        echo "Download rpms failed!"
-        exit 133
-     fi
--    if [ -s conflict_list ];then
--        yumdownloader --resolve --installroot="${BUILD}"/tmp --destdir="${EVERY_SRC_DIR}" --source $(cat conflict_list | tr '\n' ' ')
--    fi
- }
-  
- function everything_debug_rpms_download()
--- 
-2.27.0
-

0002-bug-fix-I3B7CH.patch

@@ -1,25 +0,0 @@
-From 78879f08b31ea910e7b39b512a74986788645769 Mon Sep 17 00:00:00 2001
-From: miao_kaibo <miaokaibo@outlook.com>
-Date: Sat, 13 Mar 2021 10:11:53 +0800
-Subject: [PATCH] bug fix I3B7CH
-
----
- rpm.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rpm.sh b/rpm.sh
-index 7e4a7e2..9a255a7 100755
---- a/rpm.sh
-+++ b/rpm.sh
-@@ -148,7 +148,7 @@ function get_rpm_pub_key()
- 
- function get_everything_rpms()
- {
--    yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "noarch|${ARCH}" | grep -v "debuginfo" | grep -v "debugsource" > ava_every_lst
-+    yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "\.noarch|\.${ARCH}" | grep -v "debuginfo" | grep -v "debugsource" > ava_every_lst
-     parse_rpmlist_xml "exclude"
-     cat parsed_rpmlist_exclude
-     if [ -s parsed_rpmlist_exclude ];then
--- 
-2.27.0
-

0003-add-exclude-rpm-sub-of-gimp-and-totem.patch

@@ -1,34 +0,0 @@
-From 4196eb9e39094158183f46e47efbe2864e90bdb7 Mon Sep 17 00:00:00 2001
-From: miao_kaibo <miaokaibo@outlook.com>
-Date: Tue, 16 Mar 2021 11:53:57 +0800
-Subject: [PATCH] add exclude rpm sub of gimp and totem
-
----
- config/rpmlist.xml | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/config/rpmlist.xml b/config/rpmlist.xml
-index a6ac01b..649aac1 100644
---- a/config/rpmlist.xml
-+++ b/config/rpmlist.xml
-@@ -33,7 +33,17 @@
-         <packagereq>texlive-scheme-medium</packagereq>
-         <packagereq>texlive-scheme-tetex</packagereq>
-         <packagereq>totem</packagereq>
-+        <packagereq>totem-debuginfo</packagereq>
-+        <packagereq>totem-debugsource</packagereq>
-+        <packagereq>totem-devel</packagereq>
-+        <packagereq>totem-help</packagereq>
-+        <packagereq>totem-nautilus</packagereq>
-         <packagereq>gimp</packagereq>
-+        <packagereq>gimp-libs</packagereq>
-+        <packagereq>gimp-devel</packagereq>
-+        <packagereq>gimp-help</packagereq>
-+        <packagereq>gimp-debuginfo</packagereq>
-+        <packagereq>gimp-debugsource</packagereq>
-         <packagereq>python3-nni</packagereq>
-         <packagereq>ceph-mgr-rook</packagereq>
-         <packagereq>ceph-mgr-ssh</packagereq>
--- 
-2.30.0
-

0004-delete-or-replace-rpms-which-are-not-exist.patch

@@ -1,414 +0,0 @@
-From a7ec3063ac10f0a2bbb2a2d074cde4181cd7d038 Mon Sep 17 00:00:00 2001
-From: miao_kaibo <miaokaibo@outlook.com>
-Date: Wed, 17 Mar 2021 18:27:22 +0800
-Subject: [PATCH] delete or replace rpms which are not exist
-
----
- config/aarch64/normal.xml | 44 +++++++++++++++-----------------------
- config/rpmlist.xml        | 14 ++----------
- config/x86_64/normal.xml  | 45 ++++++++++++++++-----------------------
- 3 files changed, 37 insertions(+), 66 deletions(-)
-
-diff --git a/config/aarch64/normal.xml b/config/aarch64/normal.xml
-index 7e61eba..35350f7 100644
---- a/config/aarch64/normal.xml
-+++ b/config/aarch64/normal.xml
-@@ -130,7 +130,7 @@
-       <packagereq type="mandatory">mdadm</packagereq>
-       <packagereq type="mandatory">realmd</packagereq>
-       <packagereq type="mandatory">shim-aa64</packagereq>
--      <packagereq type="mandatory">teamd</packagereq>
-+      <packagereq type="mandatory">libteam</packagereq>
-       <packagereq type="mandatory">tmux</packagereq>
-       <packagereq type="mandatory">xfsprogs</packagereq>
-       <packagereq type="mandatory">authselect-compat</packagereq>
-@@ -151,7 +151,7 @@
-       <packagereq type="mandatory">bc</packagereq>
-       <packagereq type="mandatory">cpio</packagereq>
-       <packagereq type="mandatory">crontabs</packagereq>
--      <packagereq type="mandatory">cyrus-sasl-plain</packagereq>
-+      <packagereq type="mandatory">cyrus-sasl</packagereq>
-       <packagereq type="mandatory">dbus</packagereq>
-       <packagereq type="mandatory">ed</packagereq>
-       <packagereq type="mandatory">file</packagereq>
-@@ -197,7 +197,7 @@
-       <packagereq type="default">smartmontools</packagereq>
-       <packagereq type="default">sssd</packagereq>
-       <packagereq type="default">strace</packagereq>
--      <packagereq type="default">teamd</packagereq>
-+      <packagereq type="default">libteam</packagereq>
-       <packagereq type="default">time</packagereq>
-       <packagereq type="default">unzip</packagereq>
-       <packagereq type="default">usbutils</packagereq>
-@@ -282,9 +282,8 @@
-       <packagereq type="mandatory">rpm</packagereq>
-       <packagereq type="mandatory">selinux-policy-targeted</packagereq>
-       <packagereq type="mandatory">setup</packagereq>
--      <packagereq type="mandatory">shadow-utils</packagereq>
--      <packagereq type="mandatory">sssd-common</packagereq>
--      <packagereq type="mandatory">sssd-kcm</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>
-@@ -297,14 +296,12 @@
-       <packagereq type="mandatory">openEuler-performance</packagereq>
-       <packagereq type="mandatory">openEuler-latest-release</packagereq>
-       <packagereq type="default">NetworkManager</packagereq>
--      <packagereq type="default">NetworkManager-team</packagereq>
--      <packagereq type="default">NetworkManager-tui</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">libsysfs</packagereq>
-+      <packagereq type="default">sysfsutils</packagereq>
-       <packagereq type="default">linux-firmware</packagereq>
-       <packagereq type="default">lshw</packagereq>
-       <packagereq type="default">lsscsi</packagereq>
-@@ -355,11 +352,9 @@
-       <packagereq type="mandatory">make</packagereq>
-       <packagereq type="mandatory">patch</packagereq>
-       <packagereq type="mandatory">pkgconf</packagereq>
--      <packagereq type="mandatory">pkgconf-m4</packagereq>
--      <packagereq type="mandatory">pkgconf-pkg-config</packagereq>
-       <packagereq type="mandatory">openEuler-rpm-config</packagereq>
-       <packagereq type="mandatory">rpm-build</packagereq>
--      <packagereq type="mandatory">rpm-sign</packagereq>
-+      <packagereq type="mandatory">rpm</packagereq>
-       <packagereq type="default">asciidoc</packagereq>
-       <packagereq type="default">byacc</packagereq>
-       <packagereq type="default">ctags</packagereq>
-@@ -446,7 +441,6 @@
-       <packagereq type="optional">samba-winbind</packagereq>
-       <packagereq type="optional">samba-winbind-clients</packagereq>
-       <packagereq type="optional">sssd-dbus</packagereq>
--      <packagereq type="optional">sssd-kcm</packagereq>
-       <packagereq type="optional">sssd-tools</packagereq>
-       <packagereq type="optional">sssd-winbind-idmap</packagereq>
-     </packagelist>
-@@ -732,11 +726,7 @@
-     <uservisible>true</uservisible>
-     <packagelist>
-       <packagereq type="mandatory">PackageKit</packagereq>
--      <packagereq type="mandatory">cockpit-packagekit</packagereq>
--      <packagereq type="mandatory">cockpit-storaged</packagereq>
--      <packagereq type="mandatory">cockpit-bridge</packagereq>
--      <packagereq type="mandatory">cockpit-system</packagereq>
--      <packagereq type="mandatory">cockpit-ws</packagereq>
-+      <packagereq type="mandatory">cockpit</packagereq>
-       <packagereq type="mandatory">openssh-server</packagereq>
-       <packagereq type="default">sscg</packagereq>
-     </packagelist>
-@@ -923,7 +913,7 @@
-       <packagereq type="optional">libreswan</packagereq>
-       <packagereq type="optional">radvd</packagereq>
-       <packagereq type="optional">rsyslog-gnutls</packagereq>
--      <packagereq type="optional">rsyslog-gssapi</packagereq>
-+      <packagereq type="optional">rsyslog</packagereq>
-       <packagereq type="optional">rsyslog-mysql</packagereq>
-       <packagereq type="optional">rsyslog-pgsql</packagereq>
-       <packagereq type="optional">rsyslog-relp</packagereq>
-@@ -949,7 +939,7 @@
-       <packagereq type="optional">libreswan</packagereq>
-       <packagereq type="optional">radvd</packagereq>
-       <packagereq type="optional">rsyslog-gnutls</packagereq>
--      <packagereq type="optional">rsyslog-gssapi</packagereq>
-+      <packagereq type="optional">rsyslog</packagereq>
-       <packagereq type="optional">rsyslog-mysql</packagereq>
-       <packagereq type="optional">rsyslog-pgsql</packagereq>
-       <packagereq type="optional">rsyslog-relp</packagereq>
-@@ -967,7 +957,7 @@
-       <packagereq type="default">NetworkManager-bluetooth</packagereq>
-       <packagereq type="default">NetworkManager-wifi</packagereq>
-       <packagereq type="default">NetworkManager-wwan</packagereq>
--      <packagereq type="default">dhcp-client</packagereq>
-+      <packagereq type="default">dhcp</packagereq>
-       <packagereq type="default">iptables</packagereq>
-       <packagereq type="default">dnsmasq</packagereq>
-     </packagelist>
-@@ -1232,9 +1222,9 @@
-       <packagereq type="mandatory">openEuler-release</packagereq>
-       <packagereq type="mandatory">openEuler-performance</packagereq>
-       <packagereq type="mandatory">timedatex</packagereq>
--      <packagereq type="default">dhcp-client</packagereq>
-+      <packagereq type="default">dhcp</packagereq>
-       <packagereq type="default">NetworkManager-config-server</packagereq>
--      <packagereq type="default">NetworkManager-team</packagereq>
-+      <packagereq type="default">NetworkManager</packagereq>
-     </packagelist>
-   </group>
-   <group>
-@@ -1266,7 +1256,7 @@
-       <packagereq type="mandatory">bc</packagereq>
-       <packagereq type="mandatory">cpio</packagereq>
-       <packagereq type="mandatory">crontabs</packagereq>
--      <packagereq type="mandatory">cyrus-sasl-plain</packagereq>
-+      <packagereq type="mandatory">cyrus-sasl</packagereq>
-       <packagereq type="mandatory">dbus</packagereq>
-       <packagereq type="mandatory">ed</packagereq>
-       <packagereq type="mandatory">file</packagereq>
-@@ -1307,7 +1297,7 @@
-       <packagereq type="default">smartmontools</packagereq>
-       <packagereq type="default">sssd</packagereq>
-       <packagereq type="default">strace</packagereq>
--      <packagereq type="default">teamd</packagereq>
-+      <packagereq type="default">libteam</packagereq>
-       <packagereq type="default">time</packagereq>
-       <packagereq type="default">unzip</packagereq>
-       <packagereq type="default">usbutils</packagereq>
-@@ -1327,9 +1317,9 @@
-       <packagereq type="default">nano</packagereq>
-       <packagereq type="default">rng-tools</packagereq>
-       <packagereq type="mandatory">rsyslog-gnutls</packagereq>
--      <packagereq type="mandatory">rsyslog-gssapi</packagereq>
-+      <packagereq type="mandatory">rsyslog</packagereq>
-       <packagereq type="mandatory">rsyslog-relp</packagereq>
--      <packagereq type="default">nmap-ncat</packagereq>
-+      <packagereq type="default">nmap</packagereq>
-       <packagereq type="default">pinfo</packagereq>
-       <packagereq type="default">plymouth</packagereq>
-       <packagereq type="default">tcpdump</packagereq>
-diff --git a/config/rpmlist.xml b/config/rpmlist.xml
-index 649aac1..23671de 100644
---- a/config/rpmlist.xml
-+++ b/config/rpmlist.xml
-@@ -205,10 +205,7 @@
-         <packagereq>clutter-gtk-help</packagereq>
-         <packagereq>clutter-help</packagereq>
-         <packagereq>cockpit</packagereq>
--        <packagereq>cockpit-bridge</packagereq>
-         <packagereq>cockpit-help</packagereq>
--        <packagereq>cockpit-storaged</packagereq>
--        <packagereq>cockpit-ws</packagereq>
-         <packagereq>cogl</packagereq>
-         <packagereq>cogl-help</packagereq>
-         <packagereq>color-filesystem</packagereq>
-@@ -251,7 +248,6 @@
-         <packagereq>cyrus-sasl-lib</packagereq>
-         <packagereq>cyrus-sasl-md5</packagereq>
-         <packagereq>cyrus-sasl-ntlm</packagereq>
--        <packagereq>cyrus-sasl-plain</packagereq>
-         <packagereq>cyrus-sasl-scram</packagereq>
-         <packagereq>dbus</packagereq>
-         <packagereq>dbus-glib</packagereq>
-@@ -259,7 +255,7 @@
-         <packagereq>dbus-python-help</packagereq>
-         <packagereq>device-mapper</packagereq>
-         <packagereq>device-mapper-event</packagereq>
--        <packagereq>dhcp-client</packagereq>
-+        <packagereq>dhcp</packagereq>
-         <packagereq>dhcp-common</packagereq>
-         <packagereq>dhcp-libs</packagereq>
-         <packagereq>dhcp-server</packagereq>
-@@ -1049,8 +1045,6 @@
-         <packagereq>pkcs11-helper-help</packagereq>
-         <packagereq>pkgconf</packagereq>
-         <packagereq>pkgconf-help</packagereq>
--        <packagereq>pkgconf-m4</packagereq>
--        <packagereq>pkgconf-pkg-config</packagereq>
-         <packagereq>plymouth</packagereq>
-         <packagereq>plymouth-help</packagereq>
-         <packagereq>policycoreutils</packagereq>
-@@ -1185,14 +1179,12 @@
-         <packagereq>rpm-plugin-systemd-inhibit</packagereq>
-         <packagereq>rpmrebuild</packagereq>
-         <packagereq>rpmrebuild-help</packagereq>
--        <packagereq>rpm-sign</packagereq>
-         <packagereq>rsync</packagereq>
-         <packagereq>rsync-help</packagereq>
-         <packagereq>rsyslog</packagereq>
-         <packagereq>rsyslog-crypto</packagereq>
-         <packagereq>rsyslog-elasticsearch</packagereq>
-         <packagereq>rsyslog-gnutls</packagereq>
--        <packagereq>rsyslog-gssapi</packagereq>
-         <packagereq>rsyslog-help</packagereq>
-         <packagereq>rsyslog-mmaudit</packagereq>
-         <packagereq>rsyslog-mmjsonparse</packagereq>
-@@ -1227,7 +1219,7 @@
-         <packagereq>sgml-common</packagereq>
-         <packagereq>sgml-common-help</packagereq>
-         <packagereq>shadow-help</packagereq>
--        <packagereq>shadow-utils</packagereq>
-+        <packagereq>shadow</packagereq>
-         <packagereq>shared-mime-info</packagereq>
-         <packagereq>shared-mime-info-help</packagereq>
-         <packagereq>sharutils</packagereq>
-@@ -1251,9 +1243,7 @@
-         <packagereq>squid</packagereq>
-         <packagereq>sssd</packagereq>
-         <packagereq>sssd-client</packagereq>
--        <packagereq>sssd-common</packagereq>
-         <packagereq>sssd-help</packagereq>
--        <packagereq>sssd-kcm</packagereq>
-         <packagereq>sssd-nfs-idmap</packagereq>
-         <packagereq>strace</packagereq>
-         <packagereq>strongswan</packagereq>
-diff --git a/config/x86_64/normal.xml b/config/x86_64/normal.xml
-index fe68bae..588e66e 100644
---- a/config/x86_64/normal.xml
-+++ b/config/x86_64/normal.xml
-@@ -130,7 +130,7 @@
-       <packagereq type="mandatory">mdadm</packagereq>
-       <packagereq type="mandatory">realmd</packagereq>
-       <packagereq type="mandatory">shim</packagereq>
--      <packagereq type="mandatory">teamd</packagereq>
-+      <packagereq type="mandatory">libteam</packagereq>
-       <packagereq type="mandatory">tmux</packagereq>
-       <packagereq type="mandatory">xfsprogs</packagereq>
-       <packagereq type="mandatory">authselect-compat</packagereq>
-@@ -151,7 +151,7 @@
-       <packagereq type="mandatory">bc</packagereq>
-       <packagereq type="mandatory">cpio</packagereq>
-       <packagereq type="mandatory">crontabs</packagereq>
--      <packagereq type="mandatory">cyrus-sasl-plain</packagereq>
-+      <packagereq type="mandatory">cyrus-sasl</packagereq>
-       <packagereq type="mandatory">dbus</packagereq>
-       <packagereq type="mandatory">ed</packagereq>
-       <packagereq type="mandatory">file</packagereq>
-@@ -197,7 +197,7 @@
-       <packagereq type="default">smartmontools</packagereq>
-       <packagereq type="default">sssd</packagereq>
-       <packagereq type="default">strace</packagereq>
--      <packagereq type="default">teamd</packagereq>
-+      <packagereq type="default">libteam</packagereq>
-       <packagereq type="default">time</packagereq>
-       <packagereq type="default">unzip</packagereq>
-       <packagereq type="default">usbutils</packagereq>
-@@ -285,9 +285,8 @@
-       <packagereq type="mandatory">rpm</packagereq>
-       <packagereq type="mandatory">selinux-policy-targeted</packagereq>
-       <packagereq type="mandatory">setup</packagereq>
--      <packagereq type="mandatory">shadow-utils</packagereq>
--      <packagereq type="mandatory">sssd-common</packagereq>
--      <packagereq type="mandatory">sssd-kcm</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>
-@@ -297,14 +296,12 @@
-       <packagereq type="mandatory">yum</packagereq>
-       <packagereq type="mandatory">wget</packagereq>
-       <packagereq type="default">NetworkManager</packagereq>
--      <packagereq type="default">NetworkManager-team</packagereq>
--      <packagereq type="default">NetworkManager-tui</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">libsysfs</packagereq>
-+      <packagereq type="default">sysfsutils</packagereq>
-       <packagereq type="default">linux-firmware</packagereq>
-       <packagereq type="default">lshw</packagereq>
-       <packagereq type="default">lsscsi</packagereq>
-@@ -355,11 +352,9 @@
-       <packagereq type="mandatory">make</packagereq>
-       <packagereq type="mandatory">patch</packagereq>
-       <packagereq type="mandatory">pkgconf</packagereq>
--      <packagereq type="mandatory">pkgconf-m4</packagereq>
--      <packagereq type="mandatory">pkgconf-pkg-config</packagereq>
-       <packagereq type="mandatory">openEuler-rpm-config</packagereq>
-       <packagereq type="mandatory">rpm-build</packagereq>
--      <packagereq type="mandatory">rpm-sign</packagereq>
-+      <packagereq type="mandatory">rpm</packagereq>
-       <packagereq type="default">asciidoc</packagereq>
-       <packagereq type="default">byacc</packagereq>
-       <packagereq type="default">ctags</packagereq>
-@@ -446,7 +441,6 @@
-       <packagereq type="optional">samba-winbind</packagereq>
-       <packagereq type="optional">samba-winbind-clients</packagereq>
-       <packagereq type="optional">sssd-dbus</packagereq>
--      <packagereq type="optional">sssd-kcm</packagereq>
-       <packagereq type="optional">sssd-tools</packagereq>
-       <packagereq type="optional">sssd-winbind-idmap</packagereq>
-     </packagelist>
-@@ -732,11 +726,8 @@
-     <uservisible>true</uservisible>
-     <packagelist>
-       <packagereq type="mandatory">PackageKit</packagereq>
--      <packagereq type="mandatory">cockpit-packagekit</packagereq>
--      <packagereq type="mandatory">cockpit-storaged</packagereq>
--      <packagereq type="mandatory">cockpit-bridge</packagereq>
--      <packagereq type="mandatory">cockpit-system</packagereq>
--      <packagereq type="mandatory">cockpit-ws</packagereq>
-+      <packagereq type="mandatory">cockpit</packagereq>
-+      <packagereq type="mandatory">cockpit</packagereq>
-       <packagereq type="mandatory">openssh-server</packagereq>
-       <packagereq type="default">sscg</packagereq>
-     </packagelist>
-@@ -925,7 +916,7 @@
-       <packagereq type="optional">libreswan</packagereq>
-       <packagereq type="optional">radvd</packagereq>
-       <packagereq type="optional">rsyslog-gnutls</packagereq>
--      <packagereq type="optional">rsyslog-gssapi</packagereq>
-+      <packagereq type="optional">rsyslog</packagereq>
-       <packagereq type="optional">rsyslog-mysql</packagereq>
-       <packagereq type="optional">rsyslog-pgsql</packagereq>
-       <packagereq type="optional">rsyslog-relp</packagereq>
-@@ -951,7 +942,7 @@
-       <packagereq type="optional">libreswan</packagereq>
-       <packagereq type="optional">radvd</packagereq>
-       <packagereq type="optional">rsyslog-gnutls</packagereq>
--      <packagereq type="optional">rsyslog-gssapi</packagereq>
-+      <packagereq type="optional">rsyslog</packagereq>
-       <packagereq type="optional">rsyslog-mysql</packagereq>
-       <packagereq type="optional">rsyslog-pgsql</packagereq>
-       <packagereq type="optional">rsyslog-relp</packagereq>
-@@ -969,7 +960,7 @@
-       <packagereq type="default">NetworkManager-bluetooth</packagereq>
-       <packagereq type="default">NetworkManager-wifi</packagereq>
-       <packagereq type="default">NetworkManager-wwan</packagereq>
--      <packagereq type="default">dhcp-client</packagereq>
-+      <packagereq type="default">dhcp</packagereq>
-       <packagereq type="default">iptables</packagereq>
-       <packagereq type="default">dnsmasq</packagereq>
-     </packagelist>
-@@ -1234,9 +1225,9 @@
-       <packagereq type="mandatory">openEuler-performance</packagereq>
-       <packagereq type="mandatory">openEuler-latest-release</packagereq>
-       <packagereq type="mandatory">timedatex</packagereq>
--      <packagereq type="default">dhcp-client</packagereq>
-+      <packagereq type="default">dhcp</packagereq>
-       <packagereq type="default">NetworkManager-config-server</packagereq>
--      <packagereq type="default">NetworkManager-team</packagereq>
-+      <packagereq type="default">NetworkManager</packagereq>
-     </packagelist>
-   </group>
-   <group>
-@@ -1268,7 +1259,7 @@
-       <packagereq type="mandatory">bc</packagereq>
-       <packagereq type="mandatory">cpio</packagereq>
-       <packagereq type="mandatory">crontabs</packagereq>
--      <packagereq type="mandatory">cyrus-sasl-plain</packagereq>
-+      <packagereq type="mandatory">cyrus-sasl</packagereq>
-       <packagereq type="mandatory">dbus</packagereq>
-       <packagereq type="mandatory">ed</packagereq>
-       <packagereq type="mandatory">file</packagereq>
-@@ -1310,7 +1301,7 @@
-       <packagereq type="default">smartmontools</packagereq>
-       <packagereq type="default">sssd</packagereq>
-       <packagereq type="default">strace</packagereq>
--      <packagereq type="default">teamd</packagereq>
-+      <packagereq type="default">libteam</packagereq>
-       <packagereq type="default">time</packagereq>
-       <packagereq type="default">unzip</packagereq>
-       <packagereq type="default">usbutils</packagereq>
-@@ -1330,9 +1321,9 @@
-       <packagereq type="default">nano</packagereq>
-       <packagereq type="default">rng-tools</packagereq>
-       <packagereq type="mandatory">rsyslog-gnutls</packagereq>
--      <packagereq type="mandatory">rsyslog-gssapi</packagereq>
-+      <packagereq type="mandatory">rsyslog</packagereq>
-       <packagereq type="mandatory">rsyslog-relp</packagereq>
--      <packagereq type="default">nmap-ncat</packagereq>
-+      <packagereq type="default">nmap</packagereq>
-       <packagereq type="default">pinfo</packagereq>
-       <packagereq type="default">plymouth</packagereq>
-       <packagereq type="default">tcpdump</packagereq>
--- 
-2.30.0
-

README.en.md

@@ -2,28 +2,37 @@
 
 #### Description
 
-`oemaker` is a building tool for making DVD iso, include standard iso, debug iso, source iso, everything iso, everything debug iso, everything source and netinst iso.
+The source package `oemaker` has two functions: iso making and iso cutting. Correspondingly, two binary RPM packages are generated: `oemaker` and `isocut`.
-`oemaker` uses local arch when building, did not support cross building.
+
-currently, `oemaker` support the arch of aarch64 and x86_64 for iso making.
+The generated binary RPM package `oemaker` is a building tool for making DVD iso, include standard iso, debug iso, source iso, everything iso, everything source iso,everything debug iso and netinst iso.
+
+The generated binary RPM package `isocut` is a building tool for iso cutting which supports only RPM package-level.
 
 #### Installation
 
-To install `oemaker`, you can use `rpm` or `dnf` package manager command with openEuler repository.
+To install `oemaker` and `isocut`, you can use `rpm` or `dnf` package manager command with openEuler repository.
 
-Install oemaker with dnf
+Install `oemaker` with dnf
 ```sh
 dnf install -y oemaker
 ```
 
+Install `isocut` with dnf
+```sh
+dnf install -y isocut
+```
+
 #### Instructions
 
-Generally, the disk space is more than 50g
+Generally, the disk space is more than 50g.
 
-#### Contribution
+#### Usage
+
+##### oemaker
 
 oemaker <font color=#0000FF >_[-h] [-t Type] [-p Product] [-v Version] [-r RELEASE] [-s REPOSITORY]_</font>
 
-    optional arguments:
+  optional arguments:
     -t Type
        ISO Type include standard debug source everything everything_debug everything_src and netinst
 
@@ -38,3 +47,22 @@ oemaker <font color=#0000FF >_[-h] [-t Type] [-p Product] [-v Version] [-r RELEA
 
     -s REPOSITORY
        source dnf repository address link(may be listed multiple times)
+
+    -h 
+       show the help message and exit
+
+##### isocut
+
+isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_</font>
+
+  positional arguments:
+
+    origin-iso    origin iso image
+    dest-iso      destination iso image
+
+  optional arguments:
+
+    -t    the temporary path which must be an absolute path and must be greater than 8g
+    -r    extern rpm packages path
+    -k    kickstart file path
+    -h    show the help message and exit

README.md

@@ -1,19 +1,27 @@
 # oemaker
 
 #### 介绍
-oemaker是一款用于构建DVD iso的工具，包括标准iso，debug iso, source iso, everything iso, everything debug iso, everything source and netinst iso等。
+
-oemaker采用的是本地架构的方式进行构建，不支持交叉编译环境构建。
+源码包oemaker保护两部分功能：iso制作和iso裁剪。相应的，会构建生成两个二进制RPM包：oemaker和isocut.
-目前，oemkaer支持aarch64和x86_64两个架构的iso制作。
+
+生成的二进制RPM包oemaker是一款用于构建DVD iso的工具，包括标准iso，debug iso, source iso, everything iso, everything debug iso, everything source and netinst iso等。
+
+生成的二进制RPM包isocut是一款用于iso裁剪的构建工具，支持RPM包级别的裁剪。
 
 #### 安装教程
 
-可以用rpm命令或dnf包管理命令通过openEuler repository安装oemaker包。
+可以用`rpm`或`dnf`命令通过openEuler repository来安装`oemaker`和`isocut`包。
 
-用dnf命令安装方式：
+用dnf命令安装`oemaker`方式：
 ```sh
 dnf install -y oemaker
 ```
 
+用dnf命令安装`isocut`方式：
+```sh
+dnf install -y isocut
+```
+
 #### 使用说明
 
 一般要求磁盘空间大于50G
@@ -21,6 +29,8 @@ dnf install -y oemaker
 
 #### 使用方法
 
+##### oemaker
+
 oemaker <font color=#0000FF >_[-h] [-t Type] [-p Product] [-v Version] [-r RELEASE] [-s REPOSITORY]_</font>
 
     optional arguments:
@@ -41,3 +51,19 @@ oemaker <font color=#0000FF >_[-h] [-t Type] [-p Product] [-v Version] [-r RELEA
 
     -h 
        show the help message and exit
+
+##### isocut
+
+isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_</font>
+
+  positional arguments:
+
+    origin-iso    origin iso image
+    dest-iso      destination iso image
+
+  optional arguments:
+
+    -t    the temporary path which must be an absolute path and must be greater than 8g
+    -r    extern rpm packages path
+    -k    kickstart file path
+    -h    show the help message and exit

add-qemu-block-iscsi-in-virtualization-group.patch

@@ -1,38 +0,0 @@
-From 9f22b2c591b2b0baf97c55473d2d13e4b72f3063 Mon Sep 17 00:00:00 2001
-From: Chen Qun <kuhn.chenqun@huawei.com>
-Date: Wed, 10 Mar 2021 18:52:57 +0800
-Subject: [PATCH] add qemu-block-iscsi in virtualization group
-
-Signed-off-by: Chen Qun <kuhn.chenqun@huawei.com>
----
- config/aarch64/normal.xml | 1 +
- config/x86_64/normal.xml  | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/config/aarch64/normal.xml b/config/aarch64/normal.xml
-index 3582974..7e61eba 100644
---- a/config/aarch64/normal.xml
-+++ b/config/aarch64/normal.xml
-@@ -1425,6 +1425,7 @@
-       <packagereq type="mandatory">edk2-help</packagereq>
-       <packagereq type="mandatory">qemu-help</packagereq>
-       <packagereq type="mandatory">qemu</packagereq>
-+      <packagereq type="mandatory">qemu-block-iscsi</packagereq>
-       <packagereq type="mandatory">qemu-img</packagereq>
-       <packagereq type="mandatory">stratovirt</packagereq>
-     </packagelist>
-diff --git a/config/x86_64/normal.xml b/config/x86_64/normal.xml
-index 60c4704..fe68bae 100644
---- a/config/x86_64/normal.xml
-+++ b/config/x86_64/normal.xml
-@@ -1427,6 +1427,7 @@
-       <packagereq type="mandatory">python3-libvirt</packagereq>
-       <packagereq type="mandatory">qemu-help</packagereq>
-       <packagereq type="mandatory">qemu</packagereq>
-+      <packagereq type="mandatory">qemu-block-iscsi</packagereq>
-       <packagereq type="mandatory">qemu-img</packagereq>
-       <packagereq type="mandatory">stratovirt</packagereq>
-     </packagelist>
--- 
-2.25.1
-

add-stratovirt-in-virtualization-group.patch

@@ -1,38 +0,0 @@
-From 13b5d81210a6174bd71ce558777ce98981520170 Mon Sep 17 00:00:00 2001
-From: Chen Qun <kuhn.chenqun@huawei.com>
-Date: Mon, 1 Mar 2021 09:51:01 +0800
-Subject: [PATCH] add stratovirt in virtualization group
-
-Signed-off-by: Chen Qun <kuhn.chenqun@huawei.com>
----
- config/aarch64/normal.xml | 1 +
- config/x86_64/normal.xml  | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/config/aarch64/normal.xml b/config/aarch64/normal.xml
-index cab5406..3582974 100644
---- a/config/aarch64/normal.xml
-+++ b/config/aarch64/normal.xml
-@@ -1426,6 +1426,7 @@
-       <packagereq type="mandatory">qemu-help</packagereq>
-       <packagereq type="mandatory">qemu</packagereq>
-       <packagereq type="mandatory">qemu-img</packagereq>
-+      <packagereq type="mandatory">stratovirt</packagereq>
-     </packagelist>
-   </group>
-   <group>
-diff --git a/config/x86_64/normal.xml b/config/x86_64/normal.xml
-index 4ef88de..60c4704 100644
---- a/config/x86_64/normal.xml
-+++ b/config/x86_64/normal.xml
-@@ -1428,6 +1428,7 @@
-       <packagereq type="mandatory">qemu-help</packagereq>
-       <packagereq type="mandatory">qemu</packagereq>
-       <packagereq type="mandatory">qemu-img</packagereq>
-+      <packagereq type="mandatory">stratovirt</packagereq>
-     </packagelist>
-   </group>
-   <group>
--- 
-2.25.1
-

oemaker.spec

@@ -1,29 +1,35 @@
+%ifarch aarch64
+%global efi_aa64 1
+%endif
+
+%ifarch x86_64
+%global efi_x64 1
+%endif
+
 Name:           oemaker
-Summary:        a duilding tool for making DVD ISO
+Summary:        a duilding tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
-Version:        1.1.2
+Version:        2.0.0
-Release:        7
+Release:        1
 BuildRoot:      %{_tmppath}/%{name}
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-BuildArch:      noarch
 Requires:       createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2
 Requires:       lorax >= 19.6.78-1
 
-Patch0001: add-stratovirt-in-virtualization-group.patch
-Patch0002: 0001-change-source-iso-method.patch
-Patch0003: add-qemu-block-iscsi-in-virtualization-group.patch
-Patch0004: 0002-bug-fix-I3B7CH.patch
-Patch0005: 0003-add-exclude-rpm-sub-of-gimp-and-totem.patch
-Patch0006: 0004-delete-or-replace-rpms-which-are-not-exist.patch
-
 %description
-a building tool for making DVD ISO
+a building tool for DVD ISO making and ISO cutting
+
+%package -n isocut
+Summary: a building tool for ISO cutting
+Requires: yum dnf-utils createrepo file util-linux genisoimage isomd5sum grep bash libselinux-utils libxml2
+BuildRequires: bash
+
+%description -n isocut
+a building tool for ISO cutting
 
 %prep
 %setup -c
-cd %{_builddir}/%{name}-%{version}/%{name}
-%autopatch -p1
 
 %install
 mkdir -p %{buildroot}/opt/
@@ -32,38 +38,66 @@ mkdir -p %{buildroot}/opt/oemaker/config
 mkdir -p %{buildroot}/opt/oemaker/config/x86_64
 mkdir -p %{buildroot}/opt/oemaker/config/aarch64
 mkdir -p %{buildroot}/opt/oemaker/docs
+mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}/%{_sysconfdir}/isocut
+chmod 750 %{buildroot}/%{_sysconfdir}/isocut
 
-cd %{name}
+install -m 700 %{name}/isomaker/oemaker.sh %{buildroot}/opt/oemaker/oemaker.sh
-install -m 700 oemaker.sh %{buildroot}/opt/oemaker/oemaker.sh
+install -m 700 %{name}/isomaker/oemaker.sh %{buildroot}/%{_bindir}/oemaker
-install -m 700 make_debug.sh %{buildroot}/opt/oemaker/make_debug.sh
+install -m 700 %{name}/isomaker/make_debug.sh %{buildroot}/opt/oemaker/make_debug.sh
-install -m 700 img_repo.sh %{buildroot}/opt/oemaker/img_repo.sh
+install -m 700 %{name}/isomaker/img_repo.sh %{buildroot}/opt/oemaker/img_repo.sh
-install -m 700 init.sh %{buildroot}/opt/oemaker/init.sh
+install -m 700 %{name}/isomaker/init.sh %{buildroot}/opt/oemaker/init.sh
-install -m 700 iso.sh %{buildroot}/opt/oemaker/iso.sh
+install -m 700 %{name}/isomaker/iso.sh %{buildroot}/opt/oemaker/iso.sh
-install -m 700 rpm.sh %{buildroot}/opt/oemaker/rpm.sh
+install -m 700 %{name}/isomaker/rpm.sh %{buildroot}/opt/oemaker/rpm.sh
-install -m 400 config/rpmlist.xml %{buildroot}/opt/oemaker/config/rpmlist.xml
+install -m 400 %{name}/isomaker/config/rpmlist.xml %{buildroot}/opt/oemaker/config/rpmlist.xml
-install -m 400 config/x86_64/* %{buildroot}/opt/oemaker/config/x86_64/
+install -m 400 %{name}/isomaker/config/x86_64/* %{buildroot}/opt/oemaker/config/x86_64/
-install -m 400 config/aarch64/* %{buildroot}/opt/oemaker/config/aarch64/
+install -m 400 %{name}/isomaker/config/aarch64/* %{buildroot}/opt/oemaker/config/aarch64/
-install -m 700 docs/* %{buildroot}/opt/oemaker/docs/
+install -m 700 %{name}/isomaker/docs/* %{buildroot}/opt/oemaker/docs/
-cp -a 80-openeuler %{buildroot}/opt/oemaker/
+cp -a %{name}/isomaker/80-openeuler %{buildroot}/opt/oemaker/
-cd -
+
+
+install -m 550 %{name}/isocut/isocut.py %{buildroot}/%{_bindir}/isocut
+install -m 600 %{name}/isocut/config/repodata.template %{buildroot}/%{_sysconfdir}/isocut/
+
+%if 0%{?efi_aa64}
+    install -m 600 %{name}/isocut/config/aarch64/rpmlist %{buildroot}/%{_sysconfdir}/isocut/
+    install -m 600 %{name}/isocut/config/aarch64/anaconda-ks.cfg %{buildroot}/%{_sysconfdir}/isocut/
+%endif
+
+%if 0%{?efi_x64}
+    install -m 600 %{name}/isocut/config/x86_64/rpmlist %{buildroot}/%{_sysconfdir}/isocut/
+    install -m 600 %{name}/isocut/config/x86_64/anaconda-ks.cfg %{buildroot}/%{_sysconfdir}/isocut/
+%endif
 
 %pre
 
 %post
-ln -s /opt/oemaker/oemaker.sh /bin/oemaker
 
 %preun
 
 %postun
-rm -r /bin/oemaker
-rm -rf /opt/oemaker
 
+%postun -n isocut
+if [ "$1" = "0" ]; then
+  rm -rf %{_sysconfdir}/isocut/*
+fi
 
 %files
 %defattr(-,root,root)
 %dir /opt
 %dir /opt/oemaker
 /opt/oemaker/*
+%{_bindir}/oemaker
+
+%files -n isocut
+%defattr(-,root,root)
+%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/repodata.template
+%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/rpmlist
+%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/anaconda-ks.cfg
+%{_bindir}/isocut
+%dir %{_sysconfdir}/isocut
+%{_sysconfdir}/isocut/*
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT/*
@@ -71,6 +105,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Fri Mar 19 2021 zhuchunyi <zhuchunyi@huawei.com> - 2.0.0-1
+- ID:NA
+- SUG:NA
+- DESC: upgrade version
+
 * Sat Mar 17 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-7
 - ID:NA
 - SUG:NA