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

!293 remove the items of unsupported filesystems in fs.lst

Browse Source 
From: @zhangqiumiao 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2023-07-25 12:30:09 +00:00 committed by Gitee
commit 419d9de659
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
grub.patches
View File

@ -330,3 +330,4 @@ Patch0322: backport-Read-etc-default-grub.d-.cfg-after-etc-default-grub.patch
Patch0323: Revert-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_C.patch
Patch0324: backport-commands-acpi-Use-xsdt_addr-if-present.patch
Patch0325: backport-kern-acpi-Use-xsdt_addr-if-present.patch
Patch0326: remove-the-items-of-unsupported-filesystems-in-fs.ls.patch

8
grub2.spec
View File

@ -14,7 +14,7 @@
Name: grub2
Epoch: 1
Version: 2.06
Release: 32
Release: 33
Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+
URL: http://www.gnu.org/software/grub/
@ -440,6 +440,12 @@ fi
%{_datadir}/man/man*
%changelog
* Mon Jul 24 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.06-33
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:remove the items of unsupported filesystems in fs.lst
* Mon Jul 17 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.06-32
- Type:bugfix
- CVE:NA

31
remove-the-items-of-unsupported-filesystems-in-fs.ls.patch Normal file
View File

@ -0,0 +1,31 @@
From 3a1e6b4f14c891a0faa31992d944dd35ef123b7f Mon Sep 17 00:00:00 2001
From: Qiumiao Zhang <zhangqiumiao1@huawei.com>
Date: Wed, 5 Jul 2023 16:53:49 +0800
Subject: [PATCH] remove the items of unsupported filesystems in fs.lst
---
grub-core/Makefile.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index dd49939..fb487a8 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -368,10 +368,13 @@ endif
# List files
fs.lst: $(MARKER_FILES)
+ DISABLE_FS=(affs.marker afs.marker bfs.marker jfs.marker minix.marker minix2.marker minix3.marker minix_be.marker minix2_be.marker minix3_be.marker nilfs2.marker reiserfs.marker romfs.marker sfs.marker ufs1.marker ufs2.marker ufs1_be.marker); \
(for pp in $^; do \
b=`basename $$pp .marker`; \
if grep 'FS_LIST_MARKER' $$pp >/dev/null 2>&1; then \
- echo $$b; \
+ if [[ ! "$${DISABLE_FS[@]}" =~ $$b ]]; then \
+ echo $$b; \
+ fi; \
fi; \
done) | sort -u > $@
platform_DATA += fs.lst
--
2.19.1