* [Buildroot] [PATCH 1/3] package/parted: relax dependency on lvm2
2013-12-12 18:18 [Buildroot] [pull request v4] Pull request for branch yem/host-packages Yann E. MORIN
@ 2013-12-12 18:18 ` Yann E. MORIN
2013-12-12 18:18 ` [Buildroot] [PATCH 2/3] package/parted: relax dependency on readline Yann E. MORIN
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2013-12-12 18:18 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
parted can be configured without support for LVM volumes, so
we can relax the dependency on lvm2, and make it an optional
feature.
Remove now no-longer needed dependency on MMU because of lvm2.
(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 | 3 ---
package/parted/parted.mk | 9 ++++++++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/package/parted/Config.in b/package/parted/Config.in
index 8af2693..321fdf7 100644
--- a/package/parted/Config.in
+++ b/package/parted/Config.in
@@ -2,8 +2,6 @@ config BR2_PACKAGE_PARTED
bool "parted"
depends on BR2_LARGEFILE
depends on BR2_USE_WCHAR
- depends on BR2_USE_MMU # lvm2
- select BR2_PACKAGE_LVM2
select BR2_PACKAGE_READLINE
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
@@ -13,5 +11,4 @@ config BR2_PACKAGE_PARTED
http://www.gnu.org/software/parted/
comment "parted needs a toolchain w/ largefile, wchar"
- depends on BR2_USE_MMU
depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/parted/parted.mk b/package/parted/parted.mk
index 773e332..231ab35 100644
--- a/package/parted/parted.mk
+++ b/package/parted/parted.mk
@@ -7,9 +7,16 @@
PARTED_VERSION = 3.1
PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz
PARTED_SITE = $(BR2_GNU_MIRROR)/parted
-PARTED_DEPENDENCIES = readline util-linux lvm2
+PARTED_DEPENDENCIES = readline util-linux
PARTED_INSTALL_STAGING = YES
PARTED_LICENSE = GPLv3+
PARTED_LICENSE_FILES = COPYING
+ifeq ($(BR2_PACKAGE_LVM2),y)
+PARTED_DEPENDENCIES += lvm2
+PARTED_CONF_OPT += --enable-device-mapper
+else
+PARTED_CONF_OPT += --disable-device-mapper
+endif
+
$(eval $(autotools-package))
--
1.8.1.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 2/3] package/parted: relax dependency on readline
2013-12-12 18:18 [Buildroot] [pull request v4] Pull request for branch yem/host-packages Yann E. MORIN
2013-12-12 18:18 ` [Buildroot] [PATCH 1/3] package/parted: relax dependency on lvm2 Yann E. MORIN
@ 2013-12-12 18:18 ` Yann E. MORIN
2013-12-12 18:18 ` [Buildroot] [PATCH 3/3] package/parted: add a host variant Yann E. MORIN
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2013-12-12 18:18 UTC (permalink / raw)
To: buildroot
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 readline, 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>
Cc: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
---
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
--
1.8.1.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 3/3] package/parted: add a host variant
2013-12-12 18:18 [Buildroot] [pull request v4] Pull request for branch yem/host-packages Yann E. MORIN
2013-12-12 18:18 ` [Buildroot] [PATCH 1/3] package/parted: relax dependency on lvm2 Yann E. MORIN
2013-12-12 18:18 ` [Buildroot] [PATCH 2/3] package/parted: relax dependency on readline Yann E. MORIN
@ 2013-12-12 18:18 ` Yann E. MORIN
2013-12-12 20:11 ` [Buildroot] [pull request v4] Pull request for branch yem/host-packages Jerzy Grzegorek
2013-12-12 23:01 ` Peter Korsgaard
4 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2013-12-12 18:18 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Useful for for-build scripts to call parted, eg. to generate
partition tables and such automatically.
Since the primary goal is to use parted within scripts, we
do not need readline, so it is forcibly disabled.
Also, it does look unlikely that we need to manipulate LVM
volumes, so we forcibly disable support for the device-mapper.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in.host | 1 +
package/parted/Config.in.host | 6 ++++++
package/parted/parted.mk | 6 ++++++
3 files changed, 13 insertions(+)
create mode 100644 package/parted/Config.in.host
diff --git a/package/Config.in.host b/package/Config.in.host
index 5fd2570..34e84bf 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -10,6 +10,7 @@ source "package/lpc3250loader/Config.in.host"
source "package/mtools/Config.in.host"
source "package/omap-u-boot-utils/Config.in.host"
source "package/openocd/Config.in.host"
+source "package/parted/Config.in.host"
source "package/sam-ba/Config.in.host"
source "package/sunxi-tools/Config.in.host"
source "package/uboot-tools/Config.in.host"
diff --git a/package/parted/Config.in.host b/package/parted/Config.in.host
new file mode 100644
index 0000000..f5d7acc
--- /dev/null
+++ b/package/parted/Config.in.host
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_PARTED
+ bool "host parted"
+ help
+ parted, the GNU partition resizing program
+
+ http://www.gnu.org/software/parted/
diff --git a/package/parted/parted.mk b/package/parted/parted.mk
index afb8287..15e37a8 100644
--- a/package/parted/parted.mk
+++ b/package/parted/parted.mk
@@ -26,4 +26,10 @@ else
PARTED_CONF_OPT += --disable-device-mapper
endif
+HOST_PARTED_DEPENDENCIES = host-util-linux
+HOST_PARTED_CONF_OPT += \
+ --without-readline \
+ --disable-device-mapper \
+
$(eval $(autotools-package))
+$(eval $(host-autotools-package))
--
1.8.1.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [pull request v4] Pull request for branch yem/host-packages
2013-12-12 18:18 [Buildroot] [pull request v4] Pull request for branch yem/host-packages Yann E. MORIN
` (2 preceding siblings ...)
2013-12-12 18:18 ` [Buildroot] [PATCH 3/3] package/parted: add a host variant Yann E. MORIN
@ 2013-12-12 20:11 ` Jerzy Grzegorek
2013-12-12 20:26 ` Yann E. MORIN
2013-12-12 23:01 ` Peter Korsgaard
4 siblings, 1 reply; 7+ messages in thread
From: Jerzy Grzegorek @ 2013-12-12 20:11 UTC (permalink / raw)
To: buildroot
Hi Yann,
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Hello All!
>
> This series adds parted as a host package.
> This will allow (eg.) post-image scripts to use parted.
>
> Changes v3 -> v4:
> - fix double double-slash in parted's ./configure options
slash or dash ?
Regards,
Jerzy
>
> Changes v2 -> v3: (Jerzy)
> - Fix bad copy-paste in commit log
>
> Changes v1 -> v2: (Thomas)
> - don't depend on host-lvm2
> - so don't add host-lvm2
> - relax dependencies on lvm2/readline for target package
> - fix typoes in commit log
>
> Regards,
> Yann E. MORIN.
>
>
> The following changes since commit 08db3236c4508b2329d3b0ed61d3db54f59fd49c:
>
> wavpack: bump to version 4.70.0 (2013-12-12 16:26:10 +0100)
>
> are available in the git repository at:
>
> git://gitorious.org/buildroot/buildroot.git yem/host-packages
>
> for you to fetch changes up to a931d8bd70bf29846273c3d20ad65678e1ef2838:
>
> package/parted: add a host variant (2013-12-12 19:10:50 +0100)
>
> ----------------------------------------------------------------
> Yann E. MORIN (3):
> package/parted: relax dependency on lvm2
> package/parted: relax dependency on readline
> package/parted: add a host variant
>
> package/Config.in.host | 1 +
> package/parted/Config.in | 4 ----
> package/parted/Config.in.host | 6 ++++++
> package/parted/parted.mk | 22 +++++++++++++++++++++-
> 4 files changed, 28 insertions(+), 5 deletions(-)
> create mode 100644 package/parted/Config.in.host
>
^ permalink raw reply [flat|nested] 7+ messages in thread* [Buildroot] [pull request v4] Pull request for branch yem/host-packages
2013-12-12 20:11 ` [Buildroot] [pull request v4] Pull request for branch yem/host-packages Jerzy Grzegorek
@ 2013-12-12 20:26 ` Yann E. MORIN
0 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2013-12-12 20:26 UTC (permalink / raw)
To: buildroot
Jerzy, All,
On 2013-12-12 21:11 +0100, Jerzy Grzegorek spake thusly:
> >From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> >
> >Hello All!
> >
> >This series adds parted as a host package.
> >This will allow (eg.) post-image scripts to use parted.
> >
> >Changes v3 -> v4:
> > - fix double double-slash in parted's ./configure options
>
> slash or dash ?
Yes, dash. Fortunately, that's in the cover-letter, so no need to resend
it again. :-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [pull request v4] Pull request for branch yem/host-packages
2013-12-12 18:18 [Buildroot] [pull request v4] Pull request for branch yem/host-packages Yann E. MORIN
` (3 preceding siblings ...)
2013-12-12 20:11 ` [Buildroot] [pull request v4] Pull request for branch yem/host-packages Jerzy Grzegorek
@ 2013-12-12 23:01 ` Peter Korsgaard
4 siblings, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2013-12-12 23:01 UTC (permalink / raw)
To: buildroot
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Hello All!
> This series adds parted as a host package.
> This will allow (eg.) post-image scripts to use parted.
> Changes v3 -> v4:
> - fix double double-slash in parted's ./configure options
> Changes v2 -> v3: (Jerzy)
> - Fix bad copy-paste in commit log
> Changes v1 -> v2: (Thomas)
> - don't depend on host-lvm2
> - so don't add host-lvm2
> - relax dependencies on lvm2/readline for target package
> - fix typoes in commit log
Committed series, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 7+ messages in thread