iproute2: Revert install changes

The recent analysis that concluded that the install to
/usr/include/include was new was mistaken. The original implementation
did this as well. Moving the install to /usr/include was incorrect and
caused the conflicts with glibc.

Revert the install changes.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

1 files changed, 4 insertions, 12 deletions

diff --git a/recipes-connectivity/iproute2/iproute2_%.bbappend b/recipes-connectivity/iproute2/iproute2_%.bbappend
index c61d3e483..655635b52 100644
--- a/recipes-connectivity/iproute2/iproute2_%.bbappend
+++ b/recipes-connectivity/iproute2/iproute2_%.bbappend
@@ -4,12 +4,8 @@ do_install:append:imx-generic-bsp () {
     install -d ${D}${includedir}/tc
     install -m 0644 ${B}/tc/*.h ${D}${includedir}/tc
 
-    # Add include folder headers
-    cp -R --no-preserve=ownership ${B}/include/* ${D}${includedir}
-    # Remove files that conflict with glibc
-    rm -f ${D}${includedir}/dlfcn.h
-    rm -f ${D}${includedir}/netinet/tcp.h
-    rm -f ${D}${includedir}/xtables.h
+    # Add include folder headers at /usr/include/include
+    cp -R --no-preserve=ownership ${B}/include ${D}${includedir}
 }
 
 do_install:append:qoriq-generic-bsp () {
@@ -18,10 +14,6 @@ do_install:append:qoriq-generic-bsp () {
     install -d ${D}${includedir}/tc
     install -m 0644 ${B}/tc/*.h ${D}${includedir}/tc
 
-    # Add include folder headers
-    cp -R --no-preserve=ownership ${B}/include/* ${D}${includedir}
-    # Remove files that conflict with glibc
-    rm -f ${D}${includedir}/dlfcn.h
-    rm -f ${D}${includedir}/netinet/tcp.h
-    rm -f ${D}${includedir}/xtables.h
+    # Add include folder headers at /usr/include/include
+    cp -R --no-preserve=ownership ${B}/include ${D}${includedir}
 }