Skip to contentSkip to conversation

lzip: use the more informative homepage link

PATCH New Baruch Siach 3 participants 17 messages Feb 9, 2017 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/7 lzip: use the more informative homepage link

---
 package/lzip/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/lzip/Config.in +1 -1
index f20d0e5daa37..821cd2629288 100644
@@ -11,4 +11,4 @@ config BR2_PACKAGE_LZIP
 	  bzip2, and is better than both from a data recovery perspective.
 	  Lzip is a clean implementation of the LZMA algorithm.
 
-	  http://savannah.nongnu.org/projects/lzip
+	  http://www.nongnu.org/lzip/lzip.html
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/7 lzip: bump to version 1.18

Also, correct license.

---
 package/lzip/lzip.hash | 4 +++-
 package/lzip/lzip.mk   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
package/lzip/lzip.hash +3 -1
index 7b83e3e6a2b0..8855231fb3f4 100644
@@ -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
package/lzip/lzip.mk +2 -2
index 8180fd0a465f..db04862c53f1 100644
@@ -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
Signature · 1 line
2.11.0
#2 lore raw

PATCH 2/7 lzip: bump to version 1.18

Hello,

Quoted 7 lines · Baruch Siach

Also, correct license.

---
 package/lzip/lzip.hash | 4 +++-
 package/lzip/lzip.mk   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 3/7 core: add generic support for lz archives

In reply to Baruch Siach

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.

---
 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
Config.in +7 -0
index ccd777e8bb00..bd8f0d1a10ee 100644
@@ -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 ""
Makefile +1 -0
index df3b64eb03ec..b4550e098958 100644
@@ -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
package/pkg-generic.mk +3 -5
index 3ca71b03b9df..303dda090daa 100644
@@ -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) \
package/pkg-utils.mk +1 -0
index c5d4080c72f4..bc926dadeffd 100644
@@ -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)
support/dependencies/check-host-lzip.mk new file +4 -0
new file mode 100644
index 000000000000..32ab9f4daffe
@@ -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
support/dependencies/check-host-lzip.sh new file +14 -0
new file mode 100755
index 000000000000..4f8a2ba3de5b
@@ -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
Signature · 1 line
2.11.0
#4 lore raw

PATCH 3/7 core: add generic support for lz archives

Hello Baruch,

Quoted 3 lines · Baruch Siach

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

Quoted 103 lines
---
 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
Config.in +7 -0
index ccd777e8bb00..bd8f0d1a10ee 100644
@@ -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 ""
Makefile +1 -0
index df3b64eb03ec..b4550e098958 100644
@@ -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
package/pkg-generic.mk +3 -5
index 3ca71b03b9df..303dda090daa 100644
@@ -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) \
package/pkg-utils.mk +1 -0
index c5d4080c72f4..bc926dadeffd 100644
@@ -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)
support/dependencies/check-host-lzip.mk new file +4 -0
new file mode 100644
index 000000000000..32ab9f4daffe
@@ -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
support/dependencies/check-host-lzip.sh new file +14 -0
new file mode 100755
index 000000000000..4f8a2ba3de5b
@@ -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
#5 lore raw

PATCH 3/7 core: add generic support for lz archives

Hi Peter,

Quoted 8 lines · Peter Seiderer
Quoted 3 lines · Baruch Siach

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:

Quoted 6 lines

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?

package/pkg-generic.mk +1 -1
index 303dda090daa..eb01c2fa0e2f 100644
@@ -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

Signature · 3 lines
     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 -
#6 lore raw

PATCH 3/7 core: add generic support for lz archives

Hi Peter,

Quoted 25 lines · Baruch Siach
Quoted 8 lines · Peter Seiderer
Quoted 3 lines · Baruch Siach

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:

Quoted 6 lines

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?

package/pkg-generic.mk +0 -0
index 303dda090daa..eb01c2fa0e2f 100644

package/pkg-generic.mk endif # SITE_METHOD · line 936

Quoted 8 lines
package/pkg-generic.mk +1 -1
@@ -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

Signature · 3 lines
     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 -
#7 lore raw

PATCH 3/7 core: add generic support for lz archives

Hello Baruch,

Quoted 23 lines · Baruch Siach

Hi Peter,

Quoted 20 lines · Baruch Siach
Quoted 8 lines · Peter Seiderer
Quoted 3 lines · Baruch Siach

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:

Quoted 6 lines

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?

Quoted 10 lines

package/pkg-generic.mk endif # SITE_METHOD · line 933

Quoted 10 lines
package/pkg-generic.mk +1 -1
index 303dda090daa..eb01c2fa0e2f 100644
@@ -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

Quoted 9 lines

package/pkg-generic.mk endif # SITE_METHOD · line 936

Quoted 3 lines
package/pkg-generic.mk +0 -0
 # 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

#8 lore raw

PATCH 3/7 core: add generic support for lz archives

Hi Peter,

Quoted 36 lines · Peter Seiderer
Quoted 21 lines · Baruch Siach
Quoted 20 lines · Baruch Siach
Quoted 8 lines · Peter Seiderer
Quoted 3 lines · Baruch Siach

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:

Quoted 6 lines

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?

Quoted 10 lines

package/pkg-generic.mk endif # SITE_METHOD · line 933

Quoted 10 lines
package/pkg-generic.mk +1 -1
index 303dda090daa..eb01c2fa0e2f 100644
@@ -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:

Quoted 1 line

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

Signature · 3 lines
     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 -
#9 lore raw

PATCH 4/7 ed: use generic extract command

In reply to Baruch Siach

The generic code now knows how to extract .tar.lz archives. Remove the local extract code.

---
 package/ed/ed.mk | 6 ------
 1 file changed, 6 deletions(-)
package/ed/ed.mk +0 -6
index 50adeb4ec5b4..6b9f65ec5280 100644
@@ -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 \
Signature · 1 line
2.11.0
#10 lore raw

PATCH 5/7 ddrescue: use generic extract command

In reply to Baruch Siach

The generic code now knows how to extract .tar.lz archives. Remove the local extract code

---
 package/ddrescue/ddrescue.mk | 6 ------
 1 file changed, 6 deletions(-)
package/ddrescue/ddrescue.mk +0 -6
index 23f03436e9fa..4c87e4dac8fa 100644
@@ -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))
Signature · 1 line
2.11.0
#11 lore raw

PATCH 6/7 ocrad: use generic extract command

In reply to Baruch Siach

The generic code now knows how to extract .tar.lz archives. Remove the local extract code

---
 package/ocrad/ocrad.mk | 6 ------
 1 file changed, 6 deletions(-)
package/ocrad/ocrad.mk +0 -6
index d19e83ef4279..54b607c79193 100644
@@ -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
Signature · 1 line
2.11.0
#12 lore raw

PATCH 7/7 ddrescue: fix target build

In reply to Baruch Siach

ddrescue is not an autotools package. Covert to generic package to make it build correctly for target architecture.

Cc Peter Seiderer <[email protected]>
---
 package/ddrescue/ddrescue.mk | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)
package/ddrescue/ddrescue.mk +17 -1
index 4c87e4dac8fa..4e244e6bdaef 100644
@@ -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))
Signature · 1 line
2.11.0
#13 lore raw

PATCH 7/7 ddrescue: fix target build

Hello,

Quoted 8 lines · Baruch Siach

ddrescue is not an autotools package. Covert to generic package to make it build correctly for target architecture.

Cc Peter Seiderer <[email protected]>
---
 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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#14 lore raw

PATCH 7/7 ddrescue: fix target build

Hi Thomas,

Quoted 10 lines · Thomas Petazzoni
Quoted 8 lines · Baruch Siach

ddrescue is not an autotools package. Covert to generic package to make it build correctly for target architecture.

Cc Peter Seiderer <[email protected]>
---
 package/ddrescue/ddrescue.mk | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)
Quoted 4 lines

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

Signature · 3 lines
     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 -
#15 lore raw

PATCH 7/7 ddrescue: fix target build

In reply to Thomas Petazzoni

Hello Baruch, Thomas,

Quoted 12 lines · Thomas Petazzoni

Hello,

Quoted 8 lines · Baruch Siach

ddrescue is not an autotools package. Covert to generic package to make it build correctly for target architecture.

Cc Peter Seiderer <[email protected]>
---
 package/ddrescue/ddrescue.mk | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)
Quoted 6 lines

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

Quoted 2 lines

Thomas

#16 lore raw

PATCH 1/7 lzip: use the more informative homepage link

In reply to Baruch Siach

Hello,

Quoted 4 lines · Baruch Siach
---
 package/lzip/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com