diff --git a/0003-bugfix-I3OGUT.patch b/0003-bugfix-I3OGUT.patch new file mode 100644 index 0000000000000000000000000000000000000000..156e21b066caf1513f510d7bd7955c7e4e0da140 --- /dev/null +++ b/0003-bugfix-I3OGUT.patch @@ -0,0 +1,30 @@ +From 3cadfeb2b540ed0d88bd25c4848387659096a6cd Mon Sep 17 00:00:00 2001 +From: miao_kaibo +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 96daa326becfc2419dfce0d8752eecececa53d46..8d05b0403d9c0a7b8614a5ff2d642d94d8f0935e 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: 7 +Release: 8 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 miao_kaibo - 2.0.0-8 +- ID:NA +- SUG:NA +- DESC: bugfix I3OGUT + * Thu Aug 12 2021 miao_kaibo - 2.0.0-7 - ID:NA - SUG:NA