Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de>
---
Hello,
changes since v1:
- host-libarchive: add missing new + remove old options
Marc
rules/host-libarchive.make | 4 +++-
rules/libarchive.in | 4 ++++
rules/libarchive.make | 11 ++++++++---
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/rules/host-libarchive.make b/rules/host-libarchive.make
index 0f992979e4f4..1dd36730b37c 100644
--- a/rules/host-libarchive.make
+++ b/rules/host-libarchive.make
@@ -25,6 +25,7 @@ HOST_LIBARCHIVE_CONF_OPT := \
$(HOST_AUTOCONF) \
--disable-static \
--disable-bsdtar \
+ --disable-bsdcat \
--disable-bsdcpio \
--disable-rpath \
--enable-posix-regex-lib=libc \
@@ -32,10 +33,11 @@ HOST_LIBARCHIVE_CONF_OPT := \
--disable-acl \
--with-zlib \
--without-bz2lib \
- --without-lzmadec \
--without-iconv \
+ --without-lz4 \
--without-lzma \
--without-lzo2 \
+ --without-cng \
--without-nettle \
--without-openssl \
--without-xml2 \
diff --git a/rules/libarchive.in b/rules/libarchive.in
index 77987a4391a4..a631a6eef56b 100644
--- a/rules/libarchive.in
+++ b/rules/libarchive.in
@@ -25,6 +25,10 @@ config LIBARCHIVE_BSDTAR
bool
prompt "install bsdtar"
+config LIBARCHIVE_BSDCAT
+ bool
+ prompt "install bsdcat"
+
config LIBARCHIVE_BSDCPIO
bool
prompt "install bsdcpio"
diff --git a/rules/libarchive.make b/rules/libarchive.make
index b2eb7393298a..f4252df350f1 100644
--- a/rules/libarchive.make
+++ b/rules/libarchive.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBARCHIVE) += libarchive
#
# Paths and names
#
-LIBARCHIVE_VERSION := 3.1.2
-LIBARCHIVE_MD5 := efad5a503f66329bb9d2f4308b5de98a
+LIBARCHIVE_VERSION := 3.3.2
+LIBARCHIVE_MD5 := 4583bd6b2ebf7e0e8963d90879eb1b27
LIBARCHIVE := libarchive-$(LIBARCHIVE_VERSION)
LIBARCHIVE_SUFFIX := tar.gz
LIBARCHIVE_URL :=
http://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
@@ -36,6 +36,7 @@ LIBARCHIVE_CONF_TOOL := autoconf
LIBARCHIVE_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--$(call ptx/endis, PTXCONF_LIBARCHIVE_BSDTAR)-bsdtar \
+ --$(call ptx/endis, PTXCONF_LIBARCHIVE_BSDCAT)-bsdcat \
--$(call ptx/endis, PTXCONF_LIBARCHIVE_BSDCPIO)-bsdcpio \
--disable-rpath \
--enable-posix-regex-lib=libc \
@@ -44,10 +45,11 @@ LIBARCHIVE_CONF_OPT := \
$(GLOBAL_LARGE_FILE_OPTION) \
--with-zlib \
--$(call ptx/wwo, PTXCONF_LIBARCHIVE_BZIP2)-bz2lib \
- --with-lzmadec \
--without-iconv \
+ --without-lz4 \
--$(call ptx/wwo, PTXCONF_LIBARCHIVE_LZMA)-lzma \
--without-lzo2 \
+ --without-cng \
--without-nettle \
--without-openssl \
--without-xml2 \
@@ -70,6 +72,9 @@ $(STATEDIR)/libarchive.targetinstall:
ifdef PTXCONF_LIBARCHIVE_BSDTAR
@$(call install_copy, libarchive, 0, 0, 0755, -, /usr/bin/bsdtar)
endif
+ifdef PTXCONF_LIBARCHIVE_BSDCAT
+ @$(call install_copy, libarchive, 0, 0, 0755, -, /usr/bin/bsdcat)
+endif
ifdef PTXCONF_LIBARCHIVE_BSDCPIO
@$(call install_copy, libarchive, 0, 0, 0755, -, /usr/bin/bsdcpio)
endif
--
2.15.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
