!82 bugfix I3OGUT
From: @miao_kaibo Reviewed-by: @yanan-rock Signed-off-by: @yanan-rock
This commit is contained in:
commit
4543b1ce1e
30
0004-bugfix-I3OGUT.patch
Normal file
30
0004-bugfix-I3OGUT.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
From 50e167a8084b3130835cc18a6b67f448a1fe02f1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: miao_kaibo <miaokaibo@outlook.com>
|
||||||
|
Date: Thu, 14 Oct 2021 09:18: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 0865815..cfb35f8 100755
|
||||||
|
--- a/isomaker/img_repo.sh
|
||||||
|
+++ b/isomaker/img_repo.sh
|
||||||
|
@@ -30,7 +30,12 @@ function create_install_img()
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "${tmprep}" > 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
|
||||||
|
|
||||||
@ -11,7 +11,7 @@ Summary: a duilding tool for DVD ISO making and ISO cutting
|
|||||||
License: Mulan PSL v2
|
License: Mulan PSL v2
|
||||||
Group: System/Management
|
Group: System/Management
|
||||||
Version: 2.0.0
|
Version: 2.0.0
|
||||||
Release: 8
|
Release: 9
|
||||||
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: lorax >= 19.6.78-1
|
|||||||
Patch0001: 0001-rename-source-iso.patch
|
Patch0001: 0001-rename-source-iso.patch
|
||||||
Patch0002: 0002-bugfix-I3QY98.patch
|
Patch0002: 0002-bugfix-I3QY98.patch
|
||||||
Patch0003: 0003-change-for-edge-computing.patch
|
Patch0003: 0003-change-for-edge-computing.patch
|
||||||
|
Patch0004: 0004-bugfix-I3OGUT.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
a building tool for DVD ISO making and ISO cutting
|
a building tool for DVD ISO making and ISO cutting
|
||||||
@ -128,6 +129,11 @@ rm -rf %{buildroot}
|
|||||||
rm -rf $RPM_BUILD_DIR/%{name}
|
rm -rf $RPM_BUILD_DIR/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 14 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-9
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC: bugfix I3OGUT
|
||||||
|
|
||||||
* Tue Sep 28 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-8
|
* Tue Sep 28 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-8
|
||||||
- ID:NA
|
- ID:NA
|
||||||
- SUG:NA
|
- SUG:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user