diff options
| -rw-r--r-- | meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.5.bb (renamed from meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.1.bb) | 7 | ||||
| -rw-r--r-- | meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch | 34 |
2 files changed, 3 insertions, 38 deletions
diff --git a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.1.bb b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.5.bb index a5aa584f5a..3349ca1533 100644 --- a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.1.bb +++ b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.5.bb | |||
| @@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0531457992a97ecebc6975914a874a9d" | |||
| 10 | UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" | 10 | UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" |
| 11 | 11 | ||
| 12 | SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ | 12 | SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ |
| 13 | file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ | 13 | file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch" |
| 14 | file://0001-dhcpcd-Fix-build-error-with-musl.patch" | ||
| 15 | 14 | ||
| 16 | SRC_URI[md5sum] = "dc4f29a62afc53cdac311e925cfd1bc7" | 15 | SRC_URI[md5sum] = "57fd5dd4ff9722773ec67239db34d3b5" |
| 17 | SRC_URI[sha256sum] = "485d308fe10febd36b6f936e4260e4ab34a146e4f00a9f7a5509c4377ad5ea82" | 16 | SRC_URI[sha256sum] = "c5cbe15069cef347e72d0bf7a19b0255571ee0c184c6705859a09588a50a8ebd" |
| 18 | 17 | ||
| 19 | inherit pkgconfig autotools-brokensep | 18 | inherit pkgconfig autotools-brokensep |
| 20 | 19 | ||
diff --git a/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch b/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch deleted file mode 100644 index b48b467b8c..0000000000 --- a/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | Subject: [PATCH] dhcpcd: Fix build error with musl. | ||
| 2 | |||
| 3 | Re-organize the header includes in if-linux.c to fix error as follows: | ||
| 4 | In file included from if-linux.c:49: | ||
| 5 | path/usr/include/netinet/if_ether.h:112:8: error: redefinition of 'struct ethhdr' | ||
| 6 | |||
| 7 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | ||
| 8 | --- | ||
| 9 | src/if-linux.c | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/src/if-linux.c b/src/if-linux.c | ||
| 13 | index fd47278..bfa878b 100644 | ||
| 14 | --- a/src/if-linux.c | ||
| 15 | +++ b/src/if-linux.c | ||
| 16 | @@ -37,6 +37,7 @@ | ||
| 17 | #include <linux/if_addr.h> | ||
| 18 | #include <linux/if_link.h> | ||
| 19 | #include <linux/if_packet.h> | ||
| 20 | +#include <netinet/if_ether.h> | ||
| 21 | #include <linux/if_tun.h> | ||
| 22 | #include <linux/if_vlan.h> | ||
| 23 | #include <linux/filter.h> | ||
| 24 | @@ -46,7 +47,6 @@ | ||
| 25 | |||
| 26 | #include <arpa/inet.h> | ||
| 27 | #include <net/if.h> | ||
| 28 | -#include <netinet/if_ether.h> | ||
| 29 | #include <netinet/in_systm.h> | ||
| 30 | #include <netinet/in.h> | ||
| 31 | #include <net/route.h> | ||
| 32 | -- | ||
| 33 | 2.7.4 | ||
| 34 | |||
