summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2021-01-13 16:38:36 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-13 23:13:46 +0000
commit23d83ccd8f6a18941f96631047807b71dab6922f (patch)
treeed2c600e35e3934143ff13d7572a676b2cdf9624 /meta/recipes-core
parent701a510ec04c3fadf762109ea7ba3fc33a56a343 (diff)
downloadpoky-23d83ccd8f6a18941f96631047807b71dab6922f.tar.gz
ell: upgrade 0.35 -> 0.36
0001-ell-add-missing-include-in-dhcp-server.patch removed since it is included in 0.36 (From OE-Core rev: 589d6b65a5ac4ce2b33eb2ee4fbbc1e6b3355756) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch23
-rw-r--r--meta/recipes-core/ell/ell_0.36.bb (renamed from meta/recipes-core/ell/ell_0.35.bb)3
2 files changed, 1 insertions, 25 deletions
diff --git a/meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch b/meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch
deleted file mode 100644
index 2460d26bdc..0000000000
--- a/meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From dd350f4e2258b5a638bc8fb26a6193147902d292 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?=C3=89rico=20Nogueira?= <ericonr@disroot.org>
3Date: Mon, 30 Nov 2020 18:40:33 -0300
4Subject: [PATCH] ell: add missing include in dhcp-server.
5
6Upstream-Status: Backport
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 ell/dhcp-server.c | 1 +
10 1 file changed, 1 insertion(+)
11
12diff --git a/ell/dhcp-server.c b/ell/dhcp-server.c
13index c983ed4..144e83e 100644
14--- a/ell/dhcp-server.c
15+++ b/ell/dhcp-server.c
16@@ -24,6 +24,7 @@
17 #include <config.h>
18 #endif
19
20+#include <linux/types.h>
21 #include <net/ethernet.h>
22 #include <sys/socket.h>
23 #include <arpa/inet.h>
diff --git a/meta/recipes-core/ell/ell_0.35.bb b/meta/recipes-core/ell/ell_0.36.bb
index ccc54b5ff7..4535ec2186 100644
--- a/meta/recipes-core/ell/ell_0.35.bb
+++ b/meta/recipes-core/ell/ell_0.36.bb
@@ -14,10 +14,9 @@ DEPENDS = "dbus"
14inherit autotools pkgconfig 14inherit autotools pkgconfig
15 15
16SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \ 16SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \
17 file://0001-ell-add-missing-include-in-dhcp-server.patch \
18 file://0001-pem.c-do-not-use-rawmemchr.patch \ 17 file://0001-pem.c-do-not-use-rawmemchr.patch \
19 " 18 "
20SRC_URI[sha256sum] = "2bfe9da7781f65f1cb1595a5a068a3ae74d4b68b74f287c6f0c892cfe623913f" 19SRC_URI[sha256sum] = "2f99e743a235b1c834b19112e4e0283d02da93b863899381466cde47bf159cf6"
21 20
22do_configure_prepend () { 21do_configure_prepend () {
23 mkdir -p ${S}/build-aux 22 mkdir -p ${S}/build-aux