From 8c59dbbb3c8ff4e2f32c6a1b7a7cd7c8949dba08 Mon Sep 17 00:00:00 2001 From: ouuleilei Date: Tue, 24 Dec 2024 15:10:46 +0800 Subject: [PATCH] fix riscv64 livecd grub2-efi.cfg not found --- 0001-fix-livecd-grub2-efi.cfg-not-found.patch | 23 +++++++++++++++++++ oemaker.spec | 6 ++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 0001-fix-livecd-grub2-efi.cfg-not-found.patch diff --git a/0001-fix-livecd-grub2-efi.cfg-not-found.patch b/0001-fix-livecd-grub2-efi.cfg-not-found.patch new file mode 100644 index 0000000..6010a32 --- /dev/null +++ b/0001-fix-livecd-grub2-efi.cfg-not-found.patch @@ -0,0 +1,23 @@ +From 54a698db663b89b826b0f2ef183b95a8730e1d03 Mon Sep 17 00:00:00 2001 +From: ouuleilei +Date: Mon, 23 Dec 2024 15:07:22 +0800 +Subject: [PATCH] fix livecd grub2-efi.cfg not found + +--- + .../livecd/live/config_files/riscv64/{grub.cfg => grub.conf} | 0 + .../live/config_files/riscv64/{grub-efi.cfg => grub2-efi.cfg} | 0 + 2 files changed, 0 insertions(+), 0 deletions(-) + rename isomaker/config/riscv64/livecd/live/config_files/riscv64/{grub.cfg => grub.conf} (100%) + rename isomaker/config/riscv64/livecd/live/config_files/riscv64/{grub-efi.cfg => grub2-efi.cfg} (100%) + +diff --git a/isomaker/config/riscv64/livecd/live/config_files/riscv64/grub.cfg b/isomaker/config/riscv64/livecd/live/config_files/riscv64/grub.conf +similarity index 100% +rename from isomaker/config/riscv64/livecd/live/config_files/riscv64/grub.cfg +rename to isomaker/config/riscv64/livecd/live/config_files/riscv64/grub.conf +diff --git a/isomaker/config/riscv64/livecd/live/config_files/riscv64/grub-efi.cfg b/isomaker/config/riscv64/livecd/live/config_files/riscv64/grub2-efi.cfg +similarity index 100% +rename from isomaker/config/riscv64/livecd/live/config_files/riscv64/grub-efi.cfg +rename to isomaker/config/riscv64/livecd/live/config_files/riscv64/grub2-efi.cfg +-- +2.47.1 + diff --git a/oemaker.spec b/oemaker.spec index 6be0878..3c90733 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -11,7 +11,7 @@ Summary: a building tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management Version: 3.2.0 -Release: 9 +Release: 10 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -30,6 +30,7 @@ Requires: lorax >= 19.6.78-1 # Patch here Patch0001: 0001-bugfix-IABY7K.patch +Patch0002: 0001-fix-livecd-grub2-efi.cfg-not-found.patch %description a building tool for DVD ISO making and ISO cutting @@ -186,6 +187,9 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Tue Dec 24 2024 Ouuleilei - 3.2.0-10 +- fix riscv64 livecd grub2-efi.cfg not found + * Fri Dec 20 2024 wangchong - 3.2.0-9 - ID:NA - SUG:NA -- Gitee