Message ID | 1376591640-3698-1-git-send-email-vsergeev@kumunetworks.com |
---|---|
State | Rejected |
Headers | show |
Dear Ivan Sergeev, On Thu, 15 Aug 2013 11:34:00 -0700, Ivan Sergeev wrote: > Signed-off-by: Ivan Sergeev <vsergeev@kumunetworks.com> > --- > package/util-linux/Config.in | 5 +++++ > package/util-linux/util-linux.mk | 1 + > 2 files changed, 6 insertions(+) Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>>>>> "Ivan" == Ivan Sergeev <vsergeev@kumunetworks.com> writes:
Ivan> Signed-off-by: Ivan Sergeev <vsergeev@kumunetworks.com>
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.
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. On Sun, Sep 8, 2013 at 1:11 PM, Peter Korsgaard <jacmet@uclibc.org> wrote: > >>>>> "Ivan" == Ivan Sergeev <vsergeev@kumunetworks.com> writes: > > Ivan> Signed-off-by: Ivan Sergeev <vsergeev@kumunetworks.com> > 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. > > -- > Bye, Peter Korsgaard >
Dear Peter Korsgaard, On Sun, 08 Sep 2013 22:11:14 +0200, Peter Korsgaard wrote: > 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
diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index e63814f..605e297 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -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 diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index c6c8467..64112ba 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -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) \
Signed-off-by: Ivan Sergeev <vsergeev@kumunetworks.com> --- package/util-linux/Config.in | 5 +++++ package/util-linux/util-linux.mk | 1 + 2 files changed, 6 insertions(+)