package/util-linux: Add option for enabling wipefs
PATCH 1/1 package/util-linux: Add option for enabling wipefs
From: Sam Voss <[email protected]>
Add option to enable wipefs as a standalone app, so that it may be enabled when the flag --disable-all-packages is set.
--- ...w-explicit-wipefs-enable-disablement.patch | 33 +++++++++++++++++++ package/util-linux/Config.in | 11 +++++++ package/util-linux/util-linux.mk | 1 + 3 files changed, 45 insertions(+) create mode 100644 package/util-linux/0001-Allow-explicit-wipefs-enable-disablement.patch
package/util-linux/0001-Allow-explicit-wipefs-enable-disablement.patch new file +33 -0
@@ -0,0 +1,33 @@ +From a76cd5f6abace269b60ef6f1b95526a2d09fd331 Mon Sep 17 00:00:00 2001 +From: Sam Voss <[email protected]> +Date: Mon, 14 Oct 2019 21:19:16 -0500 +Subject: [PATCH] wipefs: Allow explicitly enable/disablement + +Currently if `--disable-all-packages` is set, there is no configure +option for re-enabling `wipefs`. + +As the current default for `wipefs` is "enabled", add `--disable-` flag +to maintain backward compatibility. + +Signed-off-by: Sam Voss <[email protected]> +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index fc8a9507f..f70f8d1ee 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1286,7 +1286,11 @@ UL_BUILD_INIT([findfs], [check]) + UL_REQUIRES_BUILD([findfs], [libblkid]) + AM_CONDITIONAL([BUILD_FINDFS], [test "x$build_findfs" = xyes]) + +-UL_BUILD_INIT([wipefs], [check]) ++AC_ARG_ENABLE([wipefs], ++ AS_HELP_STRING([--disable-wipefs], [do not build wipefs]), ++ [], [UL_DEFAULT_ENABLE([wipefs], [check])] ++) ++UL_BUILD_INIT([wipefs]) + UL_REQUIRES_BUILD([wipefs], [libblkid]) + UL_REQUIRES_BUILD([wipefs], [libsmartcols]) + AM_CONDITIONAL([BUILD_WIPEFS], [test "x$build_wipefs" = xyes])
package/util-linux/Config.in +11 -0
@@ -407,6 +407,17 @@ config BR2_PACKAGE_UTIL_LINUX_WALL help Send a message to everybody's terminal +config BR2_PACKAGE_UTIL_LINUX_WIPEFS + bool "wipefs" + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS + help + wipefs can erase filesystem, raid or partition-table + signatures (magic strings) from the specified device + to make the signatures invisible for libblkid. wipefs + does not erase the filesystem itself nor any other data + from the device. + config BR2_PACKAGE_UTIL_LINUX_WDCTL bool "wdctl" depends on BR2_USE_MMU # libsmartcols
package/util-linux/util-linux.mk +1 -0
@@ -153,6 +153,7 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_VIPW),--enable-vipw,--disable-vipw) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WDCTL),--enable-wdctl,--disable-wdctl) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_WIPEFS),--enable-wipefs,--disable-wipefs) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write) \ $(if $(BR2_PACKAGE_UTIL_LINUX_ZRAMCTL),--enable-zramctl,--disable-zramctl)
Signature · 1 line
2.23.0
PATCH 1/1 package/util-linux: Add option for enabling wipefs
Quoted 88 lines · On Fri, Oct 18, 2019 at 12:31 AM <[email protected]> wrote:
From: Sam Voss <[email protected]>
Add option to enable wipefs as a standalone app, so that it may be enabled when the flag --disable-all-packages is set.
Signed-off-by Sam Voss <[email protected]>--- ...w-explicit-wipefs-enable-disablement.patch | 33 +++++++++++++++++++ package/util-linux/Config.in | 11 +++++++ package/util-linux/util-linux.mk | 1 + 3 files changed, 45 insertions(+) create mode 100644 package/util-linux/0001-Allow-explicit-wipefs-enable-disablement.patchpackage/util-linux/0001-Allow-explicit-wipefs-enable-disablement.patch new file +33
-0@@ -0,0 +1,33 @@ +From a76cd5f6abace269b60ef6f1b95526a2d09fd331 Mon Sep 17 00:00:00 2001 +From: Sam Voss <[email protected]> +Date: Mon, 14 Oct 2019 21:19:16 -0500 +Subject: [PATCH] wipefs: Allow explicitly enable/disablement + +Currently if `--disable-all-packages` is set, there is no configure +option for re-enabling `wipefs`. + +As the current default for `wipefs` is "enabled", add `--disable-` flag +to maintain backward compatibility. + +Signed-off-by: Sam Voss <[email protected]> +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index fc8a9507f..f70f8d1ee 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1286,7 +1286,11 @@ UL_BUILD_INIT([findfs], [check]) + UL_REQUIRES_BUILD([findfs], [libblkid]) + AM_CONDITIONAL([BUILD_FINDFS], [test "x$build_findfs" = xyes]) + +-UL_BUILD_INIT([wipefs], [check]) ++AC_ARG_ENABLE([wipefs], ++ AS_HELP_STRING([--disable-wipefs], [do not build wipefs]), ++ [], [UL_DEFAULT_ENABLE([wipefs], [check])] ++) ++UL_BUILD_INIT([wipefs]) + UL_REQUIRES_BUILD([wipefs], [libblkid]) + UL_REQUIRES_BUILD([wipefs], [libsmartcols]) + AM_CONDITIONAL([BUILD_WIPEFS], [test "x$build_wipefs" = xyes])package/util-linux/Config.in +11
-0@@ -407,6 +407,17 @@ config BR2_PACKAGE_UTIL_LINUX_WALL help Send a message to everybody's terminal +config BR2_PACKAGE_UTIL_LINUX_WIPEFS + bool "wipefs" + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS + help + wipefs can erase filesystem, raid or partition-table + signatures (magic strings) from the specified device + to make the signatures invisible for libblkid. wipefs + does not erase the filesystem itself nor any other data + from the device. + config BR2_PACKAGE_UTIL_LINUX_WDCTL bool "wdctl" depends on BR2_USE_MMU # libsmartcolspackage/util-linux/util-linux.mk +1
-1@@ -153,6 +153,7 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_VIPW),--enable-vipw,--disable-vipw) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WDCTL),--enable-wdctl,--disable-wdctl) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_WIPEFS),--enable-wipefs,--disable-wipefs) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write) \ $(if $(BR2_PACKAGE_UTIL_LINUX_ZRAMCTL),--enable-zramctl,--disable-zramctl) --
Quoted 2 lines
2.23.0
Arnout Vandecappelle
AppliedPATCH 1/1 package/util-linux: Add option for enabling wipefs
In reply to sam.voss at gmail.comQuoted 6 lines · sam.voss at gmail.com
From: Sam Voss <[email protected]>
Add option to enable wipefs as a standalone app, so that it may be enabled when the flag --disable-all-packages is set.
Signed-off-by Sam Voss <[email protected]>
Applied to master, thanks.
Did you send the patch upstream? If not, please do so.
Regards,
Arnout
PATCH 1/1 package/util-linux: Add option for enabling wipefs
Quoted 4 lines · Arnout Vandecappelle
Quoted 2 lines · sam.voss at gmail.com
From: Sam Voss <[email protected]>
Quoted 8 lines
Quoted 4 lines
Add option to enable wipefs as a standalone app, so that it may be enabled when the flag --disable-all-packages is set.
Signed-off-by Sam Voss <[email protected]>Applied to master, thanks.
Did you send the patch upstream? If not, please do so.
Sent and accepted
Sam
PATCH 1/1 package/util-linux: Add option for enabling wipefs
In reply to Arnout VandecappelleArnout Vandecappelle <[email protected]> wrote in news:98c40882-8f1d-61d6-41fa-74d86a8bf5a8 at mind.be:
Quoted 11 lines
Quoted 7 lines · sam.voss at gmail.com
From: Sam Voss <[email protected]>
Add option to enable wipefs as a standalone app, so that it may be enabled when the flag --disable-all-packages is set.
Signed-off-by: Sam Voss
<[email protected]>Applied to master, thanks.
Hi,
this patch lacks
UTIL_LINUX_AUTORECONF = yes
causing build errors:
http://autobuild.buildroot.net/?reason=util-linux-2.34
Regards, Bernd
PATCH 1/1 package/util-linux: Add option for enabling wipefs
Quoted 16 lines · Bernd Kuhls
Arnout Vandecappelle <[email protected]> wrote in news:98c40882-8f1d-61d6-41fa-74d86a8bf5a8 at mind.be:
Quoted 11 lines
Quoted 7 lines · sam.voss at gmail.com
From: Sam Voss <[email protected]>
Add option to enable wipefs as a standalone app, so that it may be enabled when the flag --disable-all-packages is set.
Signed-off-by: Sam Voss
<[email protected]>Applied to master, thanks.
Quoted 8 lines
Hi,
this patch lacks
UTIL_LINUX_AUTORECONF= yes
S
causing build errors:
http://autobuild.buildroot.net/?reason=util-linux-2.34
I just re-tested this after removing automake from my host, and sure enough it failed. Sending follow-up patch to clean this up.