!23 fix bug I3B7CH

From: @miao_kaibo
Reviewed-by: @zhuchunyi
Signed-off-by: @zhuchunyi
This commit is contained in:
openeuler-ci-bot 2021-03-15 10:58:05 +08:00 committed by Gitee
commit f73ee8404f
2 changed files with 32 additions and 1 deletions

25
0002-bug-fix-I3B7CH.patch Normal file
View File

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

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: 4
Release: 5
BuildRoot: %{_tmppath}/%{name}
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildArch: noarch
@ -13,6 +13,7 @@ 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
%description
a building tool for making DVD ISO
@ -68,6 +69,11 @@ rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name}
%changelog
* Sat Mar 13 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-5
- ID:NA
- SUG:NA
- DESC: fix bug I3B7CH
* Thu MAR 10 2021 Chen Qun <kuhn.chenqun@huawei.com> - 1.1.2-4
- ID:NA
- SUG:NA