diff --git a/0002-bug-fix-I3B7CH.patch b/0002-bug-fix-I3B7CH.patch new file mode 100644 index 0000000000000000000000000000000000000000..6880f6aa836172fd386e331f76bde4bc7aeed4b0 --- /dev/null +++ b/0002-bug-fix-I3B7CH.patch @@ -0,0 +1,25 @@ +From 78879f08b31ea910e7b39b512a74986788645769 Mon Sep 17 00:00:00 2001 +From: miao_kaibo +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 + diff --git a/oemaker.spec b/oemaker.spec index cf8e7813af006035a6e23cce944f091ba6c97abb..fd32c6c7bf4a651fbe061b5f41e221563fbca688 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: 4 +Release: 5 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch @@ -11,6 +11,7 @@ Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libs Requires: lorax >= 19.6.78-1 Patch0001: 0001-change-source-iso-method.patch +Patch0002: 0002-bug-fix-I3B7CH.patch %description a building tool for making DVD ISO @@ -66,6 +67,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Sat Mar 13 2021 miao_kaibo - 1.1.2-5 +- ID:NA +- SUG:NA +- DESC: fix bug I3B7CH + * Thu Mar 11 2021 miao_kaibo - 1.1.2-4 - ID:NA - SUG:NA