From 6153efff71f3d1e53fa0b7d1363b4534f360467d Mon Sep 17 00:00:00 2001 From: shellsheer Date: Mon, 30 Aug 2021 17:37:17 +0800 Subject: [PATCH 1/3] Bug fix I3OGUT --- oemaker.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/oemaker.spec b/oemaker.spec index 10c26f0..0857199 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -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 -- Gitee From 84148923070c009569decb8f19c2bde0fc4185b6 Mon Sep 17 00:00:00 2001 From: shellsheer Date: Mon, 30 Aug 2021 17:51:06 +0800 Subject: [PATCH 2/3] add patch file which is missed in last ci --- 0003-bugfix-I3OGUT.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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..ac1651f --- /dev/null +++ b/0003-bugfix-I3OGUT.patch @@ -0,0 +1,17 @@ +From: shellsheer +Date: Mon 30 Aug 2021 05:31:36 PM CST +Subject: [PATCH] bugfix I3OGUT + + +diff -Naru oemaker/isomaker/img_repo.sh oemaker_m/isomaker/img_repo.sh +--- oemaker/isomaker/img_repo.sh 2021-03-19 15:31:05.000000000 +0800 ++++ oemaker_m/isomaker/img_repo.sh 2021-08-30 17:23:27.099115599 +0800 +@@ -19,7 +19,7 @@ + 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 ++ 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 [ $? != 0 ] ; then + cat lorax.logfile -- Gitee From ef61eb9ee1816fd6509c265b4873109816e603bb Mon Sep 17 00:00:00 2001 From: shellsheer Date: Thu, 2 Sep 2021 01:26:11 +0000 Subject: [PATCH 3/3] update oemaker.spec. --- oemaker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oemaker.spec b/oemaker.spec index 0857199..d7e8277 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 -- Gitee