mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-05-22 01:26:58 +00:00
dhcpcd: pkg moved to core
Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
89adc5d3ec
commit
45ccf2f43f
@ -1,29 +0,0 @@
|
||||
SECTION = "console/network"
|
||||
SUMMARY = "dhcpcd - a DHCP client"
|
||||
DESCRIPTION = "dhcpcd runs on your machine and silently configures your \
|
||||
computer to work on the attached networks without trouble \
|
||||
and mostly without configuration."
|
||||
|
||||
HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/"
|
||||
|
||||
LICENSE = "BSD-2-Clause"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=9674cc803c5d71306941e6e8b5c002f2"
|
||||
|
||||
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://0002-Fix-compile-without-IPv6-on-systems-that-do-not-define-ALIGN.patch"
|
||||
|
||||
SRC_URI[sha256sum] = "5fe133e5497d8af6d26bd6e6b8dd48ab12d124d6cc4cefe6de6536ff97f76820"
|
||||
|
||||
inherit pkgconfig autotools-brokensep
|
||||
|
||||
PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
|
||||
|
||||
PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev"
|
||||
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"
|
||||
|
||||
EXTRA_OECONF = "--enable-ipv4"
|
||||
|
||||
FILES_${PN}-dbg += "${libdir}/dhcpcd/dev/.debug"
|
||||
@ -1,45 +0,0 @@
|
||||
From aa9e3982c1e75ad49945a62f5e262279c7a905a4 Mon Sep 17 00:00:00 2001
|
||||
From: Stefano Cappa <stefano.cappa.ks89@gmail.com>
|
||||
Date: Sun, 13 Jan 2019 01:50:52 +0100
|
||||
Subject: [PATCH] remove INCLUDEDIR to prevent build issues
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Stefano Cappa <stefano.cappa.ks89@gmail.com>
|
||||
---
|
||||
configure | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 6c81e0db..32dea2b4 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -20,7 +20,6 @@ BUILD=
|
||||
HOST=
|
||||
HOSTCC=
|
||||
TARGET=
|
||||
-INCLUDEDIR=
|
||||
DEBUG=
|
||||
FORK=
|
||||
STATIC=
|
||||
@@ -72,7 +71,6 @@ for x do
|
||||
--mandir) MANDIR=$var;;
|
||||
--datadir) DATADIR=$var;;
|
||||
--with-ccopts|CFLAGS) CFLAGS=$var;;
|
||||
- -I|--includedir) INCLUDEDIR="$INCLUDEDIR${INCLUDEDIR:+ }-I$var";;
|
||||
CC) CC=$var;;
|
||||
CPPFLAGS) CPPFLAGS=$var;;
|
||||
PKG_CONFIG) PKG_CONFIG=$var;;
|
||||
@@ -309,9 +307,6 @@ if [ -n "$CPPFLAGS" ]; then
|
||||
echo "CPPFLAGS=" >>$CONFIG_MK
|
||||
echo "CPPFLAGS+= $CPPFLAGS" >>$CONFIG_MK
|
||||
fi
|
||||
-if [ -n "$INCLUDEDIR" ]; then
|
||||
- echo "CPPFLAGS+= $INCLUDEDIR" >>$CONFIG_MK
|
||||
-fi
|
||||
if [ -n "$LDFLAGS" ]; then
|
||||
echo "LDFLAGS=" >>$CONFIG_MK
|
||||
echo "LDFLAGS+= $LDFLAGS" >>$CONFIG_MK
|
||||
--
|
||||
2.17.2 (Apple Git-113)
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
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 {
|
||||
Loading…
x
Reference in New Issue
Block a user