* [ptxdist] [PATCH 1/2] host-libarchive: Disable zstd.
@ 2022-12-12 19:45 Christian Melki
2022-12-12 19:45 ` [ptxdist] [PATCH 2/2] libarchive: Version bump. 3.61 -> 3.62 plus config changes Christian Melki
2023-01-03 11:08 ` [ptxdist] [APPLIED] host-libarchive: Disable zstd Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Christian Melki @ 2022-12-12 19:45 UTC (permalink / raw)
To: ptxdist
Only host-opkg uses host-libarchive.
And we don't use zstd there yet.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/host-libarchive.make | 1 +
1 file changed, 1 insertion(+)
diff --git a/rules/host-libarchive.make b/rules/host-libarchive.make
index 6d22d6846..0b57f587d 100644
--- a/rules/host-libarchive.make
+++ b/rules/host-libarchive.make
@@ -38,6 +38,7 @@ HOST_LIBARCHIVE_CONF_OPT := \
--without-bz2lib \
--without-iconv \
--without-lz4 \
+ --without-zstd \
--without-lzma \
--without-lzo2 \
--without-cng \
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH 2/2] libarchive: Version bump. 3.61 -> 3.62 plus config changes.
2022-12-12 19:45 [ptxdist] [PATCH 1/2] host-libarchive: Disable zstd Christian Melki
@ 2022-12-12 19:45 ` Christian Melki
2023-01-03 11:08 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-01-03 11:08 ` [ptxdist] [APPLIED] host-libarchive: Disable zstd Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Christian Melki @ 2022-12-12 19:45 UTC (permalink / raw)
To: ptxdist
Minor bugfixes.
https://github.com/libarchive/libarchive/releases/tag/v3.6.2
* Wire up zstd in case anyone needs it.
* Same for openssl. In case anyone needs it.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/libarchive.in | 10 ++++++++++
rules/libarchive.make | 8 ++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/rules/libarchive.in b/rules/libarchive.in
index a631a6eef..b80c2147b 100644
--- a/rules/libarchive.in
+++ b/rules/libarchive.in
@@ -4,15 +4,21 @@ menuconfig LIBARCHIVE
tristate
select GCCLIBS_GCC_S
select ZLIB
+ select OPENSSL if LIBARCHIVE_OPENSSL
select BZIP2 if LIBARCHIVE_BZIP2
select BZIP2_LIBBZ2 if LIBARCHIVE_BZIP2
select XZ if LIBARCHIVE_LZMA
+ select ZSTD if LIBARCHIVE_ZSTD
prompt "libarchive "
help
Multi-format archive and compression library.
if LIBARCHIVE
+config LIBARCHIVE_OPENSSL
+ bool
+ prompt "openssl support"
+
config LIBARCHIVE_BZIP2
bool
prompt "bzip2 support"
@@ -21,6 +27,10 @@ config LIBARCHIVE_LZMA
bool
prompt "xz support"
+config LIBARCHIVE_ZSTD
+ bool
+ prompt "zstd support"
+
config LIBARCHIVE_BSDTAR
bool
prompt "install bsdtar"
diff --git a/rules/libarchive.make b/rules/libarchive.make
index e75034d74..1d505e71f 100644
--- a/rules/libarchive.make
+++ b/rules/libarchive.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBARCHIVE) += libarchive
#
# Paths and names
#
-LIBARCHIVE_VERSION := 3.6.1
-LIBARCHIVE_MD5 := 802a56ef9eaa0b8776296ba78a6d0c2c
+LIBARCHIVE_VERSION := 3.6.2
+LIBARCHIVE_MD5 := b5b8efa8cba29396816d0dd5f61f3de3
LIBARCHIVE := libarchive-$(LIBARCHIVE_VERSION)
LIBARCHIVE_SUFFIX := tar.gz
LIBARCHIVE_URL := https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
@@ -54,13 +54,13 @@ LIBARCHIVE_CONF_OPT := \
--without-libb2 \
--without-iconv \
--without-lz4 \
- --without-zstd \
+ --$(call ptx/wwo, PTXCONF_LIBARCHIVE_ZSTD)-zstd \
--$(call ptx/wwo, PTXCONF_LIBARCHIVE_LZMA)-lzma \
--without-lzo2 \
--without-cng \
--without-mbedtls \
--without-nettle \
- --without-openssl \
+ --$(call ptx/wwo, PTXCONF_LIBARCHIVE_OPENSSL)-openssl \
--without-xml2 \
--without-expat
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] libarchive: Version bump. 3.61 -> 3.62 plus config changes.
2022-12-12 19:45 ` [ptxdist] [PATCH 2/2] libarchive: Version bump. 3.61 -> 3.62 plus config changes Christian Melki
@ 2023-01-03 11:08 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2023-01-03 11:08 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 3b79f344d7473c841d026635e1555a34bbd8b7c4.
Michael
[sent from post-receive hook]
On Tue, 03 Jan 2023 12:08:15 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Minor bugfixes.
> https://github.com/libarchive/libarchive/releases/tag/v3.6.2
>
> * Wire up zstd in case anyone needs it.
> * Same for openssl. In case anyone needs it.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20221212194519.1589655-2-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libarchive.in b/rules/libarchive.in
> index a631a6eef56b..b80c2147b866 100644
> --- a/rules/libarchive.in
> +++ b/rules/libarchive.in
> @@ -4,15 +4,21 @@ menuconfig LIBARCHIVE
> tristate
> select GCCLIBS_GCC_S
> select ZLIB
> + select OPENSSL if LIBARCHIVE_OPENSSL
> select BZIP2 if LIBARCHIVE_BZIP2
> select BZIP2_LIBBZ2 if LIBARCHIVE_BZIP2
> select XZ if LIBARCHIVE_LZMA
> + select ZSTD if LIBARCHIVE_ZSTD
> prompt "libarchive "
> help
> Multi-format archive and compression library.
>
> if LIBARCHIVE
>
> +config LIBARCHIVE_OPENSSL
> + bool
> + prompt "openssl support"
> +
> config LIBARCHIVE_BZIP2
> bool
> prompt "bzip2 support"
> @@ -21,6 +27,10 @@ config LIBARCHIVE_LZMA
> bool
> prompt "xz support"
>
> +config LIBARCHIVE_ZSTD
> + bool
> + prompt "zstd support"
> +
> config LIBARCHIVE_BSDTAR
> bool
> prompt "install bsdtar"
> diff --git a/rules/libarchive.make b/rules/libarchive.make
> index e75034d74fea..1d505e71f4c1 100644
> --- a/rules/libarchive.make
> +++ b/rules/libarchive.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBARCHIVE) += libarchive
> #
> # Paths and names
> #
> -LIBARCHIVE_VERSION := 3.6.1
> -LIBARCHIVE_MD5 := 802a56ef9eaa0b8776296ba78a6d0c2c
> +LIBARCHIVE_VERSION := 3.6.2
> +LIBARCHIVE_MD5 := b5b8efa8cba29396816d0dd5f61f3de3
> LIBARCHIVE := libarchive-$(LIBARCHIVE_VERSION)
> LIBARCHIVE_SUFFIX := tar.gz
> LIBARCHIVE_URL := https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
> @@ -54,13 +54,13 @@ LIBARCHIVE_CONF_OPT := \
> --without-libb2 \
> --without-iconv \
> --without-lz4 \
> - --without-zstd \
> + --$(call ptx/wwo, PTXCONF_LIBARCHIVE_ZSTD)-zstd \
> --$(call ptx/wwo, PTXCONF_LIBARCHIVE_LZMA)-lzma \
> --without-lzo2 \
> --without-cng \
> --without-mbedtls \
> --without-nettle \
> - --without-openssl \
> + --$(call ptx/wwo, PTXCONF_LIBARCHIVE_OPENSSL)-openssl \
> --without-xml2 \
> --without-expat
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] host-libarchive: Disable zstd.
2022-12-12 19:45 [ptxdist] [PATCH 1/2] host-libarchive: Disable zstd Christian Melki
2022-12-12 19:45 ` [ptxdist] [PATCH 2/2] libarchive: Version bump. 3.61 -> 3.62 plus config changes Christian Melki
@ 2023-01-03 11:08 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2023-01-03 11:08 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 15a2035a259b9ef7f69f26b48bdf311e66f07914.
Michael
[sent from post-receive hook]
On Tue, 03 Jan 2023 12:08:14 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Only host-opkg uses host-libarchive.
> And we don't use zstd there yet.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20221212194519.1589655-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-libarchive.make b/rules/host-libarchive.make
> index 6d22d6846677..0b57f587d36a 100644
> --- a/rules/host-libarchive.make
> +++ b/rules/host-libarchive.make
> @@ -38,6 +38,7 @@ HOST_LIBARCHIVE_CONF_OPT := \
> --without-bz2lib \
> --without-iconv \
> --without-lz4 \
> + --without-zstd \
> --without-lzma \
> --without-lzo2 \
> --without-cng \
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-03 11:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-12 19:45 [ptxdist] [PATCH 1/2] host-libarchive: Disable zstd Christian Melki
2022-12-12 19:45 ` [ptxdist] [PATCH 2/2] libarchive: Version bump. 3.61 -> 3.62 plus config changes Christian Melki
2023-01-03 11:08 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-01-03 11:08 ` [ptxdist] [APPLIED] host-libarchive: Disable zstd Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox