From d72886b9ac2ca095c5b2c618a9b4d626b1bea90a Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Tue, 12 Oct 2021 09:51:56 +0800
Subject: [PATCH] bugfix I3OGUT

---
 0003-bugfix-I3OGUT.patch | 30 ++++++++++++++++++++++++++++++
 oemaker.spec             |  8 +++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 0003-bugfix-I3OGUT.patch

diff --git a/0003-bugfix-I3OGUT.patch b/0003-bugfix-I3OGUT.patch
new file mode 100644
index 0000000..156e21b
--- /dev/null
+++ b/0003-bugfix-I3OGUT.patch
@@ -0,0 +1,30 @@
+From 3cadfeb2b540ed0d88bd25c4848387659096a6cd Mon Sep 17 00:00:00 2001
+From: miao_kaibo <miaokaibo@outlook.com>
+Date: Tue, 12 Oct 2021 09:40:30 +0800
+Subject: [PATCH] bugfix I3OGUT
+
+---
+ isomaker/img_repo.sh | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/isomaker/img_repo.sh b/isomaker/img_repo.sh
+index 5403724..a226220 100755
+--- a/isomaker/img_repo.sh
++++ b/isomaker/img_repo.sh
+@@ -19,7 +19,12 @@ set -e
+ function create_install_img()
+ {
+     echo "$YUMREPO" > yumrepo.file
+-    lorax --isfinal -p "${PRODUCT}" -v "${VERSION}${RELEASE}" -r "${RELEASE}" -t "${VARIANT}" --sharedir 80-openeuler --rootfs-size=4 --buildarch="$ARCH" $(cat yumrepo.file) --nomacboot --noupgrade "${BUILD}"/iso > lorax.logfile 2>&1
++    if [ -n "${RELEASE}" ];then
++        vertmp="${VERSION}-${RELEASE}"
++    else
++        vertmp=${VERSION}
++    fi
++    lorax --isfinal -p "${PRODUCT}" -v "${vertmp}" -r "${RELEASE}" -t "${VARIANT}" --sharedir 80-openeuler --rootfs-size=4 --buildarch="$ARCH" $(cat yumrepo.file) --nomacboot --noupgrade "${BUILD}"/iso > lorax.logfile 2>&1
+ 
+     if [ $? != 0 ] ; then
+         cat lorax.logfile
+-- 
+2.30.0
+
diff --git a/oemaker.spec b/oemaker.spec
index 1f6a34b..053ddc8 100644
--- a/oemaker.spec
+++ b/oemaker.spec
@@ -11,7 +11,7 @@ Summary:        a duilding tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
 Version:        2.0.0
-Release:        4
+Release:        5
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -24,6 +24,7 @@ Requires:       lorax >= 19.6.78-1
 
 Patch0001:	0001-rename-source-iso.patch
 Patch0002:	0002-bugfix-I3QY98.patch
+Patch0003:	0003-bugfix-I3OGUT.patch
 
 %description
 a building tool for DVD ISO making and ISO cutting
@@ -121,6 +122,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Tue Oct 12 2021 lingsheng <miaokaibo@outlook.com> - 2.0.0-5
+- ID:NA
+- SUG:NA
+- DESC: bugfix I3OGUT
+
 * Wed Aug 25 2021 lingsheng <lingsheng@huawei.com> - 2.0.0-4
 - ID:NA
 - SUG:NA
-- 
Gitee