!328 fix bug IABY7K
From: @wangchong1995924 Reviewed-by: @t_feng Signed-off-by: @t_feng
This commit is contained in:
commit
5f2e27f034
31
0001-bugfix-IABY7K.patch
Normal file
31
0001-bugfix-IABY7K.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From 52f60354b4d48a0b3c2a25ddabb10a47073bfb0c Mon Sep 17 00:00:00 2001
|
||||||
|
From: wangchong1995924 <15229716099@163.com>
|
||||||
|
Date: Wed, 10 Jul 2024 15:28:00 +0800
|
||||||
|
Subject: [PATCH] fix issue IABY7K
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh
|
||||||
|
index a9efe4b..b2ba4de 100644
|
||||||
|
--- a/isomaker/rpm.sh
|
||||||
|
+++ b/isomaker/rpm.sh
|
||||||
|
@@ -185,7 +185,7 @@ function get_desktop_rpms()
|
||||||
|
|
||||||
|
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
|
||||||
|
@@ -259,7 +259,7 @@ function everything_source_rpms_download()
|
||||||
|
function everything_debug_rpms_download()
|
||||||
|
{
|
||||||
|
mkdir ${EVERY_DEBUG_DIR}
|
||||||
|
- yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "debuginfo|debugsource" > ava_debug_lst
|
||||||
|
+ yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "debuginfo\.|debugsource\." > ava_debug_lst
|
||||||
|
parse_rpmlist_xml "everything_debug_exclude"
|
||||||
|
cat parsed_rpmlist_everything_debug_exclude
|
||||||
|
if [ -s parsed_rpmlist_everything_debug_exclude ];then
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -11,7 +11,7 @@ Summary: a building tool for DVD ISO making and ISO cutting
|
|||||||
License: Mulan PSL v2
|
License: Mulan PSL v2
|
||||||
Group: System/Management
|
Group: System/Management
|
||||||
Version: 3.1.0
|
Version: 3.1.0
|
||||||
Release: 7
|
Release: 8
|
||||||
BuildRoot: %{_tmppath}/%{name}
|
BuildRoot: %{_tmppath}/%{name}
|
||||||
|
|
||||||
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
@ -27,6 +27,7 @@ Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libs
|
|||||||
Requires: lorax >= 19.6.78-1
|
Requires: lorax >= 19.6.78-1
|
||||||
|
|
||||||
# Patch here
|
# Patch here
|
||||||
|
Patch0001: 0001-bugfix-IABY7K.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
a building tool for DVD ISO making and ISO cutting
|
a building tool for DVD ISO making and ISO cutting
|
||||||
@ -172,6 +173,11 @@ rm -rf %{buildroot}
|
|||||||
rm -rf $RPM_BUILD_DIR/%{name}
|
rm -rf $RPM_BUILD_DIR/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 10 2024 wangchong <wangchong56@huawei.com> - 3.1.0-8
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC: fix issue IABY7K
|
||||||
|
|
||||||
* Thu Mar 28 2024 mayunlong <mayunlong6@huawei.com> - 3.1.0-7
|
* Thu Mar 28 2024 mayunlong <mayunlong6@huawei.com> - 3.1.0-7
|
||||||
- ID:NA
|
- ID:NA
|
||||||
- SUG:NA
|
- SUG:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user