NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

grub: replace string option for filesystem selection by booleans

Browse Source 
In 1cece2813b (grub: add option to
configure the list of supported filesystems), we introduced the
BR2_TARGET_GRUB_FS_SUPPORT option which allows to provide a
space-separated list of filesystems that Grub should support.

However, it turns out that this not very practical, because the
iso9660 filesystem logic in Buildroot should force the ISO9660 support
to be enabled in Grub, which is not easy to do with a string option.

Therefore, this patch changes this option from a string option to a
list of boolean option, one per filesystem supported.

A few useful details:

 - Since Grub legacy is dead, the list of filesystem, and therefore
   the number of options, will not grow.

 - We have only added options for filesystems that are likely to be
   used in an embedded Linux context. Filesystems such as VSTAfs,
   Minix, UFS2 or FFS2 are not supported.

 - There is no need to add some Config.in.legacy support for the
   previous option, since it was added after Buildroot 2013.11, and
   was therefore never part of an official Buildroot release.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
This commit is contained in:
Thomas Petazzoni 2013-12-28 15:56:34 +01:00
parent cbbbe16714
commit 4e0257bb90
2 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
boot/grub/Config.in
View File

@ -45,19 +45,47 @@ config BR2_TARGET_GRUB_SPLASH
A splashimage is a 14-color indexed .xpm picture which A splashimage is a 14-color indexed .xpm picture which
is displayed as background for the grub menu. is displayed as background for the grub menu.
config BR2_TARGET_GRUB_FS_SUPPORT
string "Filesystem to support"
default "ext2fs fat"
help
Space separated list of filesystems to support. Possible
values are ext2fs, fat, ffs, ufs2, minix, reiserfs, vstafs,
jfs, xfs and iso9660.
config BR2_TARGET_GRUB_DISKLESS config BR2_TARGET_GRUB_DISKLESS
bool "diskless support" bool "diskless support"
help help
enable diskless support enable diskless support
menu "filesystem drivers"
config BR2_TARGET_GRUB_FS_EXT2
bool "ext2"
default y
help
Enable support for the ext2 filesystem in Grub
config BR2_TARGET_GRUB_FS_FAT
bool "FAT"
default y
help
Enable support for the FAT filesystem in Grub.
config BR2_TARGET_GRUB_FS_ISO9660
bool "ISO9660"
help
Enable support for the ISO9660 filesystem in Grub.
config BR2_TARGET_GRUB_FS_JFS
bool "IBM JFS"
help
Enable support for the JFS filesystem in Grub.
config BR2_TARGET_GRUB_FS_REISERFS
bool "ReiserFS"
help
Enable support for the ReiserFS filesystem in Grub.
config BR2_TARGET_GRUB_FS_XFS
bool "SGI XFS"
help
Enable support for the XFS filesystem in Grub.
endmenu
menu "network drivers" menu "network drivers"
config BR2_TARGET_GRUB_3c595 config BR2_TARGET_GRUB_3c595

24
boot/grub/grub.mk
View File

@ -46,18 +46,20 @@ GRUB_CONFIG-$(BR2_TARGET_GRUB_undi) += --enable-undi
GRUB_CONFIG-$(BR2_TARGET_GRUB_via_rhine) += --enable-via-rhine GRUB_CONFIG-$(BR2_TARGET_GRUB_via_rhine) += --enable-via-rhine
GRUB_CONFIG-$(BR2_TARGET_GRUB_w89c840) += --enable-w89c840 GRUB_CONFIG-$(BR2_TARGET_GRUB_w89c840) += --enable-w89c840
GRUB_POSSIBLE_FILESYSTEMS = ext2fs fat ffs ufs2 minix \ GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_EXT2),--enable-ext2fs,--disable-ext2fs)
reiserfs vstafs jfs xfs iso9660 GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_FAT),--enable-fat,--disable-fat)
GRUB_SELECTED_FILESYSTEMS = $(call qstrip,$(BR2_TARGET_GRUB_FS_SUPPORT)) GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_ISO9660),--enable-iso9660,--disable-iso9660)
GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_JFS),--enable-jfs,--disable-jfs)
GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_REISERFS),--enable-reiserfs,--disable-reiserfs)
GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_XFS),--enable-xfs,--disable-xfs)
GRUB_CONFIG-y += --disable-ffs --disable-ufs2 --disable-minix --disable-vstafs
# Calculate the list of stage 1.5 files to install. They are prefixed GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_EXT2),e2fs)
# by the filesystem name, except for ext2fs, where the stage 1.5 is GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_FAT),fat)
# prefixed by e2fs. GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_ISO9660),iso9660)
GRUB_STAGE_1_5_TO_INSTALL = $(subst ext2fs,e2fs,$(GRUB_SELECTED_FILESYSTEMS)) GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_JFS),jfs)
GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_REISERFS),reiserfs)
GRUB_CONFIG-y = \ GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_XFS),xfs)
$(foreach fs,$(GRUB_POSSIBLE_FILESYSTEMS),\
$(if $(filter $(fs),$(GRUB_SELECTED_FILESYSTEMS)),--enable-$(fs),--disable-$(fs)))
define GRUB_DEBIAN_PATCHES define GRUB_DEBIAN_PATCHES
# Apply the patches from the Debian patch # Apply the patches from the Debian patch