packages/oemaker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!221 [sync] PR-220: fix bug I6G246

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2023-02-21 06:59:57 +00:00 committed by Gitee
commit 9ef4ee8fb0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
0015-bugfix-I6G246.patch Normal file
View File

@ -0,0 +1,22 @@
From 413d2d7c86861f3481a3021d409e743e21a42328 Mon Sep 17 00:00:00 2001
From: wangchong1995924 <15229716099@163.com>
Date: Tue, 21 Feb 2023 10:19:14 +0800
Subject: [PATCH] add raspberrypi-firmware in except
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

8
oemaker.spec
View File

@ -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.4 Version: 2.0.4
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
@ -37,6 +37,7 @@ Patch0011: 0011-support-desktop-iso.patch
Patch0012: 0012-change-rescue-parameter-with-new-anaconda.patch Patch0012: 0012-change-rescue-parameter-with-new-anaconda.patch
Patch0013: 0013-enable-eject-in-install.img.patch Patch0013: 0013-enable-eject-in-install.img.patch
Patch0014: 0014-remove-invalid-memtest.patch Patch0014: 0014-remove-invalid-memtest.patch
Patch0015: 0015-bugfix-I6G246.patch
%description %description
a building tool for DVD ISO making and ISO cutting a building tool for DVD ISO making and ISO cutting
@ -144,6 +145,11 @@ rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name} rm -rf $RPM_BUILD_DIR/%{name}
%changelog %changelog
* Tue Feb 21 2023 wangchong <wangchong56@huawei.com> - 2.0.4-9
- ID:NA
- SUG:NA
- DESC:fix bug I6G246
* Fri Feb 17 2023 wangchong <wangchong56@huawei.com> - 2.0.4-8 * Fri Feb 17 2023 wangchong <wangchong56@huawei.com> - 2.0.4-8
- ID:NA - ID:NA
- SUG:NA - SUG:NA