From f4c4d9857aa1efefc157ff63424908d6d8c30a8a Mon Sep 17 00:00:00 2001 From: miao_kaibo Date: Wed, 17 Mar 2021 15:31:50 +0800 Subject: [PATCH] delete or replace rpms which are not exist --- ...-or-replace-rpms-which-are-not-exist.patch | 414 ++++++++++++++++++ oemaker.spec | 8 +- 2 files changed, 421 insertions(+), 1 deletion(-) create mode 100644 0004-delete-or-replace-rpms-which-are-not-exist.patch diff --git a/0004-delete-or-replace-rpms-which-are-not-exist.patch b/0004-delete-or-replace-rpms-which-are-not-exist.patch new file mode 100644 index 0000000..4d797b3 --- /dev/null +++ b/0004-delete-or-replace-rpms-which-are-not-exist.patch @@ -0,0 +1,414 @@ +From a7ec3063ac10f0a2bbb2a2d074cde4181cd7d038 Mon Sep 17 00:00:00 2001 +From: miao_kaibo +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 @@ + mdadm + realmd + shim-aa64 +- teamd ++ libteam + tmux + xfsprogs + authselect-compat +@@ -151,7 +151,7 @@ + bc + cpio + crontabs +- cyrus-sasl-plain ++ cyrus-sasl + dbus + ed + file +@@ -197,7 +197,7 @@ + smartmontools + sssd + strace +- teamd ++ libteam + time + unzip + usbutils +@@ -282,9 +282,8 @@ + rpm + selinux-policy-targeted + setup +- shadow-utils +- sssd-common +- sssd-kcm ++ shadow ++ sssd + sudo + systemd + tuned +@@ -297,14 +296,12 @@ + openEuler-performance + openEuler-latest-release + NetworkManager +- NetworkManager-team +- NetworkManager-tui + NetworkManager-config-server + authselect + dnf-plugins-core + dracut-config-rescue + kernel-tools +- libsysfs ++ sysfsutils + linux-firmware + lshw + lsscsi +@@ -355,11 +352,9 @@ + make + patch + pkgconf +- pkgconf-m4 +- pkgconf-pkg-config + openEuler-rpm-config + rpm-build +- rpm-sign ++ rpm + asciidoc + byacc + ctags +@@ -446,7 +441,6 @@ + samba-winbind + samba-winbind-clients + sssd-dbus +- sssd-kcm + sssd-tools + sssd-winbind-idmap + +@@ -732,11 +726,7 @@ + true + + PackageKit +- cockpit-packagekit +- cockpit-storaged +- cockpit-bridge +- cockpit-system +- cockpit-ws ++ cockpit + openssh-server + sscg + +@@ -923,7 +913,7 @@ + libreswan + radvd + rsyslog-gnutls +- rsyslog-gssapi ++ rsyslog + rsyslog-mysql + rsyslog-pgsql + rsyslog-relp +@@ -949,7 +939,7 @@ + libreswan + radvd + rsyslog-gnutls +- rsyslog-gssapi ++ rsyslog + rsyslog-mysql + rsyslog-pgsql + rsyslog-relp +@@ -967,7 +957,7 @@ + NetworkManager-bluetooth + NetworkManager-wifi + NetworkManager-wwan +- dhcp-client ++ dhcp + iptables + dnsmasq + +@@ -1232,9 +1222,9 @@ + openEuler-release + openEuler-performance + timedatex +- dhcp-client ++ dhcp + NetworkManager-config-server +- NetworkManager-team ++ NetworkManager + + + +@@ -1266,7 +1256,7 @@ + bc + cpio + crontabs +- cyrus-sasl-plain ++ cyrus-sasl + dbus + ed + file +@@ -1307,7 +1297,7 @@ + smartmontools + sssd + strace +- teamd ++ libteam + time + unzip + usbutils +@@ -1327,9 +1317,9 @@ + nano + rng-tools + rsyslog-gnutls +- rsyslog-gssapi ++ rsyslog + rsyslog-relp +- nmap-ncat ++ nmap + pinfo + plymouth + tcpdump +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 @@ + clutter-gtk-help + clutter-help + cockpit +- cockpit-bridge + cockpit-help +- cockpit-storaged +- cockpit-ws + cogl + cogl-help + color-filesystem +@@ -251,7 +248,6 @@ + cyrus-sasl-lib + cyrus-sasl-md5 + cyrus-sasl-ntlm +- cyrus-sasl-plain + cyrus-sasl-scram + dbus + dbus-glib +@@ -259,7 +255,7 @@ + dbus-python-help + device-mapper + device-mapper-event +- dhcp-client ++ dhcp + dhcp-common + dhcp-libs + dhcp-server +@@ -1049,8 +1045,6 @@ + pkcs11-helper-help + pkgconf + pkgconf-help +- pkgconf-m4 +- pkgconf-pkg-config + plymouth + plymouth-help + policycoreutils +@@ -1185,14 +1179,12 @@ + rpm-plugin-systemd-inhibit + rpmrebuild + rpmrebuild-help +- rpm-sign + rsync + rsync-help + rsyslog + rsyslog-crypto + rsyslog-elasticsearch + rsyslog-gnutls +- rsyslog-gssapi + rsyslog-help + rsyslog-mmaudit + rsyslog-mmjsonparse +@@ -1227,7 +1219,7 @@ + sgml-common + sgml-common-help + shadow-help +- shadow-utils ++ shadow + shared-mime-info + shared-mime-info-help + sharutils +@@ -1251,9 +1243,7 @@ + squid + sssd + sssd-client +- sssd-common + sssd-help +- sssd-kcm + sssd-nfs-idmap + strace + strongswan +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 @@ + mdadm + realmd + shim +- teamd ++ libteam + tmux + xfsprogs + authselect-compat +@@ -151,7 +151,7 @@ + bc + cpio + crontabs +- cyrus-sasl-plain ++ cyrus-sasl + dbus + ed + file +@@ -197,7 +197,7 @@ + smartmontools + sssd + strace +- teamd ++ libteam + time + unzip + usbutils +@@ -285,9 +285,8 @@ + rpm + selinux-policy-targeted + setup +- shadow-utils +- sssd-common +- sssd-kcm ++ shadow ++ sssd + sudo + systemd + tuned +@@ -297,14 +296,12 @@ + yum + wget + NetworkManager +- NetworkManager-team +- NetworkManager-tui + NetworkManager-config-server + authselect + dnf-plugins-core + dracut-config-rescue + kernel-tools +- libsysfs ++ sysfsutils + linux-firmware + lshw + lsscsi +@@ -355,11 +352,9 @@ + make + patch + pkgconf +- pkgconf-m4 +- pkgconf-pkg-config + openEuler-rpm-config + rpm-build +- rpm-sign ++ rpm + asciidoc + byacc + ctags +@@ -446,7 +441,6 @@ + samba-winbind + samba-winbind-clients + sssd-dbus +- sssd-kcm + sssd-tools + sssd-winbind-idmap + +@@ -732,11 +726,8 @@ + true + + PackageKit +- cockpit-packagekit +- cockpit-storaged +- cockpit-bridge +- cockpit-system +- cockpit-ws ++ cockpit ++ cockpit + openssh-server + sscg + +@@ -925,7 +916,7 @@ + libreswan + radvd + rsyslog-gnutls +- rsyslog-gssapi ++ rsyslog + rsyslog-mysql + rsyslog-pgsql + rsyslog-relp +@@ -951,7 +942,7 @@ + libreswan + radvd + rsyslog-gnutls +- rsyslog-gssapi ++ rsyslog + rsyslog-mysql + rsyslog-pgsql + rsyslog-relp +@@ -969,7 +960,7 @@ + NetworkManager-bluetooth + NetworkManager-wifi + NetworkManager-wwan +- dhcp-client ++ dhcp + iptables + dnsmasq + +@@ -1234,9 +1225,9 @@ + openEuler-performance + openEuler-latest-release + timedatex +- dhcp-client ++ dhcp + NetworkManager-config-server +- NetworkManager-team ++ NetworkManager + + + +@@ -1268,7 +1259,7 @@ + bc + cpio + crontabs +- cyrus-sasl-plain ++ cyrus-sasl + dbus + ed + file +@@ -1310,7 +1301,7 @@ + smartmontools + sssd + strace +- teamd ++ libteam + time + unzip + usbutils +@@ -1330,9 +1321,9 @@ + nano + rng-tools + rsyslog-gnutls +- rsyslog-gssapi ++ rsyslog + rsyslog-relp +- nmap-ncat ++ nmap + pinfo + plymouth + tcpdump +-- +2.30.0 + diff --git a/oemaker.spec b/oemaker.spec index 9a8f455..bbd2e73 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -3,7 +3,7 @@ Summary: a duilding tool for making DVD ISO License: Mulan PSL v2 Group: System/Management Version: 1.1.2 -Release: 6 +Release: 7 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch @@ -15,6 +15,7 @@ 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 @@ -70,6 +71,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Sat Mar 17 2021 miao_kaibo - 1.1.2-7 +- ID:NA +- SUG:NA +- DESC: delete or replace rpms which are not exist + * Sat Mar 16 2021 miao_kaibo - 1.1.2-6 - ID:NA - SUG:NA -- Gitee