From 0d8a194e13ce8a58a5104486bc2773427b8936ce Mon Sep 17 00:00:00 2001
From: wangchong1995924 <15229716099@163.com>
Date: Wed, 10 Jul 2024 17:40:45 +0800
Subject: [PATCH] fix bug IABY7K

---
 0009-bugfix-IABY7K.patch | 31 +++++++++++++++++++++++++++++++
 oemaker.spec             |  8 +++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 0009-bugfix-IABY7K.patch

diff --git a/0009-bugfix-IABY7K.patch b/0009-bugfix-IABY7K.patch
new file mode 100644
index 0000000..2c1d33c
--- /dev/null
+++ b/0009-bugfix-IABY7K.patch
@@ -0,0 +1,31 @@
+From 6c40ee80b6b3e5a723506cad70571347e5bae53e Mon Sep 17 00:00:00 2001
+From: wangchong1995924 <15229716099@163.com>
+Date: Thu, 11 Jul 2024 10:41:41 +0800
+Subject: [PATCH] fix issue IABY7K
+
+
+diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh
+index 85b1042..fde30a0 100644
+--- a/isomaker/rpm.sh
++++ b/isomaker/rpm.sh
+@@ -167,7 +167,7 @@ function get_edge_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
+@@ -241,7 +241,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
+     yumdownloader --resolve --installroot="${BUILD}"/tmp --destdir="${EVERY_DEBUG_DIR}" $(cat ava_debug_lst | tr '\n' ' ')
+     if [ $? != 0 ] || [ $(ls ${EVERY_DEBUG_DIR} | wc -l) == 0 ]; then
+         echo "yumdownloader with --resolve failed, trying to yumdownloader without --resolve"
+-- 
+2.27.0
+
diff --git a/oemaker.spec b/oemaker.spec
index ab1bec4..d2b010a 100644
--- a/oemaker.spec
+++ b/oemaker.spec
@@ -11,7 +11,7 @@ Summary:        a building tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
 Version:        2.0.3
-Release:        11
+Release:        12
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -32,6 +32,7 @@ Patch0005:	0005-add-fpi_tail-param-for-grub.patch
 Patch0006:	0006-support-usb-flash-drive-mode.patch
 Patch0007:	0007-restore-env-after-selinux-status-changes.patch
 Patch0008:	0008-automated-kickstart-function.patch
+Patch0009:	0009-bugfix-IABY7K.patch
 
 %description
 a building tool for DVD ISO making and ISO cutting
@@ -135,6 +136,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Wed Jul 10 2024 wangchong <wangchong56@huawei.com> - 2.0.3-12
+- ID:NA
+- SUG:NA
+- DESC: fix issue IABY7K
+
 * Mon Oct 23 2023 chenhuihan <chenhuihan@huawei.com> - 2.0.3-11
 - ID:NA
 - SUG:NA
-- 
Gitee