diff --git a/0004-rename-source-iso.patch b/0004-rename-source-iso.patch new file mode 100644 index 0000000000000000000000000000000000000000..3415e0bfd090489c2f98f252d3dec8630e2845b2 --- /dev/null +++ b/0004-rename-source-iso.patch @@ -0,0 +1,34 @@ +From 9693dae6c8173bb7277fa150e1a262a7f5d984e3 Mon Sep 17 00:00:00 2001 +From: miao_kaibo +Date: Fri, 2 Apr 2021 11:04:14 +0800 +Subject: [PATCH] rename source iso + +--- + init.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/init.sh b/init.sh +index f708555..2603bfb 100755 +--- a/init.sh ++++ b/init.sh +@@ -112,7 +112,7 @@ function global_var_init() + DBG_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-debug-${ARCH}-dvd.iso" + EVE_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-everything-${ARCH}-dvd.iso" + EVE_DEBUG_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-everything-debug-${ARCH}-dvd.iso" +- EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-everything-source-dvd.iso" ++ EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-source-dvd.iso" + NETINST_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-netinst-${ARCH}-dvd.iso" + else + RELEASE_NAME="${PRODUCT}-${VERSION}-${ARCH}" +@@ -121,7 +121,7 @@ function global_var_init() + DBG_ISO_NAME="${PRODUCT}-${VERSION}-debug-${ARCH}-dvd.iso" + EVE_ISO_NAME="${PRODUCT}-${VERSION}-everything-${ARCH}-dvd.iso" + EVE_DEBUG_ISO_NAME="${PRODUCT}-${VERSION}-everything-debug-${ARCH}-dvd.iso" +- EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-everything-source-dvd.iso" ++ EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-source-dvd.iso" + NETINST_ISO_NAME="${PRODUCT}-${VERSION}-netinst-${ARCH}-dvd.iso" + fi + +-- +2.30.0 + diff --git a/oemaker.spec b/oemaker.spec index 4223bcbdf300f1c53b059e7150d1d4b2f6af869f..d8260e9fababe5392d124d51c615ce11fee5d0e9 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -3,7 +3,7 @@ Summary: a duilding tool for making DVD ISO License: Mulan PSL v2 Group: System/Management Version: 1.1.2 -Release: 6 +Release: 7 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch @@ -13,6 +13,7 @@ Requires: lorax >= 19.6.78-1 Patch0001: 0001-change-source-iso-method.patch Patch0002: 0002-bug-fix-I3B7CH.patch Patch0003: 0003-remove-atlas.patch +Patch0004: 0004-rename-source-iso.patch %description a building tool for making DVD ISO @@ -68,6 +69,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Fri Apr 2 2021 miao_kaibo - 1.1.2-7 +- ID:NA +- SUG:NA +- DESC: remove atlas + * Thu Mar 25 2021 xinghe - 1.1.2-6 - ID:NA - SUG:NA