diff options
-rw-r--r-- | meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch | 36 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.2.1.bb (renamed from meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb) | 10 |
2 files changed, 4 insertions, 42 deletions
diff --git a/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch b/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch deleted file mode 100644 index 6aabb77ee8..0000000000 --- a/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From d170b04dcb8b2b28e370d8b18ffa1f593e8eec11 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alistair Francis <alistair.francis@wdc.com> | ||
3 | Date: Thu, 10 Apr 2025 13:15:16 +1000 | ||
4 | Subject: [PATCH] tlshd: configure.ac: Use AC_CHECK_HEADER instead of | ||
5 | AC_CHECK_FILE | ||
6 | |||
7 | AC_CHECK_FILE doesn't work when cross-compiling [1], which breaks a lot of | ||
8 | use cases (like OpenEmbedded for one). Autoconf supports AC_CHECK_HEADER | ||
9 | which can be used instead and is more robust [2] so let's use that | ||
10 | instead. | ||
11 | |||
12 | 1: https://www.gnu.org/software/autoconf/manual/autoconf-2.68/html_node/Files.html | ||
13 | 2: https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Generic-Headers.html | ||
14 | |||
15 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> | ||
16 | Upstream-Status: Submitted [https://github.com/oracle/ktls-utils/pull/90] | ||
17 | --- | ||
18 | configure.ac | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/configure.ac b/configure.ac | ||
22 | index 2c77fb1..c790d71 100644 | ||
23 | --- a/configure.ac | ||
24 | +++ b/configure.ac | ||
25 | @@ -63,7 +63,7 @@ PKG_CHECK_MODULES([LIBNL_GENL3], libnl-genl-3.0 >= 3.1) | ||
26 | AC_SUBST([LIBNL_GENL3_CFLAGS]) | ||
27 | AC_SUBST([LIBNL_GENL3_LIBS]) | ||
28 | |||
29 | -AC_CHECK_FILE([/usr/include/linux/quic.h], | ||
30 | +AC_CHECK_HEADER([linux/quic.h], | ||
31 | [AC_CHECK_LIB([gnutls], [gnutls_handshake_set_secret_function], | ||
32 | [AC_DEFINE([HAVE_GNUTLS_QUIC], [1], [Define to 1 if QUIC is found.])])]) | ||
33 | |||
34 | -- | ||
35 | 2.49.0 | ||
36 | |||
diff --git a/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb b/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.2.1.bb index 1a90dcf998..ce36bda7d1 100644 --- a/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb +++ b/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.2.1.bb | |||
@@ -7,12 +7,10 @@ RDEPENDS:${PN} += " gnutls" | |||
7 | LICENSE = "GPL-2.0-only" | 7 | LICENSE = "GPL-2.0-only" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d568123389d9a12625cca2b089b1728b" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d568123389d9a12625cca2b089b1728b" |
9 | 9 | ||
10 | SRCREV = "c787cd26330af457e1ca9cf43232db2c71c03154" | 10 | SRCREV = "03abde4ed7f539d77a412a1c98052e1c4d262963" |
11 | SRC_URI = " \ | 11 | SRC_URI = "git://github.com/oracle/ktls-utils.git;nobranch=1;protocol=https;branch=ktls-utils-1.2-fixes \ |
12 | git://github.com/oracle/ktls-utils.git;nobranch=1;protocol=https \ | 12 | file://0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch \ |
13 | file://0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch \ | 13 | " |
14 | file://0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch \ | ||
15 | " | ||
16 | 14 | ||
17 | 15 | ||
18 | inherit autotools-brokensep pkgconfig systemd | 16 | inherit autotools-brokensep pkgconfig systemd |