[Buildroot] [PATCH v2 1/2] e2fsprogs: remove findfs option

[Buildroot] [PATCH v2 1/2] e2fsprogs: remove findfs option

[James Knight]

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>
---
Changes v1 -> v2:
  - Add missing legacy handling (pointed out by Thomas Petazzoni).
---
 Config.in.legacy               | 9 +++++++++
 package/e2fsprogs/Config.in    | 5 -----
 package/e2fsprogs/e2fsprogs.mk | 9 ---------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 3677f86..9d7d8e3 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -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 attempts to enabled findfs capabilities from e2fsprogs
+	  but has not worked since July 2015 (due to packaging changes).
+	  Developer's 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
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
-- 
2.6.4.windows.1

[Buildroot] [PATCH v2 2/2] util-linux: add findfs option

[James Knight]

Add the findfs utility option for util-linux package.

Signed-off-by: James Knight <james.knight@rockwellcollins.com>
Cc: Zheng Yi <yzheng@techyauld.com>
---
Changes v1 -> v2:
  - None.
---
 package/util-linux/Config.in     | 5 +++++
 package/util-linux/util-linux.mk | 1 +
 2 files changed, 6 insertions(+)

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index df89f99..bf6d5c0 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -96,6 +96,11 @@ config BR2_PACKAGE_UTIL_LINUX_FSCK
 	help
 	  Check and repair a linux filesystem
 
+config BR2_PACKAGE_UTIL_LINUX_FINDFS
+	bool "findfs"
+	help
+	  Find a filesystem by label or UUID
+
 config BR2_PACKAGE_UTIL_LINUX_HWCLOCK
 	bool "hwclock"
 	help
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index f6e5d62..a892b01 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -74,6 +74,7 @@ UTIL_LINUX_CONF_OPTS += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_FDFORMAT),--enable-fdformat,--disable-fdformat) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_FINDFS),--enable-findfs,--disable-findfs) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock,--disable-hwclock) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last,--disable-last) \
-- 
2.6.4.windows.1

[Buildroot] [PATCH v2 1/2] e2fsprogs: remove findfs option

[Thomas Petazzoni]

Dear James Knight,

On Fri, 12 Feb 2016 11:40:05 -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.
> 
> Signed-off-by: James Knight <james.knight@rockwellcollins.com>
> Cc: Zheng Yi <yzheng@techyauld.com>
> ---
> Changes v1 -> v2:
>   - Add missing legacy handling (pointed out by Thomas Petazzoni).
> ---
>  Config.in.legacy               | 9 +++++++++
>  package/e2fsprogs/Config.in    | 5 -----
>  package/e2fsprogs/e2fsprogs.mk | 9 ---------
>  3 files changed, 9 insertions(+), 14 deletions(-)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v2 2/2] util-linux: add findfs option

[Thomas Petazzoni]

Dear James Knight,

On Fri, 12 Feb 2016 11:40:06 -0500, James Knight wrote:

> diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
> index df89f99..bf6d5c0 100644
> --- a/package/util-linux/Config.in
> +++ b/package/util-linux/Config.in
> @@ -96,6 +96,11 @@ config BR2_PACKAGE_UTIL_LINUX_FSCK
>  	help
>  	  Check and repair a linux filesystem
>  
> +config BR2_PACKAGE_UTIL_LINUX_FINDFS
> +	bool "findfs"
> +	help
> +	  Find a filesystem by label or UUID
> +
>  config BR2_PACKAGE_UTIL_LINUX_HWCLOCK
>  	bool "hwclock"
>  	help
> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> index f6e5d62..a892b01 100644
> --- a/package/util-linux/util-linux.mk
> +++ b/package/util-linux/util-linux.mk
> @@ -74,6 +74,7 @@ UTIL_LINUX_CONF_OPTS += \
>  	$(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \
>  	$(if $(BR2_PACKAGE_UTIL_LINUX_FDFORMAT),--enable-fdformat,--disable-fdformat) \
>  	$(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \
> +	$(if $(BR2_PACKAGE_UTIL_LINUX_FINDFS),--enable-findfs,--disable-findfs) \
>  	$(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock,--disable-hwclock) \
>  	$(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \
>  	$(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last,--disable-last) \

Alphabetic ordering was not correct in both the Config.in and
util-linux.mk files. I've fixed that up and applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com