diff options
| -rw-r--r-- | meta-oe/recipes-kernel/ktls-utils/ktls-utils/0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch | 36 | ||||
| -rw-r--r-- | meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.3.0.bb (renamed from meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.2.1.bb) | 6 |
2 files changed, 2 insertions, 40 deletions
diff --git a/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch b/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch deleted file mode 100644 index 954b1393db..0000000000 --- a/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From ca95e956307672484e8c018263600749aa9c4f4d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alistair Francis <alistair.francis@wdc.com> | ||
| 3 | Date: Wed, 9 Apr 2025 11:14:52 +1000 | ||
| 4 | Subject: [PATCH] tlshd: Define ALLPERMS if it doesn't exist to fix musl build | ||
| 5 | |||
| 6 | ALLPERMS exists in glibc, but not on musl, so we manually define | ||
| 7 | it if it doesn't exist. This fixes building on musl systems. | ||
| 8 | |||
| 9 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> | ||
| 10 | Upstream-Status: Submitted [https://github.com/oracle/ktls-utils/pull/88] | ||
| 11 | --- | ||
| 12 | src/tlshd/config.c | 8 ++++++++ | ||
| 13 | 1 file changed, 8 insertions(+) | ||
| 14 | |||
| 15 | diff --git a/src/tlshd/config.c b/src/tlshd/config.c | ||
| 16 | index 38948e8..e653bd8 100644 | ||
| 17 | --- a/src/tlshd/config.c | ||
| 18 | +++ b/src/tlshd/config.c | ||
| 19 | @@ -46,6 +46,14 @@ | ||
| 20 | |||
| 21 | static GKeyFile *tlshd_configuration; | ||
| 22 | |||
| 23 | +/** | ||
| 24 | + * ALLPERMS exists in glibc, but not on musl, so we | ||
| 25 | + * manually define it if it doesn't exist | ||
| 26 | + */ | ||
| 27 | +#ifndef ALLPERMS | ||
| 28 | +#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) | ||
| 29 | +#endif | ||
| 30 | + | ||
| 31 | /** | ||
| 32 | * tlshd_config_init - Read tlshd's config file | ||
| 33 | * @pathname: Pathname to config file | ||
| 34 | -- | ||
| 35 | 2.49.0 | ||
| 36 | |||
diff --git a/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.2.1.bb b/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.3.0.bb index ce36bda7d1..748e1cae99 100644 --- a/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.2.1.bb +++ b/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.3.0.bb | |||
| @@ -7,11 +7,9 @@ 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 = "03abde4ed7f539d77a412a1c98052e1c4d262963" | 10 | SRC_URI = "https://github.com/oracle/ktls-utils/releases/download/${BP}/${BP}.tar.gz \ |
| 11 | SRC_URI = "git://github.com/oracle/ktls-utils.git;nobranch=1;protocol=https;branch=ktls-utils-1.2-fixes \ | ||
| 12 | file://0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch \ | ||
| 13 | " | 11 | " |
| 14 | 12 | SRC_URI[sha256sum] = "8ee295b26b608450bc0c47ba199b34cf92f7f9ec4c81a62363e6450da76b6739" | |
| 15 | 13 | ||
| 16 | inherit autotools-brokensep pkgconfig systemd | 14 | inherit autotools-brokensep pkgconfig systemd |
| 17 | 15 | ||
