From bbfabee7c1955a19a04040630a1b95fe33f477ef Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 3 Dec 2015 17:24:44 +0100 Subject: [PATCH] iproute2: Disable arpd differently on newer releases It is checking for the berkeley db in some way but let's make sure that between our current release and the next one we have the same functionality. --- .../iproute2-4.3.0/disable_arpd_in_misc.patch | 17 +++++++++++++++++ recipes-fixes/iproute2/iproute2_sysmocom.inc | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch diff --git a/recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch b/recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch new file mode 100644 index 0000000..8f2ea78 --- /dev/null +++ b/recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch @@ -0,0 +1,17 @@ +Index: iproute2-4.3.0/misc/Makefile +=================================================================== +--- iproute2-4.3.0.orig/misc/Makefile 2015-12-03 17:17:49.164492802 +0100 ++++ iproute2-4.3.0/misc/Makefile 2015-12-03 17:18:39.368493469 +0100 +@@ -5,9 +5,9 @@ + + include ../Config + +-ifeq ($(HAVE_BERKELEY_DB),y) +- TARGETS += arpd +-endif ++#ifeq ($(HAVE_BERKELEY_DB),y) ++# TARGETS += arpd ++#endif + + ifeq ($(HAVE_SELINUX),y) + LDLIBS += $(shell pkg-config --libs libselinux) diff --git a/recipes-fixes/iproute2/iproute2_sysmocom.inc b/recipes-fixes/iproute2/iproute2_sysmocom.inc index ceab02b..a5b3531 100644 --- a/recipes-fixes/iproute2/iproute2_sysmocom.inc +++ b/recipes-fixes/iproute2/iproute2_sysmocom.inc @@ -1,5 +1,5 @@ THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:" +FILESPATH =. "${@base_set_filespath(["${THISDIR}/files/${PN}-${PV}"], d)}:${@base_set_filespath(["${THISDIR}/files"], d)}:" PRINC="2"