packages/oemaker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!33 delete rpms which are not exist

Browse Source 
From: @miao_kaibo
Reviewed-by: @zhuchunyi
Signed-off-by: @zhuchunyi
This commit is contained in:
openeuler-ci-bot 2021-03-17 19:09:10 +08:00 committed by Gitee
commit e0d328946c
2 changed files with 421 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

414
0004-delete-or-replace-rpms-which-are-not-exist.patch Normal file
View File

@ -0,0 +1,414 @@
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

8
oemaker.spec
View File

@ -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 <miaokaibo@outlook.com> - 1.1.2-7
- ID:NA
- SUG:NA
- DESC: delete or replace rpms which are not exist
* Sat Mar 13 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-6
- ID:NA
- SUG:NA