aboutsummaryrefslogtreecommitdiff
path: root/package/e2fsprogs/e2fsprogs.mk
diff options
context:
space:
mode:
authorGravatar James Knight <james.knight@rockwellcollins.com>2016-02-12 11:40:05 -0500
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-02-14 22:02:26 +0100
commitead1df4287b0037bc21810af1f0939cdbb95f3ff (patch)
tree4f71b300720368b06d0c3ea0c6b4d6efe4110b3d /package/e2fsprogs/e2fsprogs.mk
parent8e3a5c13546451c0c6ceb8bc64e4397ceed14aca (diff)
downloadbuildroot-ead1df4287b0037bc21810af1f0939cdbb95f3ff.tar.gz
buildroot-ead1df4287b0037bc21810af1f0939cdbb95f3ff.tar.bz2
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 e1ffc2f791b336339909c90559b7db40b455f172). 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: James Knight <james.knight@rockwellcollins.com> Cc: Zheng Yi <yzheng@techyauld.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/e2fsprogs/e2fsprogs.mk')
-rw-r--r--package/e2fsprogs/e2fsprogs.mk9
1 files changed, 0 insertions, 9 deletions
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 4b81b4473e..3de4cd4872 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -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