From b48f99da2693486454bb05795c7d6ecfeff39f8a Mon Sep 17 00:00:00 2001
From: Henning Heinold <henning@itconsulting-heinold.de>
Date: Fri, 29 May 2015 17:09:49 +0200
Subject: [PATCH] iproute2: add misc directory to buildline and package ss,
 nstat, rtacct and ifstat

Fixes: SYS#1609
---
 .../files/build_ss_only_in_misc.patch         | 22 +++++++++++++++++++
 recipes-fixes/iproute2/iproute2_sysmocom.inc  |  9 ++++++++
 yocto-dora/iproute2_3.10.0.bbappend           |  1 +
 yocto-master/iproute2_%.bbappend              |  1 +
 4 files changed, 33 insertions(+)
 create mode 100644 recipes-fixes/iproute2/files/build_ss_only_in_misc.patch
 create mode 100644 recipes-fixes/iproute2/iproute2_sysmocom.inc
 create mode 100644 yocto-dora/iproute2_3.10.0.bbappend
 create mode 100644 yocto-master/iproute2_%.bbappend

diff --git a/recipes-fixes/iproute2/files/build_ss_only_in_misc.patch b/recipes-fixes/iproute2/files/build_ss_only_in_misc.patch
new file mode 100644
index 0000000..73fd4c6
--- /dev/null
+++ b/recipes-fixes/iproute2/files/build_ss_only_in_misc.patch
@@ -0,0 +1,22 @@
+Index: iproute2-3.10.0/misc/Makefile
+===================================================================
+--- iproute2-3.10.0.orig/misc/Makefile
++++ iproute2-3.10.0/misc/Makefile
+@@ -1,7 +1,7 @@
+ SSOBJ=ss.o ssfilter.o
+ LNSTATOBJ=lnstat.o lnstat_util.o
+ 
+-TARGETS=ss nstat ifstat rtacct arpd lnstat
++TARGETS=ss nstat ifstat rtacct
+ 
+ include ../Config
+ 
+@@ -28,8 +28,6 @@ lnstat: $(LNSTATOBJ)
+ 
+ install: all
+ 	install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR)
+-	ln -sf lnstat $(DESTDIR)$(SBINDIR)/rtstat
+-	ln -sf lnstat $(DESTDIR)$(SBINDIR)/ctstat
+ 
+ clean:
+ 	rm -f *.o $(TARGETS) ssfilter.c
diff --git a/recipes-fixes/iproute2/iproute2_sysmocom.inc b/recipes-fixes/iproute2/iproute2_sysmocom.inc
new file mode 100644
index 0000000..a94246a
--- /dev/null
+++ b/recipes-fixes/iproute2/iproute2_sysmocom.inc
@@ -0,0 +1,9 @@
+THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
+
+PRINC="1"
+
+SRC_URI += "file://build_ss_only_in_misc.patch"
+
+
+EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip misc' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'"
diff --git a/yocto-dora/iproute2_3.10.0.bbappend b/yocto-dora/iproute2_3.10.0.bbappend
new file mode 100644
index 0000000..b10b7cc
--- /dev/null
+++ b/yocto-dora/iproute2_3.10.0.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/iproute2/${PN}_sysmocom.inc
diff --git a/yocto-master/iproute2_%.bbappend b/yocto-master/iproute2_%.bbappend
new file mode 100644
index 0000000..b10b7cc
--- /dev/null
+++ b/yocto-master/iproute2_%.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/iproute2/${PN}_sysmocom.inc