CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

dhcpcd: upgrade 8.1.1 -> 8.1.5

Browse Source 
-files/0001-dhcpcd-Fix-build-error-with-musl.patch
Removed since this is included in 8.1.5.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Zang Ruochen 2020-01-16 10:16:43 +08:00 committed by Khem Raj
parent 119834ee84
commit 02d0a59daa
2 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.1.bb → meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.5.bb
View File

@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0531457992a97ecebc6975914a874a9d"
UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/"
SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \
file://0001-dhcpcd-Fix-build-error-with-musl.patch"
file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch"
SRC_URI[md5sum] = "dc4f29a62afc53cdac311e925cfd1bc7"
SRC_URI[sha256sum] = "485d308fe10febd36b6f936e4260e4ab34a146e4f00a9f7a5509c4377ad5ea82"
SRC_URI[md5sum] = "57fd5dd4ff9722773ec67239db34d3b5"
SRC_URI[sha256sum] = "c5cbe15069cef347e72d0bf7a19b0255571ee0c184c6705859a09588a50a8ebd"
inherit pkgconfig autotools-brokensep

34
meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch
View File

@ -1,34 +0,0 @@
Subject: [PATCH] dhcpcd: Fix build error with musl.
Re-organize the header includes in if-linux.c to fix error as follows:
In file included from if-linux.c:49:
path/usr/include/netinet/if_ether.h:112:8: error: redefinition of 'struct ethhdr'
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
src/if-linux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/if-linux.c b/src/if-linux.c
index fd47278..bfa878b 100644
--- a/src/if-linux.c
+++ b/src/if-linux.c
@@ -37,6 +37,7 @@
#include <linux/if_addr.h>
#include <linux/if_link.h>
#include <linux/if_packet.h>
+#include <netinet/if_ether.h>
#include <linux/if_tun.h>
#include <linux/if_vlan.h>
#include <linux/filter.h>
@@ -46,7 +47,6 @@
#include <arpa/inet.h>
#include <net/if.h>
-#include <netinet/if_ether.h>
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <net/route.h>
--
2.7.4