summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-11-24 09:08:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-25 21:55:10 +0000
commit87b121eac3378a5d6c6b800f469d4e0bb155e412 (patch)
treef926fdbdae18da2310b2b80c9612312f290e866e /meta/recipes-core
parentd9f44a5862a92a33e877bf3214772b7c7839b600 (diff)
downloadpoky-87b121eac3378a5d6c6b800f469d4e0bb155e412.tar.gz
ell: remove unneeded patch
Upstream added internal implementation shortly after the patch was added. (From OE-Core rev: f72df428904921cb87223de4e72e784e97208e8f) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch27
-rw-r--r--meta/recipes-core/ell/ell_0.45.bb1
2 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch b/meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch
deleted file mode 100644
index f0ce6f1364..0000000000
--- a/meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 277e1eca67fcc23cb31be7b826d83a19d9b89bd2 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 22 Dec 2020 10:30:54 +0000
4Subject: [PATCH] pem.c: do not use rawmemchr()
5
6This is a glibc-only function, and causes build failures with
7alternative libc implementations such as musl.
8
9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 ell/pem.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/ell/pem.c b/ell/pem.c
16index 790f2c2..237ae02 100644
17--- a/ell/pem.c
18+++ b/ell/pem.c
19@@ -224,7 +224,7 @@ static uint8_t *pem_load_buffer(const void *buf, size_t buf_len,
20
21 /* Check that each header line has a key and a colon */
22 while (start < end) {
23- const char *lf = rawmemchr(start, '\n');
24+ const char *lf = memchr(start, '\n', end - start);
25 const char *colon = memchr(start, ':', lf - start);
26
27 if (!colon)
diff --git a/meta/recipes-core/ell/ell_0.45.bb b/meta/recipes-core/ell/ell_0.45.bb
index 8453720f42..64434c278c 100644
--- a/meta/recipes-core/ell/ell_0.45.bb
+++ b/meta/recipes-core/ell/ell_0.45.bb
@@ -15,7 +15,6 @@ DEPENDS = "dbus"
15inherit autotools pkgconfig 15inherit autotools pkgconfig
16 16
17SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \ 17SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \
18 file://0001-pem.c-do-not-use-rawmemchr.patch \
19 " 18 "
20SRC_URI[sha256sum] = "fedfcceee56eb63ab1eb98bf120a3cfbecee50bcd893874328c889f1b381e7d7" 19SRC_URI[sha256sum] = "fedfcceee56eb63ab1eb98bf120a3cfbecee50bcd893874328c889f1b381e7d7"
21 20