* [Buildroot] [PATCH 2/7] lzip: bump to version 1.18
2017-02-09 19:50 [Buildroot] [PATCH 1/7] lzip: use the more informative homepage link Baruch Siach
@ 2017-02-09 19:50 ` Baruch Siach
2017-02-09 20:36 ` Thomas Petazzoni
2017-02-09 19:50 ` [Buildroot] [PATCH 3/7] core: add generic support for lz archives Baruch Siach
` (5 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Baruch Siach @ 2017-02-09 19:50 UTC (permalink / raw)
To: buildroot
Also, correct license.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/lzip/lzip.hash | 4 +++-
package/lzip/lzip.mk | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash
index 7b83e3e6a2b0..8855231fb3f4 100644
--- a/package/lzip/lzip.hash
+++ b/package/lzip/lzip.hash
@@ -1,2 +1,4 @@
+# From http://lists.nongnu.org/archive/html/lzip-bug/2016-06/msg00002.html
+sha1 ef42f3209d02c3b3c217a61c8f127bcb8747b128 lzip-1.18.tar.gz
# Locally calculated after checking pgp signature
-sha256 7cd3fcda68fc9900efcf7784313e3bdd1303fef1a0546db9723f5e5564dd05b6 lzip-1.15.tar.gz
+sha256 47f9882a104ab05532f467a7b8f4ddbb898fa2f1e8d9d468556d6c2d04db14dd lzip-1.18.tar.gz
diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk
index 8180fd0a465f..db04862c53f1 100644
--- a/package/lzip/lzip.mk
+++ b/package/lzip/lzip.mk
@@ -4,9 +4,9 @@
#
################################################################################
-LZIP_VERSION = 1.15
+LZIP_VERSION = 1.18
LZIP_SITE = http://download.savannah.gnu.org/releases/lzip
-LZIP_LICENSE = GPLv3+
+LZIP_LICENSE = GPLv2+
LZIP_LICENSE_FILES = COPYING
define LZIP_CONFIGURE_CMDS
--
2.11.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 2/7] lzip: bump to version 1.18
2017-02-09 19:50 ` [Buildroot] [PATCH 2/7] lzip: bump to version 1.18 Baruch Siach
@ 2017-02-09 20:36 ` Thomas Petazzoni
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2017-02-09 20:36 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 9 Feb 2017 21:50:13 +0200, Baruch Siach wrote:
> Also, correct license.
>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> package/lzip/lzip.hash | 4 +++-
> package/lzip/lzip.mk | 4 ++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 3/7] core: add generic support for lz archives
2017-02-09 19:50 [Buildroot] [PATCH 1/7] lzip: use the more informative homepage link Baruch Siach
2017-02-09 19:50 ` [Buildroot] [PATCH 2/7] lzip: bump to version 1.18 Baruch Siach
@ 2017-02-09 19:50 ` Baruch Siach
2017-02-09 20:26 ` Peter Seiderer
2017-02-09 19:50 ` [Buildroot] [PATCH 4/7] ed: use generic extract command Baruch Siach
` (4 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Baruch Siach @ 2017-02-09 19:50 UTC (permalink / raw)
To: buildroot
This commit teaches the generic code how to extract .tar.lz archives. When
lzip is not installed on the host, host-lzip gets built automatically.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Config.in | 7 +++++++
Makefile | 1 +
package/pkg-generic.mk | 8 +++-----
package/pkg-utils.mk | 1 +
support/dependencies/check-host-lzip.mk | 4 ++++
support/dependencies/check-host-lzip.sh | 14 ++++++++++++++
6 files changed, 30 insertions(+), 5 deletions(-)
create mode 100644 support/dependencies/check-host-lzip.mk
create mode 100755 support/dependencies/check-host-lzip.sh
diff --git a/Config.in b/Config.in
index ccd777e8bb00..bd8f0d1a10ee 100644
--- a/Config.in
+++ b/Config.in
@@ -158,6 +158,13 @@ config BR2_XZCAT
Command to be used to extract a xz'ed file to stdout.
Default is "xzcat"
+config BR2_LZCAT
+ string "lzcat command"
+ default "lzip -d -c"
+ help
+ Command to be used to extract a lzip'ed file to stdout.
+ Default is "lzip -d -c"
+
config BR2_TAR_OPTIONS
string "Tar options"
default ""
diff --git a/Makefile b/Makefile
index df3b64eb03ec..b4550e098958 100644
--- a/Makefile
+++ b/Makefile
@@ -431,6 +431,7 @@ KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \
ZCAT := $(call qstrip,$(BR2_ZCAT))
BZCAT := $(call qstrip,$(BR2_BZCAT))
XZCAT := $(call qstrip,$(BR2_XZCAT))
+LZCAT := $(call qstrip,$(BR2_LZCAT))
TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf
# packages compiled for the host go here
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 3ca71b03b9df..303dda090daa 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -928,11 +928,9 @@ endif # SITE_METHOD
# $(firstword) is used here because the extractor can have arguments, like
# ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'.
-# Do not add xzcat to the list of required dependencies, as it gets built
-# automatically if it isn't found.
-ifneq ($$(call suitable-extractor,$$($(2)_SOURCE)),$$(XZCAT))
-DL_TOOLS_DEPENDENCIES += $$(firstword $$(call suitable-extractor,$$($(2)_SOURCE)))
-endif
+# Remove xzcat/lzip from the list of required dependencies, as they get built
+# automatically if they're not found.
+DL_TOOLS_DEPENDENCIES += $$(filter-out xzcat lzip,$$(firstword $$(call suitable-extractor,$$($(2)_SOURCE))))
# Ensure all virtual targets are PHONY. Listed alphabetically.
.PHONY: $(1) \
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index c5d4080c72f4..bc926dadeffd 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -36,6 +36,7 @@ pkgname = $(lastword $(subst /, ,$(pkgdir)))
# Define extractors for different archive suffixes
INFLATE.bz2 = $(BZCAT)
INFLATE.gz = $(ZCAT)
+INFLATE.lz = $(LZCAT)
INFLATE.lzma = $(XZCAT)
INFLATE.tbz = $(BZCAT)
INFLATE.tbz2 = $(BZCAT)
diff --git a/support/dependencies/check-host-lzip.mk b/support/dependencies/check-host-lzip.mk
new file mode 100644
index 000000000000..32ab9f4daffe
--- /dev/null
+++ b/support/dependencies/check-host-lzip.mk
@@ -0,0 +1,4 @@
+ifeq (,$(call suitable-host-package,lzip,$(LZCAT)))
+DEPENDENCIES_HOST_PREREQ += host-lzip
+LZCAT = $(HOST_DIR)/usr/bin/lzip -d -c
+endif
diff --git a/support/dependencies/check-host-lzip.sh b/support/dependencies/check-host-lzip.sh
new file mode 100755
index 000000000000..4f8a2ba3de5b
--- /dev/null
+++ b/support/dependencies/check-host-lzip.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+candidate="$1"
+
+lzip=`which $candidate 2>/dev/null`
+if [ ! -x "$lzip" ]; then
+ lzip=`which lzip 2>/dev/null`
+ if [ ! -x "$lzip" ]; then
+ # echo nothing: no suitable lzip found
+ exit 1
+ fi
+fi
+
+echo $lzip
--
2.11.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 3/7] core: add generic support for lz archives
2017-02-09 19:50 ` [Buildroot] [PATCH 3/7] core: add generic support for lz archives Baruch Siach
@ 2017-02-09 20:26 ` Peter Seiderer
2017-02-09 21:00 ` Baruch Siach
0 siblings, 1 reply; 17+ messages in thread
From: Peter Seiderer @ 2017-02-09 20:26 UTC (permalink / raw)
To: buildroot
Hello Baruch,
On Thu, 9 Feb 2017 21:50:14 +0200, Baruch Siach <baruch@tkos.co.il> wrote:
> This commit teaches the generic code how to extract .tar.lz archives. When
> lzip is not installed on the host, host-lzip gets built automatically.
>
On my host there is no lzip installed, with your patches applied I get the following
error message:
which: no lzip in (/home/seiderer/Work/build_arm_qt5_stdcpp11_001/host/usr/bin)
You must install '/home/seiderer/Work/build_arm_qt5_stdcpp11_001/host/usr/bin/lzip' on your build machine
support/dependencies/dependencies.mk:22: recipe for target 'core-dependencies' failed
make[1]: *** [core-dependencies] Error 1
Makefile:16: recipe for target '_all' failed
make: *** [_all] Error 2
Regards,
Peter
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> Config.in | 7 +++++++
> Makefile | 1 +
> package/pkg-generic.mk | 8 +++-----
> package/pkg-utils.mk | 1 +
> support/dependencies/check-host-lzip.mk | 4 ++++
> support/dependencies/check-host-lzip.sh | 14 ++++++++++++++
> 6 files changed, 30 insertions(+), 5 deletions(-)
> create mode 100644 support/dependencies/check-host-lzip.mk
> create mode 100755 support/dependencies/check-host-lzip.sh
>
> diff --git a/Config.in b/Config.in
> index ccd777e8bb00..bd8f0d1a10ee 100644
> --- a/Config.in
> +++ b/Config.in
> @@ -158,6 +158,13 @@ config BR2_XZCAT
> Command to be used to extract a xz'ed file to stdout.
> Default is "xzcat"
>
> +config BR2_LZCAT
> + string "lzcat command"
> + default "lzip -d -c"
> + help
> + Command to be used to extract a lzip'ed file to stdout.
> + Default is "lzip -d -c"
> +
> config BR2_TAR_OPTIONS
> string "Tar options"
> default ""
> diff --git a/Makefile b/Makefile
> index df3b64eb03ec..b4550e098958 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -431,6 +431,7 @@ KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \
> ZCAT := $(call qstrip,$(BR2_ZCAT))
> BZCAT := $(call qstrip,$(BR2_BZCAT))
> XZCAT := $(call qstrip,$(BR2_XZCAT))
> +LZCAT := $(call qstrip,$(BR2_LZCAT))
> TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf
>
> # packages compiled for the host go here
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index 3ca71b03b9df..303dda090daa 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -928,11 +928,9 @@ endif # SITE_METHOD
>
> # $(firstword) is used here because the extractor can have arguments, like
> # ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'.
> -# Do not add xzcat to the list of required dependencies, as it gets built
> -# automatically if it isn't found.
> -ifneq ($$(call suitable-extractor,$$($(2)_SOURCE)),$$(XZCAT))
> -DL_TOOLS_DEPENDENCIES += $$(firstword $$(call suitable-extractor,$$($(2)_SOURCE)))
> -endif
> +# Remove xzcat/lzip from the list of required dependencies, as they get built
> +# automatically if they're not found.
> +DL_TOOLS_DEPENDENCIES += $$(filter-out xzcat lzip,$$(firstword $$(call suitable-extractor,$$($(2)_SOURCE))))
>
> # Ensure all virtual targets are PHONY. Listed alphabetically.
> .PHONY: $(1) \
> diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
> index c5d4080c72f4..bc926dadeffd 100644
> --- a/package/pkg-utils.mk
> +++ b/package/pkg-utils.mk
> @@ -36,6 +36,7 @@ pkgname = $(lastword $(subst /, ,$(pkgdir)))
> # Define extractors for different archive suffixes
> INFLATE.bz2 = $(BZCAT)
> INFLATE.gz = $(ZCAT)
> +INFLATE.lz = $(LZCAT)
> INFLATE.lzma = $(XZCAT)
> INFLATE.tbz = $(BZCAT)
> INFLATE.tbz2 = $(BZCAT)
> diff --git a/support/dependencies/check-host-lzip.mk b/support/dependencies/check-host-lzip.mk
> new file mode 100644
> index 000000000000..32ab9f4daffe
> --- /dev/null
> +++ b/support/dependencies/check-host-lzip.mk
> @@ -0,0 +1,4 @@
> +ifeq (,$(call suitable-host-package,lzip,$(LZCAT)))
> +DEPENDENCIES_HOST_PREREQ += host-lzip
> +LZCAT = $(HOST_DIR)/usr/bin/lzip -d -c
> +endif
> diff --git a/support/dependencies/check-host-lzip.sh b/support/dependencies/check-host-lzip.sh
> new file mode 100755
> index 000000000000..4f8a2ba3de5b
> --- /dev/null
> +++ b/support/dependencies/check-host-lzip.sh
> @@ -0,0 +1,14 @@
> +#!/bin/sh
> +
> +candidate="$1"
> +
> +lzip=`which $candidate 2>/dev/null`
> +if [ ! -x "$lzip" ]; then
> + lzip=`which lzip 2>/dev/null`
> + if [ ! -x "$lzip" ]; then
> + # echo nothing: no suitable lzip found
> + exit 1
> + fi
> +fi
> +
> +echo $lzip
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 3/7] core: add generic support for lz archives
2017-02-09 20:26 ` Peter Seiderer
@ 2017-02-09 21:00 ` Baruch Siach
2017-02-09 21:11 ` Baruch Siach
0 siblings, 1 reply; 17+ messages in thread
From: Baruch Siach @ 2017-02-09 21:00 UTC (permalink / raw)
To: buildroot
Hi Peter,
On Thu, Feb 09, 2017 at 09:26:12PM +0100, Peter Seiderer wrote:
> On Thu, 9 Feb 2017 21:50:14 +0200, Baruch Siach <baruch@tkos.co.il> wrote:
> > This commit teaches the generic code how to extract .tar.lz archives. When
> > lzip is not installed on the host, host-lzip gets built automatically.
> >
>
> On my host there is no lzip installed, with your patches applied I get the following
> error message:
>
> which: no lzip in (/home/seiderer/Work/build_arm_qt5_stdcpp11_001/host/usr/bin)
> You must install '/home/seiderer/Work/build_arm_qt5_stdcpp11_001/host/usr/bin/lzip' on your build machine
> support/dependencies/dependencies.mk:22: recipe for target 'core-dependencies' failed
> make[1]: *** [core-dependencies] Error 1
> Makefile:16: recipe for target '_all' failed
> make: *** [_all] Error 2
Thanks for testing.
Does this fixes your problem?
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 303dda090daa..eb01c2fa0e2f 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -930,7 +930,7 @@ endif # SITE_METHOD
# ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'.
# Remove xzcat/lzip from the list of required dependencies, as they get built
# automatically if they're not found.
-DL_TOOLS_DEPENDENCIES += $$(filter-out xzcat lzip,$$(firstword $$(call suitable-extractor,$$($(2)_SOURCE))))
+DL_TOOLS_DEPENDENCIES += $$(filter-out xzcat lzip,$$(notdir $$(firstword $$(call suitable-extractor,$$($(2)_SOURCE)))))
# Ensure all virtual targets are PHONY. Listed alphabetically.
.PHONY: $(1) \
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 3/7] core: add generic support for lz archives
2017-02-09 21:00 ` Baruch Siach
@ 2017-02-09 21:11 ` Baruch Siach
2017-02-09 21:16 ` Peter Seiderer
0 siblings, 1 reply; 17+ messages in thread
From: Baruch Siach @ 2017-02-09 21:11 UTC (permalink / raw)
To: buildroot
Hi Peter,
On Thu, Feb 09, 2017 at 11:00:37PM +0200, Baruch Siach wrote:
> On Thu, Feb 09, 2017 at 09:26:12PM +0100, Peter Seiderer wrote:
> > On Thu, 9 Feb 2017 21:50:14 +0200, Baruch Siach <baruch@tkos.co.il> wrote:
> > > This commit teaches the generic code how to extract .tar.lz archives. When
> > > lzip is not installed on the host, host-lzip gets built automatically.
> > >
> >
> > On my host there is no lzip installed, with your patches applied I get the following
> > error message:
> >
> > which: no lzip in (/home/seiderer/Work/build_arm_qt5_stdcpp11_001/host/usr/bin)
> > You must install '/home/seiderer/Work/build_arm_qt5_stdcpp11_001/host/usr/bin/lzip' on your build machine
> > support/dependencies/dependencies.mk:22: recipe for target 'core-dependencies' failed
> > make[1]: *** [core-dependencies] Error 1
> > Makefile:16: recipe for target '_all' failed
> > make: *** [_all] Error 2
>
> Thanks for testing.
>
> Does this fixes your problem?
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index 303dda090daa..eb01c2fa0e2f 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -930,7 +930,7 @@ endif # SITE_METHOD
> # ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'.
> # Remove xzcat/lzip from the list of required dependencies, as they get built
> # automatically if they're not found.
> -DL_TOOLS_DEPENDENCIES += $$(filter-out xzcat lzip,$$(firstword $$(call suitable-extractor,$$($(2)_SOURCE))))
> +DL_TOOLS_DEPENDENCIES += $$(filter-out xzcat lzip,$$(notdir $$(firstword $$(call suitable-extractor,$$($(2)_SOURCE)))))
>
> # Ensure all virtual targets are PHONY. Listed alphabetically.
> .PHONY: $(1) \
Thinking about it again, this is clearly not the right solution. It breaks
custom BR2_LZCAT. I'll try to come up with something better.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 3/7] core: add generic support for lz archives
2017-02-09 21:11 ` Baruch Siach
@ 2017-02-09 21:16 ` Peter Seiderer
2017-02-09 21:33 ` Baruch Siach
0 siblings, 1 reply; 17+ messages in thread
From: Peter Seiderer @ 2017-02-09 21:16 UTC (permalink / raw)
To: buildroot
Hello Baruch,
On Thu, 9 Feb 2017 23:11:28 +0200, Baruch Siach <baruch@tkos.co.il> wrote:
> Hi Peter,
>
> On Thu, Feb 09, 2017 at 11:00:37PM +0200, Baruch Siach wrote:
> > On Thu, Feb 09, 2017 at 09:26:12PM +0100, Peter Seiderer wrote:
> > > On Thu, 9 Feb 2017 21:50:14 +0200, Baruch Siach <baruch@tkos.co.il> wrote:
> > > > This commit teaches the generic code how to extract .tar.lz archives. When
> > > > lzip is not installed on the host, host-lzip gets built automatically.
> > > >
> > >
> > > On my host there is no lzip installed, with your patches applied I get the following
> > > error message:
> > >
> > > which: no lzip in (/home/seiderer/Work/build_arm_qt5_stdcpp11_001/host/usr/bin)
> > > You must install '/home/seiderer/Work/build_arm_qt5_stdcpp11_001/host/usr/bin/lzip' on your build machine
> > > support/dependencies/dependencies.mk:22: recipe for target 'core-dependencies' failed
> > > make[1]: *** [core-dependencies] Error 1
> > > Makefile:16: recipe for target '_all' failed
> > > make: *** [_all] Error 2
> >
> > Thanks for testing.
> >
> > Does this fixes your problem?
> >
> > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> > index 303dda090daa..eb01c2fa0e2f 100644
> > --- a/package/pkg-generic.mk
> > +++ b/package/pkg-generic.mk
> > @@ -930,7 +930,7 @@ endif # SITE_METHOD
> > # ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'.
> > # Remove xzcat/lzip from the list of required dependencies, as they get built
> > # automatically if they're not found.
> > -DL_TOOLS_DEPENDENCIES += $$(filter-out xzcat lzip,$$(firstword $$(call suitable-extractor,$$($(2)_SOURCE))))
> > +DL_TOOLS_DEPENDENCIES += $$(filter-out xzcat lzip,$$(notdir $$(firstword $$(call suitable-extractor,$$($(2)_SOURCE)))))
Fixes my test case too, I tried:
DL_TOOLS_DEPENDENCIES += $$(filter-out $(HOST_DIR)/usr/bin/xzcat $(HOST_DIR)/usr/bin/lzip,$$(firstword $$(call suitable-extractor,$$($(2)_SOURCE))))
Regards,
Peter
> >
> > # Ensure all virtual targets are PHONY. Listed alphabetically.
> > .PHONY: $(1) \
>
> Thinking about it again, this is clearly not the right solution. It breaks
> custom BR2_LZCAT. I'll try to come up with something better.
>
> baruch
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 3/7] core: add generic support for lz archives
2017-02-09 21:16 ` Peter Seiderer
@ 2017-02-09 21:33 ` Baruch Siach
0 siblings, 0 replies; 17+ messages in thread
From: Baruch Siach @ 2017-02-09 21:33 UTC (permalink / raw)
To: buildroot
Hi Peter,
On Thu, Feb 09, 2017 at 10:16:35PM +0100, Peter Seiderer wrote:
> On Thu, 9 Feb 2017 23:11:28 +0200, Baruch Siach <baruch@tkos.co.il> wrote:
> > On Thu, Feb 09, 2017 at 11:00:37PM +0200, Baruch Siach wrote:
> > > On Thu, Feb 09, 2017 at 09:26:12PM +0100, Peter Seiderer wrote:
> > > > On Thu, 9 Feb 2017 21:50:14 +0200, Baruch Siach <baruch@tkos.co.il> wrote:
> > > > > This commit teaches the generic code how to extract .tar.lz archives. When
> > > > > lzip is not installed on the host, host-lzip gets built automatically.
> > > > >
> > > >
> > > > On my host there is no lzip installed, with your patches applied I get the following
> > > > error message:
> > > >
> > > > which: no lzip in (/home/seiderer/Work/build_arm_qt5_stdcpp11_001/host/usr/bin)
> > > > You must install '/home/seiderer/Work/build_arm_qt5_stdcpp11_001/host/usr/bin/lzip' on your build machine
> > > > support/dependencies/dependencies.mk:22: recipe for target 'core-dependencies' failed
> > > > make[1]: *** [core-dependencies] Error 1
> > > > Makefile:16: recipe for target '_all' failed
> > > > make: *** [_all] Error 2
> > >
> > > Thanks for testing.
> > >
> > > Does this fixes your problem?
> > >
> > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> > > index 303dda090daa..eb01c2fa0e2f 100644
> > > --- a/package/pkg-generic.mk
> > > +++ b/package/pkg-generic.mk
> > > @@ -930,7 +930,7 @@ endif # SITE_METHOD
> > > # ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'.
> > > # Remove xzcat/lzip from the list of required dependencies, as they get built
> > > # automatically if they're not found.
> > > -DL_TOOLS_DEPENDENCIES += $$(filter-out xzcat lzip,$$(firstword $$(call suitable-extractor,$$($(2)_SOURCE))))
> > > +DL_TOOLS_DEPENDENCIES += $$(filter-out xzcat lzip,$$(notdir $$(firstword $$(call suitable-extractor,$$($(2)_SOURCE)))))
>
>
> Fixes my test case too, I tried:
>
> DL_TOOLS_DEPENDENCIES += $$(filter-out $(HOST_DIR)/usr/bin/xzcat $(HOST_DIR)/usr/bin/lzip,$$(firstword $$(call suitable-extractor,$$($(2)_SOURCE))))
That might work, but it looks ugly. Thomas DS, you added the original xzcat
exclusion in commit d1f325f554cab (xzcat: treat as host prerequisite and build
if needed). Do you have a better suggestion?
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 4/7] ed: use generic extract command
2017-02-09 19:50 [Buildroot] [PATCH 1/7] lzip: use the more informative homepage link Baruch Siach
2017-02-09 19:50 ` [Buildroot] [PATCH 2/7] lzip: bump to version 1.18 Baruch Siach
2017-02-09 19:50 ` [Buildroot] [PATCH 3/7] core: add generic support for lz archives Baruch Siach
@ 2017-02-09 19:50 ` Baruch Siach
2017-02-09 19:50 ` [Buildroot] [PATCH 5/7] ddrescue: " Baruch Siach
` (3 subsequent siblings)
6 siblings, 0 replies; 17+ messages in thread
From: Baruch Siach @ 2017-02-09 19:50 UTC (permalink / raw)
To: buildroot
The generic code now knows how to extract .tar.lz archives. Remove the local
extract code.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/ed/ed.mk | 6 ------
1 file changed, 6 deletions(-)
diff --git a/package/ed/ed.mk b/package/ed/ed.mk
index 50adeb4ec5b4..6b9f65ec5280 100644
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -10,15 +10,9 @@ ED_SOURCE = ed-$(ED_VERSION).tar.lz
ED_CONF_OPTS = \
CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)"
-ED_DEPENDENCIES = host-lzip
ED_LICENSE = GPLv3+
ED_LICENSE_FILES = COPYING
-define ED_EXTRACT_CMDS
- $(HOST_DIR)/usr/bin/lzip -d -c $(DL_DIR)/$(ED_SOURCE) | \
- tar --strip-components=1 -C $(@D) $(TAR_OPTIONS) -
-endef
-
define ED_CONFIGURE_CMDS
(cd $(@D); \
$(TARGET_MAKE_ENV) ./configure \
--
2.11.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 5/7] ddrescue: use generic extract command
2017-02-09 19:50 [Buildroot] [PATCH 1/7] lzip: use the more informative homepage link Baruch Siach
` (2 preceding siblings ...)
2017-02-09 19:50 ` [Buildroot] [PATCH 4/7] ed: use generic extract command Baruch Siach
@ 2017-02-09 19:50 ` Baruch Siach
2017-02-09 19:50 ` [Buildroot] [PATCH 6/7] ocrad: " Baruch Siach
` (2 subsequent siblings)
6 siblings, 0 replies; 17+ messages in thread
From: Baruch Siach @ 2017-02-09 19:50 UTC (permalink / raw)
To: buildroot
The generic code now knows how to extract .tar.lz archives. Remove the local
extract code
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/ddrescue/ddrescue.mk | 6 ------
1 file changed, 6 deletions(-)
diff --git a/package/ddrescue/ddrescue.mk b/package/ddrescue/ddrescue.mk
index 23f03436e9fa..4c87e4dac8fa 100644
--- a/package/ddrescue/ddrescue.mk
+++ b/package/ddrescue/ddrescue.mk
@@ -9,11 +9,5 @@ DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz
DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue
DDRESCUE_LICENSE = GPLv2+
DDRESCUE_LICENSE_FILES = COPYING
-DDRESCUE_DEPENDENCIES = host-lzip
-
-define DDRESCUE_EXTRACT_CMDS
- $(HOST_DIR)/usr/bin/lzip -d -c $(DL_DIR)/$(DDRESCUE_SOURCE) | \
- tar --strip-components=1 -C $(@D) $(TAR_OPTIONS) -
-endef
$(eval $(autotools-package))
--
2.11.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 6/7] ocrad: use generic extract command
2017-02-09 19:50 [Buildroot] [PATCH 1/7] lzip: use the more informative homepage link Baruch Siach
` (3 preceding siblings ...)
2017-02-09 19:50 ` [Buildroot] [PATCH 5/7] ddrescue: " Baruch Siach
@ 2017-02-09 19:50 ` Baruch Siach
2017-02-09 19:50 ` [Buildroot] [PATCH 7/7] ddrescue: fix target build Baruch Siach
2017-02-09 20:36 ` [Buildroot] [PATCH 1/7] lzip: use the more informative homepage link Thomas Petazzoni
6 siblings, 0 replies; 17+ messages in thread
From: Baruch Siach @ 2017-02-09 19:50 UTC (permalink / raw)
To: buildroot
The generic code now knows how to extract .tar.lz archives. Remove the local
extract code
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/ocrad/ocrad.mk | 6 ------
1 file changed, 6 deletions(-)
diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk
index d19e83ef4279..54b607c79193 100644
--- a/package/ocrad/ocrad.mk
+++ b/package/ocrad/ocrad.mk
@@ -10,12 +10,6 @@ OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad
OCRAD_LICENSE = GPLv3+
OCRAD_LICENSE_FILES = COPYING
OCRAD_INSTALL_STAGING = YES
-OCRAD_DEPENDENCIES = host-lzip
-
-define OCRAD_EXTRACT_CMDS
- $(HOST_DIR)/usr/bin/lzip -d -c $(DL_DIR)/$(OCRAD_SOURCE) | \
- tar --strip-components=1 -C $(@D) $(TAR_OPTIONS) -
-endef
# This is not a true autotools package.
define OCRAD_CONFIGURE_CMDS
--
2.11.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 7/7] ddrescue: fix target build
2017-02-09 19:50 [Buildroot] [PATCH 1/7] lzip: use the more informative homepage link Baruch Siach
` (4 preceding siblings ...)
2017-02-09 19:50 ` [Buildroot] [PATCH 6/7] ocrad: " Baruch Siach
@ 2017-02-09 19:50 ` Baruch Siach
2017-02-09 20:40 ` Thomas Petazzoni
2017-02-09 20:36 ` [Buildroot] [PATCH 1/7] lzip: use the more informative homepage link Thomas Petazzoni
6 siblings, 1 reply; 17+ messages in thread
From: Baruch Siach @ 2017-02-09 19:50 UTC (permalink / raw)
To: buildroot
ddrescue is not an autotools package. Covert to generic package to make it
build correctly for target architecture.
Cc: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/ddrescue/ddrescue.mk | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/package/ddrescue/ddrescue.mk b/package/ddrescue/ddrescue.mk
index 4c87e4dac8fa..4e244e6bdaef 100644
--- a/package/ddrescue/ddrescue.mk
+++ b/package/ddrescue/ddrescue.mk
@@ -10,4 +10,20 @@ DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue
DDRESCUE_LICENSE = GPLv2+
DDRESCUE_LICENSE_FILES = COPYING
-$(eval $(autotools-package))
+define DDRESCUE_CONFIGURE_CMDS
+ (cd $(@D); \
+ $(TARGET_MAKE_ENV) ./configure \
+ --prefix=/usr \
+ $(TARGET_CONFIGURE_OPTS) \
+ )
+endef
+
+define DDRESCUE_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define DDRESCUE_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
+endef
+
+$(eval $(generic-package))
--
2.11.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 7/7] ddrescue: fix target build
2017-02-09 19:50 ` [Buildroot] [PATCH 7/7] ddrescue: fix target build Baruch Siach
@ 2017-02-09 20:40 ` Thomas Petazzoni
2017-02-09 20:52 ` Baruch Siach
2017-02-09 20:56 ` Peter Seiderer
0 siblings, 2 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2017-02-09 20:40 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 9 Feb 2017 21:50:18 +0200, Baruch Siach wrote:
> ddrescue is not an autotools package. Covert to generic package to make it
> build correctly for target architecture.
>
> Cc: Peter Seiderer <ps.report@gmx.net>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> package/ddrescue/ddrescue.mk | 18 +++++++++++++++++-
> 1 file changed, 17 insertions(+), 1 deletion(-)
It's really weird to have this mixed with a patch series related to
improving lzip support. I know ddrescue is using lzip, but this patch
is really unrelated from lzip support. It would be better to send such
patches separately.
Nevertheless, this was very useful, so I've applied. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 7/7] ddrescue: fix target build
2017-02-09 20:40 ` Thomas Petazzoni
@ 2017-02-09 20:52 ` Baruch Siach
2017-02-09 20:56 ` Peter Seiderer
1 sibling, 0 replies; 17+ messages in thread
From: Baruch Siach @ 2017-02-09 20:52 UTC (permalink / raw)
To: buildroot
Hi Thomas,
On Thu, Feb 09, 2017 at 09:40:44PM +0100, Thomas Petazzoni wrote:
> On Thu, 9 Feb 2017 21:50:18 +0200, Baruch Siach wrote:
> > ddrescue is not an autotools package. Covert to generic package to make it
> > build correctly for target architecture.
> >
> > Cc: Peter Seiderer <ps.report@gmx.net>
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > ---
> > package/ddrescue/ddrescue.mk | 18 +++++++++++++++++-
> > 1 file changed, 17 insertions(+), 1 deletion(-)
>
> It's really weird to have this mixed with a patch series related to
> improving lzip support. I know ddrescue is using lzip, but this patch
> is really unrelated from lzip support. It would be better to send such
> patches separately.
I found the problem when testing ddrescue build, and the patch context depends
on the previous patch. So I thought it might be better to keep the path in
this series to indicate the dependency.
But you are right. I should have posted this patch separately.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 7/7] ddrescue: fix target build
2017-02-09 20:40 ` Thomas Petazzoni
2017-02-09 20:52 ` Baruch Siach
@ 2017-02-09 20:56 ` Peter Seiderer
1 sibling, 0 replies; 17+ messages in thread
From: Peter Seiderer @ 2017-02-09 20:56 UTC (permalink / raw)
To: buildroot
Hello Baruch, Thomas,
On Thu, 9 Feb 2017 21:40:44 +0100, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Thu, 9 Feb 2017 21:50:18 +0200, Baruch Siach wrote:
> > ddrescue is not an autotools package. Covert to generic package to make it
> > build correctly for target architecture.
> >
> > Cc: Peter Seiderer <ps.report@gmx.net>
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > ---
> > package/ddrescue/ddrescue.mk | 18 +++++++++++++++++-
> > 1 file changed, 17 insertions(+), 1 deletion(-)
>
> It's really weird to have this mixed with a patch series related to
> improving lzip support. I know ddrescue is using lzip, but this patch
> is really unrelated from lzip support. It would be better to send such
> patches separately.
>
> Nevertheless, this was very useful, so I've applied. Thanks!
To late for my Tested-by ;-)
Nevertheless many thanks for spotting this one...
Regards,
Peter
>
> Thomas
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 1/7] lzip: use the more informative homepage link
2017-02-09 19:50 [Buildroot] [PATCH 1/7] lzip: use the more informative homepage link Baruch Siach
` (5 preceding siblings ...)
2017-02-09 19:50 ` [Buildroot] [PATCH 7/7] ddrescue: fix target build Baruch Siach
@ 2017-02-09 20:36 ` Thomas Petazzoni
6 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2017-02-09 20:36 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 9 Feb 2017 21:50:12 +0200, Baruch Siach wrote:
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> package/lzip/Config.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 17+ messages in thread