Skip to contentSkip to conversation

util-linux: enable sfdisk in configs

PATCH New Ivan Sergeev 3 participants 5 messages Aug 15, 2013 – Sep 14, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 util-linux: enable sfdisk in configs

---
 package/util-linux/Config.in     | 5 +++++
 package/util-linux/util-linux.mk | 1 +
 2 files changed, 6 insertions(+)
package/util-linux/Config.in +5 -0
index e63814f..605e297 100644
@@ -135,6 +135,11 @@ config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
 	help
 	  Scheduling utilities (chrt, ionice, taskset)
 
+config BR2_PACKAGE_UTIL_LINUX_SFDISK
+	bool "sfdisk"
+	help
+	  Partition table manipulator for Linux
+
 config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT
 	bool "switch_root"
 	help
package/util-linux/util-linux.mk +1 -0
index c6c8467..64112ba 100644
@@ -68,6 +68,7 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset,--disable-reset) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),--enable-schedutils,--disable-schedutils) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_SFDISK),--enable-sfdisk,--disable-sfdisk) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),--enable-switch_root,--disable-switch_root) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),--enable-unshare,--disable-unshare) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_UTMPDUMP),--enable-utmpdump,--disable-utmpdump) \
Signature · 1 line
1.8.3.4
#1 lore raw

PATCH 1/1 util-linux: enable sfdisk in configs

Dear Ivan Sergeev,

Quoted 5 lines · Ivan Sergeev
---
 package/util-linux/Config.in     | 5 +++++
 package/util-linux/util-linux.mk | 1 +
 2 files changed, 6 insertions(+)
Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH 1/1 util-linux: enable sfdisk in configs

In reply to Ivan Sergeev
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Ivan" == Ivan Sergeev <[email protected]> writes:

Ivan> Signed-off-by: Ivan Sergeev <[email protected]> Ivan> ---

 Ivan>  package/util-linux/Config.in     | 5 +++++
 Ivan>  package/util-linux/util-linux.mk | 1 +

Ivan> 2 files changed, 6 insertions(+)

Ivan> diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in Ivan> index e63814f..605e297 100644
Ivan> --- a/package/util-linux/Config.in
Ivan> +++ b/package/util-linux/Config.in
Ivan> @@ -135,6 +135,11 @@ config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
Ivan> help
Ivan> Scheduling utilities (chrt, ionice, taskset)

Ivan> +config BR2_PACKAGE_UTIL_LINUX_SFDISK
Ivan> + bool "sfdisk"
Ivan> + help
Ivan> + Partition table manipulator for Linux
Ivan> +

 Ivan>  config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT
 Ivan>  	bool "switch_root"
 Ivan>  	help
 Ivan> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
 Ivan> index c6c8467..64112ba 100644
 Ivan> --- a/package/util-linux/util-linux.mk
 Ivan> +++ b/package/util-linux/util-linux.mk
 Ivan> @@ -68,6 +68,7 @@ UTIL_LINUX_CONF_OPT += \
 Ivan>  	$(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \
 Ivan>  	$(if $(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset,--disable-reset) \
 Ivan>  	$(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),--enable-schedutils,--disable-schedutils) \

Ivan> + $(if $(BR2_PACKAGE_UTIL_LINUX_SFDISK),--enable-sfdisk,--disable-sfdisk) \

Ehh, I don't see any --enable-sfdisk / --disable-sfdisk configure options?

./configure --help|grep -B2 sfdisk
--enable-static-programs=LIST
link static the programs in LIST (comma-separated, supported for losetup, mount, umount, fdisk, sfdisk,

Looking at fdisks/Makemodule.am I see sfdisk is always built (except for on SPARC):

if !ARCH_SPARC

sbin_PROGRAMS += sfdisk
dist_man_MANS += fdisks/sfdisk.8

sfdisk_SOURCES = \
        fdisks/partname.c \
        fdisks/sfdisk.c \
        fdisks/common.h

sfdisk_LDADD = $(LDADD) libcommon.la

..

Before this patch we always built & installed sfdisk if BR2_PACKAGE_UTIL_LINUX_BINARIES was enabled, and this patch doesn't change anything.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 util-linux: enable sfdisk in configs

Yeah, I'm not sure what happen. I must have missed the sfdisk binary in the target in one of the earlier builds, added this patch thinking that util-linux did some fancy matching in its configure for --enable-*, and noticed the binary afterwords. Sorry about that.

Quoted 64 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Ivan" == Ivan Sergeev <[email protected]> writes:

Ivan> Signed-off-by: Ivan Sergeev <[email protected]> Ivan> ---

 Ivan>  package/util-linux/Config.in     | 5 +++++
 Ivan>  package/util-linux/util-linux.mk | 1 +

Ivan> 2 files changed, 6 insertions(+)

Ivan> diff --git a/package/util-linux/Config.in
b/package/util-linux/Config.in
Ivan> index e63814f..605e297 100644
Ivan> --- a/package/util-linux/Config.in
Ivan> +++ b/package/util-linux/Config.in
Ivan> @@ -135,6 +135,11 @@ config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
Ivan> help
Ivan> Scheduling utilities (chrt, ionice, taskset)

Ivan> +config BR2_PACKAGE_UTIL_LINUX_SFDISK
Ivan> + bool "sfdisk"
Ivan> + help
Ivan> + Partition table manipulator for Linux
Ivan> +
Ivan> config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT
Ivan> bool "switch_root"
Ivan> help
Ivan> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/
util-linux.mk
Ivan> index c6c8467..64112ba 100644
Ivan> --- a/package/util-linux/util-linux.mk
Ivan> +++ b/package/util-linux/util-linux.mk
Ivan> @@ -68,6 +68,7 @@ UTIL_LINUX_CONF_OPT += \
Ivan> $(if
$(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \
Ivan> $(if
$(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset,--disable-reset) \
Ivan> $(if
$(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),--enable-schedutils,--disable-schedutils) \
Ivan> + $(if
$(BR2_PACKAGE_UTIL_LINUX_SFDISK),--enable-sfdisk,--disable-sfdisk) \

Ehh, I don't see any --enable-sfdisk / --disable-sfdisk configure options?

./configure --help|grep -B2 sfdisk
--enable-static-programs=LIST
link static the programs in LIST
(comma-separated,
supported for losetup, mount, umount, fdisk,
sfdisk,

Looking at fdisks/Makemodule.am I see sfdisk is always built (except for on SPARC):

if !ARCH_SPARC

sbin_PROGRAMS += sfdisk
dist_man_MANS += fdisks/sfdisk.8

sfdisk_SOURCES = \
        fdisks/partname.c \
        fdisks/sfdisk.c \
        fdisks/common.h

sfdisk_LDADD = $(LDADD) libcommon.la

Quoted 9 lines

..

Before this patch we always built & installed sfdisk if BR2_PACKAGE_UTIL_LINUX_BINARIES was enabled, and this patch doesn't change anything.

--
Bye, Peter Korsgaard

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130911/c2764b7e/attachment.html>

#4 lore raw

PATCH 1/1 util-linux: enable sfdisk in configs

In reply to Peter Korsgaard

Dear Peter Korsgaard,

Quoted 7 lines · Peter Korsgaard

Ehh, I don't see any --enable-sfdisk / --disable-sfdisk configure options?

./configure --help|grep -B2 sfdisk
--enable-static-programs=LIST
link static the programs in LIST (comma-separated, supported for losetup, mount, umount, fdisk, sfdisk,

The patch from Ivan predates the recent util-linux bump. I'm pretty sure there was a sfdisk option, because I remember testing Ivan's patch, but it was before the util-bump.

Best regards,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com