libarchive: add hash and enable lzma support
PATCH 1/1 libarchive: add hash and enable lzma support
From: Nimai Mahajan <[email protected]>
Add libarchive hash. Enable lzma support.
Both xz and lzma support are provided by the xz library. This maintains consistency with how the other CONF_OPTS are defined.
--- package/libarchive/libarchive.hash | 2 ++ package/libarchive/libarchive.mk | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 package/libarchive/libarchive.hash
package/libarchive/libarchive.hash new file +2 -0
@@ -0,0 +1,2 @@ +# Locally computed: +sha256 eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e libarchive-3.1.2.tar.gz
package/libarchive/libarchive.mk +6 -1
@@ -9,7 +9,6 @@ LIBARCHIVE_SITE = http://www.libarchive.org/downloads LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2c, BSD-3c LIBARCHIVE_LICENSE_FILES = COPYING -LIBARCHIVE_CONF_OPTS = --without-lzma ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y)
@@ -86,4 +85,10 @@ else LIBARCHIVE_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_XZ),y) +LIBARCHIVE_DEPENDENCIES += xz +else +LIBARCHIVE_CONF_OPTS += --without-lzma +endif + $(eval $(autotools-package))
Signature · 1 line
1.9.1
PATCH 1/1 libarchive: add hash and enable lzma support
Dear Nimai Mahajan,
Quoted 34 lines · Nimai Mahajan
From: Nimai Mahajan <[email protected]>
Add libarchive hash. Enable lzma support.
Both xz and lzma support are provided by the xz library. This maintains consistency with how the otherCONF_OPTSare defined.Signed-off-by Nimai Mahajan <[email protected]>--- package/libarchive/libarchive.hash | 2 ++ package/libarchive/libarchive.mk | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 package/libarchive/libarchive.hashpackage/libarchive/libarchive.hash new file +2
-0@@ -0,0 +1,2 @@ +# Locally computed: +sha256 eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e libarchive-3.1.2.tar.gzpackage/libarchive/libarchive.mk +0
-1@@ -9,7 +9,6 @@ LIBARCHIVE_SITE = http://www.libarchive.org/downloads LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2c, BSD-3c LIBARCHIVE_LICENSE_FILES = COPYING -LIBARCHIVE_CONF_OPTS = --without-lzma ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y)
package/libarchive/libarchive.mk else · line 89
Quoted 5 lines
package/libarchive/libarchive.mk +2
-0@@ -86,4 +85,10 @@ else LIBARCHIVE_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_XZ),y) +LIBARCHIVE_DEPENDENCIES += xz
In his review, Arnout asked you to pass --with-lzma in this case, but you forgot to do it. So I've that and applied. Thanks!
Also, note that this patch should have been marked as "PATCH v2", by using:
git format-patch --subject-prefix="PATCH v2"
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 libarchive: add hash and enable lzma support
Quoted 10 lines · Thomas Petazzoni
Dear Nimai Mahajan,
Quoted 6 lines · Nimai Mahajan
From: Nimai Mahajan <[email protected]>
Add libarchive hash. Enable lzma support.
Both xz and lzma support are provided by the xz library. This maintains consistency with how the otherCONF_OPTSare defined.
Quoted 8 lines
Review
Quoted 8 lines
Signed-off-by Nimai Mahajan <[email protected]>--- package/libarchive/libarchive.hash | 2 ++ package/libarchive/libarchive.mk | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 package/libarchive/libarchive.hash(quoted diff) +0
-0
b/package/libarchive/libarchive.hash
Quoted 7 lines
package/libarchive/libarchive.hash line 2
Quoted 7 lines
new file mode 100644
index 0000000..5f96211package/libarchive/libarchive.hash new file +2
-0@@ -0,0 +1,2 @@ +# Locally computed: +sha256
eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e libarchive-3.1.2.tar.gz
Quoted 1 line
package/libarchive/
Quoted 1 line
package/libarchive/ renamed from package/libarchive/libarchive.mk +0
-0
libarchive.mk
Quoted 15 lines
Quoted 15 lines
index 61528d9..18fa8b7 100644
package/libarchive/libarchive.mk +0
-1@@ -9,7 +9,6 @@ LIBARCHIVE_SITE = http://www.libarchive.org/downloads LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2c, BSD-3c LIBARCHIVE_LICENSE_FILES = COPYING -LIBARCHIVE_CONF_OPTS = --without-lzma ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y)@@ -86,4 +85,10 @@ else LIBARCHIVE_CONF_OPTS += --without-zlib endif
Quoted 5 lines
package/libarchive/libarchive.mk else · line 89
Quoted 2 lines
package/libarchive/libarchive.mk +2
-0+ifeq ($(BR2_PACKAGE_XZ),y) +LIBARCHIVE_DEPENDENCIES += xzIn his review, Arnout asked you to pass --with-lzma in this case, but you forgot to do it. So I've that and applied. Thanks!
Thanks, I had seen that actually but I was trying to be consistent with the other options there, which specified the package dependency (i.e. zlib) followed by the configure options if it wasnt selected (i.e. without-zlib). But point taken.
Quoted 4 lines
Also, note that this patch should have been marked as "PATCH v2", by using:
git format-patch --subject-prefix="PATCH v2"
Thanks, noted for next time! Appreciate the help once again.
Quoted 6 lines
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20150626/c180f819/attachment.html>
PATCH 1/1 libarchive: add hash and enable lzma support
Dear Nimai Mahajan,
Quoted 7 lines · Nimai Mahajan
Quoted 2 lines
In his review, Arnout asked you to pass --with-lzma in this case, but you forgot to do it. So I've that and applied. Thanks!
Thanks, I had seen that actually but I was trying to be consistent with the other options there, which specified the package dependency (i.e. zlib) followed by the configure options if it wasnt selected (i.e. without-zlib). But point taken.
In general, when Arnout makes a suggestion, he is right :-)
In this specific case, the rest of libarchive.mk is in fact not good, and should be changed to explicitly pass --with-<foo>.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com