Message ID | 1455223174-5204-1-git-send-email-james.knight@rockwellcollins.com |
---|---|
State | Superseded |
Headers | show |
Dear James Knight, On Thu, 11 Feb 2016 15:39:33 -0500, James Knight wrote: > 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. Thanks for the detailed commit log, very useful. I see only one thing missing from this commit: Config.in.legacy handling. And IMO, this set of two patches should go in for 2016.02. Best regards, Thomas
Thomas, On Fri, Feb 12, 2016 at 8:45 AM, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > > I see only one thing missing from this commit: Config.in.legacy > handling. Oops! I'll re-submit with "BR2_PACKAGE_E2FSPROGS_FINDFS" in Config.in.legacy file.
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in index ad33983..ac3eae7 100644 --- a/package/e2fsprogs/Config.in +++ b/package/e2fsprogs/Config.in @@ -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 diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 4b81b44..3de4cd4 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
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> --- package/e2fsprogs/Config.in | 5 ----- package/e2fsprogs/e2fsprogs.mk | 9 --------- 2 files changed, 14 deletions(-)