Signed-off-by: Markus Pargmann <[email protected]> --- .../0001-build-system-fixes.patch | 14 ++++++++++---- patches/{iproute2-3.9.0 => iproute2-3.14.0}/series | 0 rules/iproute2.make | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) rename patches/{iproute2-3.9.0 => iproute2-3.14.0}/0001-build-system-fixes.patch (68%) rename patches/{iproute2-3.9.0 => iproute2-3.14.0}/series (100%)
diff --git a/patches/iproute2-3.9.0/0001-build-system-fixes.patch b/patches/iproute2-3.14.0/0001-build-system-fixes.patch similarity index 68% rename from patches/iproute2-3.9.0/0001-build-system-fixes.patch rename to patches/iproute2-3.14.0/0001-build-system-fixes.patch index df40efa..1d7a8fe 100644 --- a/patches/iproute2-3.9.0/0001-build-system-fixes.patch +++ b/patches/iproute2-3.14.0/0001-build-system-fixes.patch @@ -1,3 +1,4 @@ +From 21ba3bd71071e8d9062e54d52681defd1250c6a9 Mon Sep 17 00:00:00 2001 From: Juergen Beisert <[email protected]> Date: Sun, 16 Jun 2013 11:17:42 +0200 Subject: [PATCH] build system fixes @@ -7,12 +8,14 @@ Add a mechanism to feed in CPPFLAGS for cross builds. Signed-off-by: Juergen Beisert <[email protected]> Signed-off-by: Jon Ringle <[email protected]> +[Rebased to 3.14.0] +Signed-off-by: Markus Pargmann <[email protected]> --- misc/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/misc/Makefile b/misc/Makefile -index a59ff87..4e65239 100644 +index 004bcc3..34af65c 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -1,10 +1,14 @@ @@ -28,6 +31,9 @@ index a59ff87..4e65239 100644 +TARGETS += arpd +endif + - all: $(TARGETS) - - ss: $(SSOBJ) + ifeq ($(HAVE_SELINUX),y) + LDLIBS += $(shell pkg-config --libs libselinux) + CFLAGS += $(shell pkg-config --cflags libselinux) -DHAVE_SELINUX +-- +1.9.0 + diff --git a/patches/iproute2-3.9.0/series b/patches/iproute2-3.14.0/series similarity index 100% rename from patches/iproute2-3.9.0/series rename to patches/iproute2-3.14.0/series diff --git a/rules/iproute2.make b/rules/iproute2.make index 29f3bc2..8c0c4c6 100644 --- a/rules/iproute2.make +++ b/rules/iproute2.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2 # # Paths and names # -IPROUTE2_VERSION := 3.9.0 -IPROUTE2_MD5 := fd9db28e4f411a1e74de65c919ae590f +IPROUTE2_VERSION := 3.14.0 +IPROUTE2_MD5 := bd9d7567bbb987c88120669f5e1a1092 IPROUTE2 := iproute2-$(IPROUTE2_VERSION) IPROUTE2_SUFFIX := tar.xz IPROUTE2_URL := $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX)) -- 2.0.0.rc0 -- ptxdist mailing list [email protected]
