Skip to contentSkip to conversation

Pull request for branch yem/host-packages

GIT PULL New Yann E. MORIN 2 participants 6 messages Dec 6, 2013 – Dec 7, 2013

lore
Share & tools
lore
#0 lore raw

From: "Yann E. MORIN" <[email protected]>

Hello All!

This series adds parted as a host package. This will allow (eg.) post-image scripts to use parted.

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 b21e0881c46d78b75f77f63a62864c8e45978d55:

package: change tarball compression to xz (2013-12-06 15:50:49 +0100)

are available in the git repository at:

git://gitorious.org/buildroot/buildroot.git yem/host-packages

for you to fetch changes up to ecd2588ebee666a65987ebe0aec6ab6e83108e68:

package/parted: add a host variant (2013-12-06 20:53:49 +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
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
#1 lore raw

PATCH 1/3 package/parted: relax dependency on lvm2

From: "Yann E. MORIN" <[email protected]>

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 <[email protected]>
---
 package/parted/Config.in | 3 ---
 package/parted/parted.mk | 9 ++++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)
package/parted/Config.in +0 -3
index 8af2693..321fdf7 100644
@@ -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)
package/parted/parted.mk +8 -1
index 773e332..231ab35 100644
@@ -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))
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/3 package/parted: relax dependency on readline

In reply to Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

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 <[email protected]>
---
 package/parted/Config.in | 1 -
 package/parted/parted.mk | 9 ++++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
package/parted/Config.in +0 -1
index 321fdf7..45170aa 100644
@@ -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
package/parted/parted.mk +8 -1
index 231ab35..afb8287 100644
@@ -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
Signature · 1 line
1.8.1.2
#3 lore raw

PATCH 2/3 package/parted: relax dependency on readline

Hi Yann,

Quoted 5 lines

From: "Yann E. MORIN" <[email protected]>

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

Quoted 46 lines

(Based on a code-snippet from Thomas.)

Cc Thomas Petazzoni <[email protected]>
---
  package/parted/Config.in | 1 -
  package/parted/parted.mk | 9 ++++++++-
  2 files changed, 8 insertions(+), 2 deletions(-)
package/parted/Config.in +0 -1
index 321fdf7..45170aa 100644
@@ -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
package/parted/parted.mk +8 -1
index 231ab35..afb8287 100644
@@ -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
#4 lore raw

PATCH 2/3 package/parted: relax dependency on readline

Jerzy, All,

Quoted 11 lines · Jerzy Grzegorek

Hi Yann,

Quoted 5 lines

From: "Yann E. MORIN" <[email protected]>

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.

Quoted 54 lines

Regards,
Jerzy

Quoted 36 lines

(Based on a code-snippet from Thomas.)

Cc Thomas Petazzoni <[email protected]>
---
  package/parted/Config.in | 1 -
  package/parted/parted.mk | 9 ++++++++-
  2 files changed, 8 insertions(+), 2 deletions(-)
package/parted/Config.in +0 -1
index 321fdf7..45170aa 100644
@@ -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
package/parted/parted.mk +1 -1
index 231ab35..afb8287 100644
@@ -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
 

package/parted/parted.mk line 24

Quoted 10 lines
package/parted/parted.mk +7 -0
+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 at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.
#5 lore raw

PATCH 3/3 package/parted: add a host variant

In reply to Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

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.

Cc Thomas Petazzoni <[email protected]>
---
 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
package/Config.in.host +1 -0
index 5fd2570..34e84bf 100644
@@ -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"
package/parted/Config.in.host new file +6 -0
new file mode 100644
index 0000000..f5d7acc
@@ -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/
package/parted/parted.mk +6 -0
index afb8287..bba64d9 100644
@@ -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))
Signature · 1 line
1.8.1.2