Commit ead1df42 authored by James Knight's avatar James Knight Committed by Thomas Petazzoni
Browse files

e2fsprogs: remove findfs option 



The e2fsprogs package's findfs option provides no capabilities. When the
option is selected, a symbolic link is generated from findfs to e2label;
however, e2label will not handle findfs since the respective code is
explicitly disabled when `--disable-libblkid` is passed in. At this
time, the e2fsprogs package only supports findfs capabilities when
building its "private blkid library".

Note that the `--disable-libblkid` configuration argument must remain
to prevent conflicts with util-linux's libblkid and an e2fsprogs-
generated variant (see e1ffc2f7).

Since e2fsprogs cannot provide findfs capabilities, the option is being
removed in this change. A following change will be introduced to include
util-linux's findfs utility.

Signed-off-by: default avatarJames Knight <james.knight@rockwellcollins.com>
Cc: Zheng Yi <yzheng@techyauld.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 8e3a5c13

Config.in.legacy

+9 −0
Original line number Diff line number Diff line
@@ -145,6 +145,15 @@ endif 
###############################################################################

comment "Legacy options removed in 2016.02"



config BR2_PACKAGE_E2FSPROGS_FINDFS

	bool "e2fsprogs findfs option has been removed"

	select BR2_LEGACY

	help

	  This option attempted to enable findfs capabilities from

	  e2fsprogs but has not worked since July 2015 (due to

	  packaging changes). One can use BusyBox's findfs support or

	  enable the BR2_PACKAGE_UTIL_LINUX_FINDFS option.



config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL

	bool "openpowerlink debug option has been removed"

	select BR2_LEGACY

package/e2fsprogs/Config.in

+0 −5
Original line number Diff line number Diff line
@@ -59,11 +59,6 @@ config BR2_PACKAGE_E2FSPROGS_FILEFRAG 
	bool "filefrag"

	default y



config BR2_PACKAGE_E2FSPROGS_FINDFS

	bool "findfs"

	default y

	select BR2_PACKAGE_E2FSPROGS_E2LABEL



config BR2_PACKAGE_E2FSPROGS_FSCK

	bool "fsck"

	default y

package/e2fsprogs/e2fsprogs.mk

+0 −9
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ E2FSPROGS_TXTTARGETS_ = \ 
	usr/sbin/mkfs.ext4dev \

	usr/sbin/fsck.ext[234] \

	usr/sbin/fsck.ext4dev \

	usr/sbin/findfs \

	usr/sbin/tune2fs



define E2FSPROGS_TARGET_REMOVE_UNNEEDED
@@ -137,14 +136,6 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_TUNE2FS),y) 
E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_TUNE2FS_SYMLINK

endif



define E2FSPROGS_TARGET_FINDFS_SYMLINK

	ln -sf e2label $(TARGET_DIR)/usr/sbin/findfs

endef



ifeq ($(BR2_PACKAGE_E2FSPROGS_FINDFS),y)

E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FINDFS_SYMLINK

endif



# systemd really wants to have fsck in /sbin

define E2FSPROGS_TARGET_FSCK_SYMLINK

	ln -sf ../usr/sbin/fsck $(TARGET_DIR)/sbin/fsck