mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
meta-networking: dhcpcd: backport ALIGN compile error fix
Fails to build on an aarch64 system with ipv6 disabled. This backported patch fixes it. Signed-off-by: Jack Mitchell <ml@embed.me.uk> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -12,7 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9674cc803c5d71306941e6e8b5c002f2"
|
|||||||
UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/"
|
UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/"
|
||||||
|
|
||||||
SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
|
SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
|
||||||
file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch"
|
file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \
|
||||||
|
file://0002-Fix-compile-without-IPv6-on-systems-that-do-not-define-ALIGN.patch"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "5fe133e5497d8af6d26bd6e6b8dd48ab12d124d6cc4cefe6de6536ff97f76820"
|
SRC_URI[sha256sum] = "5fe133e5497d8af6d26bd6e6b8dd48ab12d124d6cc4cefe6de6536ff97f76820"
|
||||||
|
|
||||||
|
|||||||
+34
@@ -0,0 +1,34 @@
|
|||||||
|
From 7643b6615aab4de290ead6c1a6b56f10a82bbe6f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Roy Marples <roy@marples.name>
|
||||||
|
Date: Sat, 4 Jul 2020 13:21:09 +0100
|
||||||
|
Subject: [PATCH] Fix compile without IPv6 on systems that do not define ALIGN
|
||||||
|
|
||||||
|
Upstream-Status: backport
|
||||||
|
|
||||||
|
---
|
||||||
|
src/dhcpcd.h | 5 -----
|
||||||
|
1 file changed, 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/dhcpcd.h b/src/dhcpcd.h
|
||||||
|
index 61a6a081..d9719c0a 100644
|
||||||
|
--- a/src/dhcpcd.h
|
||||||
|
+++ b/src/dhcpcd.h
|
||||||
|
@@ -96,7 +96,6 @@ TAILQ_HEAD(if_head, interface);
|
||||||
|
|
||||||
|
#include "privsep.h"
|
||||||
|
|
||||||
|
-#ifdef INET6
|
||||||
|
/* dhcpcd requires CMSG_SPACE to evaluate to a compile time constant. */
|
||||||
|
#if defined(__QNX) || \
|
||||||
|
(defined(__NetBSD_Version__) && __NetBSD_Version__ < 600000000)
|
||||||
|
@@ -113,10 +112,6 @@ TAILQ_HEAD(if_head, interface);
|
||||||
|
#define CMSG_SPACE(len) (ALIGN(sizeof(struct cmsghdr)) + ALIGN(len))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#define IP6BUFLEN (CMSG_SPACE(sizeof(struct in6_pktinfo)) + \
|
||||||
|
- CMSG_SPACE(sizeof(int)))
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
struct passwd;
|
||||||
|
|
||||||
|
struct dhcpcd_ctx {
|
||||||
Reference in New Issue
Block a user