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

replace rsyslog-gnutls by rsyslog

Browse Source
This commit is contained in:
miao_kaibo 2021-03-21 18:40:02 +08:00
parent 73e575ca9e
commit a16e4bb99c
2 changed files with 92 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
0001-replace-rsyslog-gnutls-by-rsyslog.patch Normal file
View File

@ -0,0 +1,82 @@
From 514f66a2d6da4f75aac4d1a0261fe3d5137f76df Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Sun, 21 Mar 2021 18:25:35 +0800
Subject: [PATCH] replace rsyslog-gnutls by rsyslog
---
isomaker/config/aarch64/normal.xml | 3 ---
isomaker/config/rpmlist.xml | 1 -
isomaker/config/x86_64/normal.xml | 3 ---
3 files changed, 7 deletions(-)
diff --git a/isomaker/config/aarch64/normal.xml b/isomaker/config/aarch64/normal.xml
index 35350f7..12ed45f 100644
--- a/isomaker/config/aarch64/normal.xml
+++ b/isomaker/config/aarch64/normal.xml
@@ -912,7 +912,6 @@
<packagereq type="default">freeradius</packagereq>
<packagereq type="optional">libreswan</packagereq>
<packagereq type="optional">radvd</packagereq>
- <packagereq type="optional">rsyslog-gnutls</packagereq>
<packagereq type="optional">rsyslog</packagereq>
<packagereq type="optional">rsyslog-mysql</packagereq>
<packagereq type="optional">rsyslog-pgsql</packagereq>
@@ -938,7 +937,6 @@
<packagereq type="optional">freeradius</packagereq>
<packagereq type="optional">libreswan</packagereq>
<packagereq type="optional">radvd</packagereq>
- <packagereq type="optional">rsyslog-gnutls</packagereq>
<packagereq type="optional">rsyslog</packagereq>
<packagereq type="optional">rsyslog-mysql</packagereq>
<packagereq type="optional">rsyslog-pgsql</packagereq>
@@ -1316,7 +1314,6 @@
<packagereq type="default">libstoragemgmt</packagereq>
<packagereq type="default">nano</packagereq>
<packagereq type="default">rng-tools</packagereq>
- <packagereq type="mandatory">rsyslog-gnutls</packagereq>
<packagereq type="mandatory">rsyslog</packagereq>
<packagereq type="mandatory">rsyslog-relp</packagereq>
<packagereq type="default">nmap</packagereq>
diff --git a/isomaker/config/rpmlist.xml b/isomaker/config/rpmlist.xml
index 23671de..b2fbe3a 100644
--- a/isomaker/config/rpmlist.xml
+++ b/isomaker/config/rpmlist.xml
@@ -1184,7 +1184,6 @@
<packagereq>rsyslog</packagereq>
<packagereq>rsyslog-crypto</packagereq>
<packagereq>rsyslog-elasticsearch</packagereq>
- <packagereq>rsyslog-gnutls</packagereq>
<packagereq>rsyslog-help</packagereq>
<packagereq>rsyslog-mmaudit</packagereq>
<packagereq>rsyslog-mmjsonparse</packagereq>
diff --git a/isomaker/config/x86_64/normal.xml b/isomaker/config/x86_64/normal.xml
index 588e66e..366e32e 100644
--- a/isomaker/config/x86_64/normal.xml
+++ b/isomaker/config/x86_64/normal.xml
@@ -915,7 +915,6 @@
<packagereq type="optional">freeradius</packagereq>
<packagereq type="optional">libreswan</packagereq>
<packagereq type="optional">radvd</packagereq>
- <packagereq type="optional">rsyslog-gnutls</packagereq>
<packagereq type="optional">rsyslog</packagereq>
<packagereq type="optional">rsyslog-mysql</packagereq>
<packagereq type="optional">rsyslog-pgsql</packagereq>
@@ -941,7 +940,6 @@
<packagereq type="optional">freeradius</packagereq>
<packagereq type="optional">libreswan</packagereq>
<packagereq type="optional">radvd</packagereq>
- <packagereq type="optional">rsyslog-gnutls</packagereq>
<packagereq type="optional">rsyslog</packagereq>
<packagereq type="optional">rsyslog-mysql</packagereq>
<packagereq type="optional">rsyslog-pgsql</packagereq>
@@ -1320,7 +1318,6 @@
<packagereq type="default">libstoragemgmt</packagereq>
<packagereq type="default">nano</packagereq>
<packagereq type="default">rng-tools</packagereq>
- <packagereq type="mandatory">rsyslog-gnutls</packagereq>
<packagereq type="mandatory">rsyslog</packagereq>
<packagereq type="mandatory">rsyslog-relp</packagereq>
<packagereq type="default">nmap</packagereq>
--
2.27.0

11
oemaker.spec
View File

@ -11,12 +11,14 @@ Summary: a duilding tool for DVD ISO making and ISO cutting
License: Mulan PSL v2
Group: System/Management
Version: 2.0.0
Release: 1
Release: 2
BuildRoot: %{_tmppath}/%{name}
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2
Requires: lorax >= 19.6.78-1
Patch0001: 0001-replace-rsyslog-gnutls-by-rsyslog.patch
%description
a building tool for DVD ISO making and ISO cutting
@ -30,6 +32,8 @@ a building tool for ISO cutting
%prep
%setup -c
cd %{_builddir}/%{name}-%{version}/%{name}
%autopatch -p1
%install
mkdir -p %{buildroot}/opt/
@ -105,6 +109,11 @@ rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name}
%changelog
* Sun Mar 21 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-2
- ID:NA
- SUG:NA
- DESC: replace rsyslog-gnutls by rsyslog
* Fri Mar 19 2021 zhuchunyi <zhuchunyi@huawei.com> - 2.0.0-1
- ID:NA
- SUG:NA