diff mbox series

[1/8] zchunk: upgrade to 1.2.3

Message ID 20230220154614.42832-1-ross.burton@arm.com
State Under Review
Headers show
Series [1/8] zchunk: upgrade to 1.2.3 | expand

Commit Message

Ross Burton Feb. 20, 2023, 3:46 p.m. UTC
---
 .../{zchunk_1.2.0.bb => zchunk_1.2.3.bb}       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
 rename meta-oe/recipes-support/zchunk/{zchunk_1.2.0.bb => zchunk_1.2.3.bb} (52%)

Comments

Khem Raj Feb. 22, 2023, 9:07 a.m. UTC | #1
fails to build on musl/aarch64 see
https://errors.yoctoproject.org/Errors/Details/695672/

On Mon, Feb 20, 2023 at 7:46 AM Ross Burton <ross.burton@arm.com> wrote:
>
> ---
>  .../{zchunk_1.2.0.bb => zchunk_1.2.3.bb}       | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
>  rename meta-oe/recipes-support/zchunk/{zchunk_1.2.0.bb => zchunk_1.2.3.bb} (52%)
>
> diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb b/meta-oe/recipes-support/zchunk/zchunk_1.2.3.bb
> similarity index 52%
> rename from meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb
> rename to meta-oe/recipes-support/zchunk/zchunk_1.2.3.bb
> index 0baea5032a..760d650de6 100644
> --- a/meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb
> +++ b/meta-oe/recipes-support/zchunk/zchunk_1.2.3.bb
> @@ -6,17 +6,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242"
>
>  SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main"
>
> -SRCREV = "dd6a30a1e4e8b738b0cafc682f3c00e7706134e5"
> +SRCREV = "f16dbeb0831eb37a9397356570327abb97860875"
>  S = "${WORKDIR}/git"
>
> -DEPENDS = "\
> -    curl \
> -    zstd \
> -    "
> -
> +DEPENDS = "zstd"
>  DEPENDS:append:libc-musl = " argp-standalone"
> -LDFLAGS:append:libc-musl = " -largp"
>
> -inherit meson pkgconfig
> +inherit meson pkgconfig lib_package
> +
> +PACKAGECONFIG ??= "openssl zckdl"
> +
> +# zckdl gets packaged into zchunk-bin
> +PACKAGECONFIG[zckdl] = "-Dwith-curl=enabled,-Dwith-curl=disabled,curl"
> +# Use OpenSSL primitives for SHA
> +PACKAGECONFIG[openssl] = "-Dwith-openssl=enabled,-Dwith-openssl=disabled,openssl"
>
>  BBCLASSEXTEND = "native nativesdk"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#101168): https://lists.openembedded.org/g/openembedded-devel/message/101168
> Mute This Topic: https://lists.openembedded.org/mt/97088330/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb b/meta-oe/recipes-support/zchunk/zchunk_1.2.3.bb
similarity index 52%
rename from meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb
rename to meta-oe/recipes-support/zchunk/zchunk_1.2.3.bb
index 0baea5032a..760d650de6 100644
--- a/meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb
+++ b/meta-oe/recipes-support/zchunk/zchunk_1.2.3.bb
@@ -6,17 +6,19 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242"
 
 SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main"
 
-SRCREV = "dd6a30a1e4e8b738b0cafc682f3c00e7706134e5"
+SRCREV = "f16dbeb0831eb37a9397356570327abb97860875"
 S = "${WORKDIR}/git"
 
-DEPENDS = "\
-    curl \
-    zstd \
-    "
-
+DEPENDS = "zstd"
 DEPENDS:append:libc-musl = " argp-standalone"
-LDFLAGS:append:libc-musl = " -largp"
 
-inherit meson pkgconfig
+inherit meson pkgconfig lib_package
+
+PACKAGECONFIG ??= "openssl zckdl"
+
+# zckdl gets packaged into zchunk-bin
+PACKAGECONFIG[zckdl] = "-Dwith-curl=enabled,-Dwith-curl=disabled,curl"
+# Use OpenSSL primitives for SHA
+PACKAGECONFIG[openssl] = "-Dwith-openssl=enabled,-Dwith-openssl=disabled,openssl"
 
 BBCLASSEXTEND = "native nativesdk"