Patchwork [2/3] package/parted: relax dependency on readline

login
register
mail settings
Submitter Yann E. MORIN
Date Dec. 6, 2013, 7:57 p.m.
Message ID <7877131b94507ff84d258422f549b689e29e71a3.1386359706.git.yann.morin.1998@free.fr>
Download mbox | patch
Permalink /patch/298236/
State Accepted
Commit 2079f07a926ec0b489ab30befe0cb2bcaebc40f6
Headers show

Comments

Yann E. MORIN - Dec. 6, 2013, 7:57 p.m.
From: "Yann E. MORIN" <yann.morin.1998@free.fr>

parted can be configured without support for readline (ie. can be
not interactive), so we can relax the dependency on lvm2, and make
it an optional feature.

(Based on a code-snippet from Thomas.)

Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/parted/Config.in | 1 -
 package/parted/parted.mk | 9 ++++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
Jerzy Grzegorek - Dec. 7, 2013, 9:48 a.m.
Hi Yann,

> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> parted can be configured without support for readline (ie. can be
> not interactive), so we can relax the dependency on lvm2, and make
> it an optional feature.

lvm2 ?
s/lvm2/readline/

Regards,
Jerzy

>
> (Based on a code-snippet from Thomas.)
>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
>   package/parted/Config.in | 1 -
>   package/parted/parted.mk | 9 ++++++++-
>   2 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/package/parted/Config.in b/package/parted/Config.in
> index 321fdf7..45170aa 100644
> --- a/package/parted/Config.in
> +++ b/package/parted/Config.in
> @@ -2,7 +2,6 @@ config BR2_PACKAGE_PARTED
>   	bool "parted"
>   	depends on BR2_LARGEFILE
>   	depends on BR2_USE_WCHAR
> -	select BR2_PACKAGE_READLINE
>   	select BR2_PACKAGE_UTIL_LINUX
>   	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
>   	help
> diff --git a/package/parted/parted.mk b/package/parted/parted.mk
> index 231ab35..afb8287 100644
> --- a/package/parted/parted.mk
> +++ b/package/parted/parted.mk
> @@ -7,11 +7,18 @@
>   PARTED_VERSION = 3.1
>   PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz
>   PARTED_SITE = $(BR2_GNU_MIRROR)/parted
> -PARTED_DEPENDENCIES = readline util-linux
> +PARTED_DEPENDENCIES = util-linux
>   PARTED_INSTALL_STAGING = YES
>   PARTED_LICENSE = GPLv3+
>   PARTED_LICENSE_FILES = COPYING
>   
> +ifeq ($(BR2_PACKAGE_READLINE),y)
> +PARTED_DEPENDENCIES += readline
> +PARTED_CONF_OPT += --with-readline
> +else
> +PARTED_CONF_OPT += --without-readline
> +endif
> +
>   ifeq ($(BR2_PACKAGE_LVM2),y)
>   PARTED_DEPENDENCIES += lvm2
>   PARTED_CONF_OPT += --enable-device-mapper
Yann E. MORIN - Dec. 7, 2013, 7:26 p.m.
Jerzy, All,

Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> wrote:
>
>Hi Yann,
>
>> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>>
>> parted can be configured without support for readline (ie. can be
>> not interactive), so we can relax the dependency on lvm2, and make
>> it an optional feature.
>
>lvm2 ?
>s/lvm2/readline/

Gah, bad copy-paste...
Yes, of course.

>Regards,
>Jerzy
>
>>
>> (Based on a code-snippet from Thomas.)
>>
>> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>> ---
>>   package/parted/Config.in | 1 -
>>   package/parted/parted.mk | 9 ++++++++-
>>   2 files changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/parted/Config.in b/package/parted/Config.in
>> index 321fdf7..45170aa 100644
>> --- a/package/parted/Config.in
>> +++ b/package/parted/Config.in
>> @@ -2,7 +2,6 @@ config BR2_PACKAGE_PARTED
>>   	bool "parted"
>>   	depends on BR2_LARGEFILE
>>   	depends on BR2_USE_WCHAR
>> -	select BR2_PACKAGE_READLINE
>>   	select BR2_PACKAGE_UTIL_LINUX
>>   	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
>>   	help
>> diff --git a/package/parted/parted.mk b/package/parted/parted.mk
>> index 231ab35..afb8287 100644
>> --- a/package/parted/parted.mk
>> +++ b/package/parted/parted.mk
>> @@ -7,11 +7,18 @@
>>   PARTED_VERSION = 3.1
>>   PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz
>>   PARTED_SITE = $(BR2_GNU_MIRROR)/parted
>> -PARTED_DEPENDENCIES = readline util-linux
>> +PARTED_DEPENDENCIES = util-linux
>>   PARTED_INSTALL_STAGING = YES
>>   PARTED_LICENSE = GPLv3+
>>   PARTED_LICENSE_FILES = COPYING
>>   
>> +ifeq ($(BR2_PACKAGE_READLINE),y)
>> +PARTED_DEPENDENCIES += readline
>> +PARTED_CONF_OPT += --with-readline
>> +else
>> +PARTED_CONF_OPT += --without-readline
>> +endif
>> +
>>   ifeq ($(BR2_PACKAGE_LVM2),y)
>>   PARTED_DEPENDENCIES += lvm2
>>   PARTED_CONF_OPT += --enable-device-mapper
>
>_______________________________________________
>buildroot mailing list
>buildroot@busybox.net
>http://lists.busybox.net/mailman/listinfo/buildroot

Patch

diff --git a/package/parted/Config.in b/package/parted/Config.in
index 321fdf7..45170aa 100644
--- a/package/parted/Config.in
+++ b/package/parted/Config.in
@@ -2,7 +2,6 @@  config BR2_PACKAGE_PARTED
 	bool "parted"
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
-	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	help
diff --git a/package/parted/parted.mk b/package/parted/parted.mk
index 231ab35..afb8287 100644
--- a/package/parted/parted.mk
+++ b/package/parted/parted.mk
@@ -7,11 +7,18 @@ 
 PARTED_VERSION = 3.1
 PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz
 PARTED_SITE = $(BR2_GNU_MIRROR)/parted
-PARTED_DEPENDENCIES = readline util-linux
+PARTED_DEPENDENCIES = util-linux
 PARTED_INSTALL_STAGING = YES
 PARTED_LICENSE = GPLv3+
 PARTED_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_READLINE),y)
+PARTED_DEPENDENCIES += readline
+PARTED_CONF_OPT += --with-readline
+else
+PARTED_CONF_OPT += --without-readline
+endif
+
 ifeq ($(BR2_PACKAGE_LVM2),y)
 PARTED_DEPENDENCIES += lvm2
 PARTED_CONF_OPT += --enable-device-mapper