* [Buildroot] [PATCH next 1/2] lvm2: add host package
@ 2017-05-22 13:40 Vicente Olivert Riera
2017-05-22 13:40 ` [Buildroot] [PATCH next 2/2] parted: bump version to 3.2 Vicente Olivert Riera
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Vicente Olivert Riera @ 2017-05-22 13:40 UTC (permalink / raw)
To: buildroot
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
package/lvm2/lvm2.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 9a422feda..6cb351c47 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -47,4 +47,7 @@ ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no
endif
+HOST_LVM2_INSTALL_OPTS = DESTDIR=$(HOST_DIR) install
+
$(eval $(autotools-package))
+$(eval $(host-autotools-package))
--
2.13.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH next 2/2] parted: bump version to 3.2 2017-05-22 13:40 [Buildroot] [PATCH next 1/2] lvm2: add host package Vicente Olivert Riera @ 2017-05-22 13:40 ` Vicente Olivert Riera 2017-05-24 2:11 ` Matthew Weber 2017-06-05 13:44 ` Thomas Petazzoni 2017-05-26 15:23 ` [Buildroot] [PATCH next 1/2] lvm2: add host package Matthew Weber 2017-06-05 13:33 ` Thomas Petazzoni 2 siblings, 2 replies; 7+ messages in thread From: Vicente Olivert Riera @ 2017-05-22 13:40 UTC (permalink / raw) To: buildroot Patch 0001 already included in this release: http://git.savannah.gnu.org/cgit/parted.git/commit/?id=cc382c3753e1b430c00df46f0937b74db36ccb8a LVM2 dependency is necessary otherwise it will fail. See: https://lists.gnu.org/archive/html/bug-parted/2014-08/msg00001.html Due to the LVM2 dependency, the --enable-device-mapper option is automatically enabled so there is no need to add it explicitly to the LVM2_CONF_OPTS. --disable-device-mapper has been removed from HOST_LVM2_CONF_OPTS to avoid a build failure. Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> --- package/parted/0001-readline-deprecated.patch | 19 ------------------- package/parted/Config.in | 11 +++++++++-- package/parted/parted.hash | 2 +- package/parted/parted.mk | 17 ++++------------- 4 files changed, 14 insertions(+), 35 deletions(-) delete mode 100644 package/parted/0001-readline-deprecated.patch diff --git a/package/parted/0001-readline-deprecated.patch b/package/parted/0001-readline-deprecated.patch deleted file mode 100644 index a3f40c8df..000000000 --- a/package/parted/0001-readline-deprecated.patch +++ /dev/null @@ -1,19 +0,0 @@ -The CPPFunction typedef (among others) have been deprecated in favour of -specific prototyped typedefs since readline 4.2. -It's been working since because compatibility typedefs have been -in place until they were removed in readline 6.3. - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> - -diff -Nura parted-3.1.orig/parted/ui.c parted-3.1/parted/ui.c ---- parted-3.1.orig/parted/ui.c 2014-03-01 16:11:41.970827134 -0300 -+++ parted-3.1/parted/ui.c 2014-03-01 16:11:55.540259786 -0300 -@@ -1474,7 +1474,7 @@ - #ifdef HAVE_LIBREADLINE - if (!opt_script_mode) { - rl_initialize (); -- rl_attempted_completion_function = (CPPFunction*) complete_function; -+ rl_attempted_completion_function = (rl_completion_func_t *) complete_function; - readline_state.in_readline = 0; - } - #endif diff --git a/package/parted/Config.in b/package/parted/Config.in index 9d78f0f1f..692659443 100644 --- a/package/parted/Config.in +++ b/package/parted/Config.in @@ -1,12 +1,19 @@ config BR2_PACKAGE_PARTED bool "parted" depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 + depends on BR2_USE_MMU # lvm2 + depends on !BR2_STATIC_LIBS # lvm2 + depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID + select BR2_PACKAGE_LVM2 help parted, the GNU partition resizing program http://www.gnu.org/software/parted/ -comment "parted needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR +comment "parted needs a glibc/uClibc toolchain w/ threads, dynamic library, wchar" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_USES_MUSL || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS || !BR2_USE_WCHAR diff --git a/package/parted/parted.hash b/package/parted/parted.hash index 297b5d7bb..25cd604a5 100644 --- a/package/parted/parted.hash +++ b/package/parted/parted.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15 parted-3.1.tar.xz +sha256 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 parted-3.2.tar.xz diff --git a/package/parted/parted.mk b/package/parted/parted.mk index fb4987fd5..e8eac8213 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -4,10 +4,10 @@ # ################################################################################ -PARTED_VERSION = 3.1 +PARTED_VERSION = 3.2 PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz PARTED_SITE = $(BR2_GNU_MIRROR)/parted -PARTED_DEPENDENCIES = host-pkgconf util-linux +PARTED_DEPENDENCIES = host-pkgconf lvm2 util-linux PARTED_INSTALL_STAGING = YES # For uclinux patch PARTED_AUTORECONF = YES @@ -22,21 +22,12 @@ else PARTED_CONF_OPTS += --without-readline endif -ifeq ($(BR2_PACKAGE_LVM2),y) -PARTED_DEPENDENCIES += lvm2 -PARTED_CONF_OPTS += --enable-device-mapper -else -PARTED_CONF_OPTS += --disable-device-mapper -endif - ifeq ($(BR2_STATIC_LIBS),y) PARTED_CONF_OPTS += --disable-dynamic-loading endif -HOST_PARTED_DEPENDENCIES = host-pkgconf host-util-linux -HOST_PARTED_CONF_OPTS += \ - --without-readline \ - --disable-device-mapper +HOST_PARTED_DEPENDENCIES = host-lvm2 host-pkgconf host-util-linux +HOST_PARTED_CONF_OPTS += --without-readline $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.13.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH next 2/2] parted: bump version to 3.2 2017-05-22 13:40 ` [Buildroot] [PATCH next 2/2] parted: bump version to 3.2 Vicente Olivert Riera @ 2017-05-24 2:11 ` Matthew Weber 2017-05-26 15:22 ` Matthew Weber 2017-06-05 13:44 ` Thomas Petazzoni 1 sibling, 1 reply; 7+ messages in thread From: Matthew Weber @ 2017-05-24 2:11 UTC (permalink / raw) To: buildroot Vicente, On Mon, May 22, 2017 at 8:40 AM, Vicente Olivert Riera <Vincent.Riera@imgtec.com> wrote: > Patch 0001 already included in this release: > http://git.savannah.gnu.org/cgit/parted.git/commit/?id=cc382c3753e1b430c00df46f0937b74db36ccb8a > > LVM2 dependency is necessary otherwise it will fail. See: > https://lists.gnu.org/archive/html/bug-parted/2014-08/msg00001.html > > Due to the LVM2 dependency, the --enable-device-mapper option is > automatically enabled so there is no need to add it explicitly to the > LVM2_CONF_OPTS. > > --disable-device-mapper has been removed from HOST_LVM2_CONF_OPTS to > avoid a build failure. > Thanks for sending the bump. Do you happen to know if this version is more compatible with never kernel headers? We noticed a limitation where the toolchain kernel headers had to be older then ~3.13 for it to build correctly. Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com> > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> > --- > package/parted/0001-readline-deprecated.patch | 19 ------------------- > package/parted/Config.in | 11 +++++++++-- > package/parted/parted.hash | 2 +- > package/parted/parted.mk | 17 ++++------------- > 4 files changed, 14 insertions(+), 35 deletions(-) > delete mode 100644 package/parted/0001-readline-deprecated.patch > > diff --git a/package/parted/0001-readline-deprecated.patch b/package/parted/0001-readline-deprecated.patch > deleted file mode 100644 > index a3f40c8df..000000000 > --- a/package/parted/0001-readline-deprecated.patch > +++ /dev/null > @@ -1,19 +0,0 @@ > -The CPPFunction typedef (among others) have been deprecated in favour of > -specific prototyped typedefs since readline 4.2. > -It's been working since because compatibility typedefs have been > -in place until they were removed in readline 6.3. > - > -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> > - > -diff -Nura parted-3.1.orig/parted/ui.c parted-3.1/parted/ui.c > ---- parted-3.1.orig/parted/ui.c 2014-03-01 16:11:41.970827134 -0300 > -+++ parted-3.1/parted/ui.c 2014-03-01 16:11:55.540259786 -0300 > -@@ -1474,7 +1474,7 @@ > - #ifdef HAVE_LIBREADLINE > - if (!opt_script_mode) { > - rl_initialize (); > -- rl_attempted_completion_function = (CPPFunction*) complete_function; > -+ rl_attempted_completion_function = (rl_completion_func_t *) complete_function; > - readline_state.in_readline = 0; > - } > - #endif > diff --git a/package/parted/Config.in b/package/parted/Config.in > index 9d78f0f1f..692659443 100644 > --- a/package/parted/Config.in > +++ b/package/parted/Config.in > @@ -1,12 +1,19 @@ > config BR2_PACKAGE_PARTED > bool "parted" > depends on BR2_USE_WCHAR > + depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 > + depends on BR2_USE_MMU # lvm2 > + depends on !BR2_STATIC_LIBS # lvm2 > + depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 > select BR2_PACKAGE_UTIL_LINUX > select BR2_PACKAGE_UTIL_LINUX_LIBUUID > + select BR2_PACKAGE_LVM2 > help > parted, the GNU partition resizing program > > http://www.gnu.org/software/parted/ > > -comment "parted needs a toolchain w/ wchar" > - depends on !BR2_USE_WCHAR > +comment "parted needs a glibc/uClibc toolchain w/ threads, dynamic library, wchar" > + depends on BR2_USE_MMU > + depends on BR2_TOOLCHAIN_USES_MUSL || !BR2_TOOLCHAIN_HAS_THREADS || \ > + BR2_STATIC_LIBS || !BR2_USE_WCHAR > diff --git a/package/parted/parted.hash b/package/parted/parted.hash > index 297b5d7bb..25cd604a5 100644 > --- a/package/parted/parted.hash > +++ b/package/parted/parted.hash > @@ -1,2 +1,2 @@ > # Locally calculated after checking pgp signature > -sha256 5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15 parted-3.1.tar.xz > +sha256 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 parted-3.2.tar.xz > diff --git a/package/parted/parted.mk b/package/parted/parted.mk > index fb4987fd5..e8eac8213 100644 > --- a/package/parted/parted.mk > +++ b/package/parted/parted.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -PARTED_VERSION = 3.1 > +PARTED_VERSION = 3.2 > PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz > PARTED_SITE = $(BR2_GNU_MIRROR)/parted > -PARTED_DEPENDENCIES = host-pkgconf util-linux > +PARTED_DEPENDENCIES = host-pkgconf lvm2 util-linux > PARTED_INSTALL_STAGING = YES > # For uclinux patch > PARTED_AUTORECONF = YES > @@ -22,21 +22,12 @@ else > PARTED_CONF_OPTS += --without-readline > endif > > -ifeq ($(BR2_PACKAGE_LVM2),y) > -PARTED_DEPENDENCIES += lvm2 > -PARTED_CONF_OPTS += --enable-device-mapper > -else > -PARTED_CONF_OPTS += --disable-device-mapper > -endif > - > ifeq ($(BR2_STATIC_LIBS),y) > PARTED_CONF_OPTS += --disable-dynamic-loading > endif > > -HOST_PARTED_DEPENDENCIES = host-pkgconf host-util-linux > -HOST_PARTED_CONF_OPTS += \ > - --without-readline \ > - --disable-device-mapper > +HOST_PARTED_DEPENDENCIES = host-lvm2 host-pkgconf host-util-linux > +HOST_PARTED_CONF_OPTS += --without-readline > > $(eval $(autotools-package)) > $(eval $(host-autotools-package)) > -- > 2.13.0 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- Matthew L Weber / Pr Software Engineer Airborne Information Systems / Security Systems and Software / Secure Platforms MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA www.rockwellcollins.com Note: Any Export License Required Information and License Restricted Third Party Intellectual Property (TPIP) content must be encrypted and sent to matthew.weber at corp.rockwellcollins.com. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH next 2/2] parted: bump version to 3.2 2017-05-24 2:11 ` Matthew Weber @ 2017-05-26 15:22 ` Matthew Weber 0 siblings, 0 replies; 7+ messages in thread From: Matthew Weber @ 2017-05-26 15:22 UTC (permalink / raw) To: buildroot Vincente, On Tue, May 23, 2017 at 9:11 PM, Matthew Weber <matthew.weber@rockwellcollins.com> wrote: > Vicente, > > On Mon, May 22, 2017 at 8:40 AM, Vicente Olivert Riera > <Vincent.Riera@imgtec.com> wrote: >> Patch 0001 already included in this release: >> http://git.savannah.gnu.org/cgit/parted.git/commit/?id=cc382c3753e1b430c00df46f0937b74db36ccb8a >> >> LVM2 dependency is necessary otherwise it will fail. See: >> https://lists.gnu.org/archive/html/bug-parted/2014-08/msg00001.html >> >> Due to the LVM2 dependency, the --enable-device-mapper option is >> automatically enabled so there is no need to add it explicitly to the >> LVM2_CONF_OPTS. >> >> --disable-device-mapper has been removed from HOST_LVM2_CONF_OPTS to >> avoid a build failure. >> > > Thanks for sending the bump. Do you happen to know if this version is > more compatible with never kernel headers? We noticed a limitation > where the toolchain kernel headers had to be older then ~3.13 for it > to build correctly. > > Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com> > test-pkg config used +++++++++++++++++++++++++++++++++++++++++++++++++ BR2_PACKAGE_UTIL_LINUX=y BR2_PACKAGE_UTIL_LINUX_LIBUUID=y BR2_PACKAGE_LVM2=y BR2_PACKAGE_PARTED=y BR2_USE_WCHAR=y BR2_TOOLCHAIN_HAS_THREADS=y BR2_USE_MMU=y Results +++++++++++++++++++++++++++++++++++++++++++++++++ armv5-ctng-linux-gnueabi [ 1/49]: OK armv7-ctng-linux-gnueabihf [ 2/49]: OK br-aarch64-glibc [ 3/49]: OK br-arcle-hs38 [ 4/49]: OK br-arm-basic [ 5/49]: SKIPPED br-arm-cortex-a9-glibc [ 6/49]: OK br-arm-cortex-a9-musl [ 7/49]: SKIPPED br-arm-cortex-m4-full [ 8/49]: SKIPPED br-arm-full [ 9/49]: OK br-arm-full-nothread [10/49]: SKIPPED br-arm-full-static [11/49]: SKIPPED br-bfin-full [12/49]: SKIPPED br-i386-pentium4-full [13/49]: OK br-i386-pentium-mmx-musl [14/49]: SKIPPED br-m68k-5208-full [15/49]: SKIPPED br-m68k-68040-full [16/49]: OK br-microblazeel-full [17/49]: OK br-mips32r6-el-hf-glibc [18/49]: OK br-mips64-n64-full [19/49]: OK br-mips64r6-el-hf-glibc [20/49]: OK br-mipsel-o32-full [21/49]: OK br-nios2-glibc [22/49]: OK br-openrisc-uclibc [23/49]: OK br-powerpc-603e-basic-cpp [24/49]: SKIPPED br-powerpc64le-power8-glibc [25/49]: OK Tested-by: Matt Weber <matthew.weber@rockwellcollins.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH next 2/2] parted: bump version to 3.2 2017-05-22 13:40 ` [Buildroot] [PATCH next 2/2] parted: bump version to 3.2 Vicente Olivert Riera 2017-05-24 2:11 ` Matthew Weber @ 2017-06-05 13:44 ` Thomas Petazzoni 1 sibling, 0 replies; 7+ messages in thread From: Thomas Petazzoni @ 2017-06-05 13:44 UTC (permalink / raw) To: buildroot Hello, On Mon, 22 May 2017 14:40:15 +0100, Vicente Olivert Riera wrote: > LVM2 dependency is necessary otherwise it will fail. See: > https://lists.gnu.org/archive/html/bug-parted/2014-08/msg00001.html > > Due to the LVM2 dependency, the --enable-device-mapper option is > automatically enabled so there is no need to add it explicitly to the > LVM2_CONF_OPTS. The --enable-device-mapper option still exists, and allows to disable the lvm2 dependency. The build failure can be fixed by backporting upstream commit 7e87ca3c531228d35e13e802d2622006138b104c. So no need for the forced lvm2 dependency, no need for host-lvm2. Please try to send *less* package updates, but *better* package updates. Seems like I've already made the same statement earlier today... Best regards, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH next 1/2] lvm2: add host package 2017-05-22 13:40 [Buildroot] [PATCH next 1/2] lvm2: add host package Vicente Olivert Riera 2017-05-22 13:40 ` [Buildroot] [PATCH next 2/2] parted: bump version to 3.2 Vicente Olivert Riera @ 2017-05-26 15:23 ` Matthew Weber 2017-06-05 13:33 ` Thomas Petazzoni 2 siblings, 0 replies; 7+ messages in thread From: Matthew Weber @ 2017-05-26 15:23 UTC (permalink / raw) To: buildroot Vincente, On Mon, May 22, 2017 at 8:40 AM, Vicente Olivert Riera <Vincent.Riera@imgtec.com> wrote: > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> > --- > package/lvm2/lvm2.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk > index 9a422feda..6cb351c47 100644 > --- a/package/lvm2/lvm2.mk > +++ b/package/lvm2/lvm2.mk > @@ -47,4 +47,7 @@ ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) > LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no > endif > > +HOST_LVM2_INSTALL_OPTS = DESTDIR=$(HOST_DIR) install > + > $(eval $(autotools-package)) > +$(eval $(host-autotools-package)) > -- > 2.13.0 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot Tested-by: Matt Weber <matthew.weber@rockwellcollins.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH next 1/2] lvm2: add host package 2017-05-22 13:40 [Buildroot] [PATCH next 1/2] lvm2: add host package Vicente Olivert Riera 2017-05-22 13:40 ` [Buildroot] [PATCH next 2/2] parted: bump version to 3.2 Vicente Olivert Riera 2017-05-26 15:23 ` [Buildroot] [PATCH next 1/2] lvm2: add host package Matthew Weber @ 2017-06-05 13:33 ` Thomas Petazzoni 2 siblings, 0 replies; 7+ messages in thread From: Thomas Petazzoni @ 2017-06-05 13:33 UTC (permalink / raw) To: buildroot Hello, On Mon, 22 May 2017 14:40:14 +0100, Vicente Olivert Riera wrote: > +HOST_LVM2_INSTALL_OPTS = DESTDIR=$(HOST_DIR) install This is wrong. Host installation should basically *never* use DESTDIR, but prefix instead. Since our autotools-package infrastructure already passes --prefix=$(HOST_DIR)/usr, you shouldn't have to override to override the HOST_LVM2_INSTALL_OPTS. But, this patch is in fact not needed. I'll reply on PATCH 2/2 why. Thanks, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-06-05 13:44 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-05-22 13:40 [Buildroot] [PATCH next 1/2] lvm2: add host package Vicente Olivert Riera 2017-05-22 13:40 ` [Buildroot] [PATCH next 2/2] parted: bump version to 3.2 Vicente Olivert Riera 2017-05-24 2:11 ` Matthew Weber 2017-05-26 15:22 ` Matthew Weber 2017-06-05 13:44 ` Thomas Petazzoni 2017-05-26 15:23 ` [Buildroot] [PATCH next 1/2] lvm2: add host package Matthew Weber 2017-06-05 13:33 ` Thomas Petazzoni
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.