[meta-oe] libkcapi: update to 1.3.1

Message ID 20211215191550.1964457-1-open.source@oleksandr-kravchuk.com
State New
Headers show
Series [meta-oe] libkcapi: update to 1.3.1 | expand

Commit Message

Oleksandr Kravchuk Dec. 15, 2021, 7:15 p.m. UTC
Dropped upstreamed patch.

License-Update: copyright years updated.

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
---
 ...f-__NR_io_getevents-when-not-defined.patch | 36 -------------------
 .../{libkcapi_1.2.1.bb => libkcapi_1.3.1.bb}  |  8 ++---
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch
 rename meta-oe/recipes-crypto/libkcapi/{libkcapi_1.2.1.bb => libkcapi_1.3.1.bb} (81%)

Comments

Khem Raj Dec. 16, 2021, 4:34 p.m. UTC | #1
it fails to build on musl/aarch64 see
https://errors.yoctoproject.org/Errors/Details/619382/

On Wed, Dec 15, 2021 at 11:15 AM Oleksandr Kravchuk
<open.source@oleksandr-kravchuk.com> wrote:
>
> Dropped upstreamed patch.
>
> License-Update: copyright years updated.
>
> Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
> ---
>  ...f-__NR_io_getevents-when-not-defined.patch | 36 -------------------
>  .../{libkcapi_1.2.1.bb => libkcapi_1.3.1.bb}  |  8 ++---
>  2 files changed, 3 insertions(+), 41 deletions(-)
>  delete mode 100644 meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch
>  rename meta-oe/recipes-crypto/libkcapi/{libkcapi_1.2.1.bb => libkcapi_1.3.1.bb} (81%)
>
> diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch b/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch
> deleted file mode 100644
> index 9d9f63e34..000000000
> --- a/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -From 771dd6aa45dd0bbbb7d7c7a7b116e1b5666fbd7a Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Sun, 15 Nov 2020 18:05:48 -0800
> -Subject: [PATCH] Disable use of __NR_io_getevents when not defined
> -
> -Architectures like riscv32 do not define this syscall, therefore return
> -ENOSYS on such architectures
> -
> -Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/100]
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - lib/internal.h | 12 ++++++++++++
> - 1 file changed, 12 insertions(+)
> -
> ---- a/lib/internal.h
> -+++ b/lib/internal.h
> -@@ -325,10 +325,17 @@ static inline int io_submit(aio_context_
> -     return syscall(__NR_io_submit, ctx, n, iocb);
> - }
> -
> --static inline int io_getevents(aio_context_t ctx, long min, long max,
> --            struct io_event *events, struct timespec *timeout)
> -+static inline int io_getevents(__attribute__((unused)) aio_context_t ctx,
> -+            __attribute__((unused)) long min,
> -+            __attribute__((unused)) long max,
> -+            __attribute__((unused)) struct io_event *events,
> -+            __attribute__((unused)) struct timespec *timeout)
> - {
> -+#ifdef __NR_io_getevents
> -     return syscall(__NR_io_getevents, ctx, min, max, events, timeout);
> -+#else
> -+    return -ENOSYS;
> -+#endif
> - }
> -
> - /************************************************************
> diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb
> similarity index 81%
> rename from meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb
> rename to meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb
> index cc71903a8..f10d68470 100644
> --- a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb
> +++ b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb
> @@ -1,13 +1,11 @@
>  SUMMARY = "Linux Kernel Crypto API User Space Interface Library"
>  HOMEPAGE = "http://www.chronox.de/libkcapi.html"
>  LICENSE = "BSD-3-Clause | GPL-2.0"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=c78be93ed8d1637f2a3f4a83ff9d5f54"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=80c467906eb826339c7f09e61808ed23"
>
>  S = "${WORKDIR}/git"
> -SRCREV = "d41284525ec8960e9a828979cfe269012b7df8db"
> -SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https \
> -           file://0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch \
> -           "
> +SRCREV = "2936ecd060c299157ac880650ba2c9fd94d27bb1"
> +SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https"
>
>  inherit autotools
>
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#94373): https://lists.openembedded.org/g/openembedded-devel/message/94373
> Mute This Topic: https://lists.openembedded.org/mt/87751272/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Patch

diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch b/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch
deleted file mode 100644
index 9d9f63e34..000000000
--- a/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch
+++ /dev/null
@@ -1,36 +0,0 @@ 
-From 771dd6aa45dd0bbbb7d7c7a7b116e1b5666fbd7a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 15 Nov 2020 18:05:48 -0800
-Subject: [PATCH] Disable use of __NR_io_getevents when not defined
-
-Architectures like riscv32 do not define this syscall, therefore return
-ENOSYS on such architectures
-
-Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/100]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/internal.h | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/lib/internal.h
-+++ b/lib/internal.h
-@@ -325,10 +325,17 @@ static inline int io_submit(aio_context_
-     return syscall(__NR_io_submit, ctx, n, iocb);
- }
- 
--static inline int io_getevents(aio_context_t ctx, long min, long max,
--            struct io_event *events, struct timespec *timeout)
-+static inline int io_getevents(__attribute__((unused)) aio_context_t ctx,
-+            __attribute__((unused)) long min,
-+            __attribute__((unused)) long max,
-+            __attribute__((unused)) struct io_event *events,
-+            __attribute__((unused)) struct timespec *timeout)
- {
-+#ifdef __NR_io_getevents
-     return syscall(__NR_io_getevents, ctx, min, max, events, timeout);
-+#else
-+    return -ENOSYS;
-+#endif
- }
- 
- /************************************************************
diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb
similarity index 81%
rename from meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb
rename to meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb
index cc71903a8..f10d68470 100644
--- a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb
+++ b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb
@@ -1,13 +1,11 @@ 
 SUMMARY = "Linux Kernel Crypto API User Space Interface Library"
 HOMEPAGE = "http://www.chronox.de/libkcapi.html"
 LICENSE = "BSD-3-Clause | GPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c78be93ed8d1637f2a3f4a83ff9d5f54"
+LIC_FILES_CHKSUM = "file://COPYING;md5=80c467906eb826339c7f09e61808ed23"
 
 S = "${WORKDIR}/git"
-SRCREV = "d41284525ec8960e9a828979cfe269012b7df8db"
-SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https \
-           file://0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch \
-           "
+SRCREV = "2936ecd060c299157ac880650ba2c9fd94d27bb1"
+SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https"
 
 inherit autotools