!223 fix make edge iso error

From: @wangchong1995924 
Reviewed-by: @zhuchunyi 
Signed-off-by: @zhuchunyi
This commit is contained in:
openeuler-ci-bot 2023-04-20 01:46:18 +00:00 committed by Gitee
commit 182f245fb2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 30 additions and 2 deletions

View File

@ -0,0 +1,22 @@
From 6d04f0dd0695b0408ed499fb98213eb6ba52139b Mon Sep 17 00:00:00 2001
From: wangchong1995924 <15229716099@163.com>
Date: Wed, 19 Apr 2023 15:18:17 +0800
Subject: [PATCH] fix make edge iso error
diff --git a/isomaker/80-openeuler/runtime-install.tmpl b/isomaker/80-openeuler/runtime-install.tmpl
index 1856aff..a6144bf 100644
--- a/isomaker/80-openeuler/runtime-install.tmpl
+++ b/isomaker/80-openeuler/runtime-install.tmpl
@@ -22,7 +22,7 @@ installpkg --optional *-firmware --except alsa* --except midisport-firmware \
--except crystalhd-firmware --except ivtv-firmware \
--except cx18-firmware --except iscan-firmware \
--except uhd-firmware --except lulzbot-marlin-firmware \
- --except arm-trusted-firmware
+ --except arm-trusted-firmware --except raspberrypi-firmware
installpkg b43-openfwwf
## install all of the glibc langpacks since otherwise we get no locales
--
2.27.0

View File

@ -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.3
Release: 19
Release: 20
BuildRoot: %{_tmppath}/%{name}
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@ -35,7 +35,8 @@ Patch0008: 0008-add-parse_everything_deb_exclude.patch
Patch0009: 0009-automated-kickstart-function.patch
Patch0010: 0010-do-not-cleanup-pkg.patch
Patch0011: 0011-change-rescue-parameter-with-new-anaconda.patch
Patch0012: 0012-enable-eject-in-install.img.patch
Patch0012: 0012-enable-eject-in-install.img.patch
Patch0013: 0013-fix-make-edge-iso-error.patch
%description
a building tool for DVD ISO making and ISO cutting
@ -139,6 +140,11 @@ rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name}
%changelog
* Wed Apr 19 2023 wangchong <wangchong56@huawei.com> - 2.0.3-20
- ID:NA
- SUG:NA
- DESC: fix make edge iso error
* Tue Jan 3 2023 wangchong <wangchong56@huawei.com> - 2.0.3-19
- ID:NA
- SUG:NA