From cf02d3a381a6d33db7bda940221eb4e634ca9b4c Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 24 Jul 2026 05:43:33 -0700 Subject: fixup! iproute2: Fix v6.19.0 install issue Cleanup: - Remove the redundant include folder copy - Group the tc folder commands and the include folder commands Signed-off-by: Tom Hochstein (cherry picked from commit f06cd99e78b2d0dae51aa2650e069c6e84f56773) --- recipes-connectivity/iproute2/iproute2_%.bbappend | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/recipes-connectivity/iproute2/iproute2_%.bbappend b/recipes-connectivity/iproute2/iproute2_%.bbappend index ba8e8df40..c61d3e483 100644 --- a/recipes-connectivity/iproute2/iproute2_%.bbappend +++ b/recipes-connectivity/iproute2/iproute2_%.bbappend @@ -1,8 +1,11 @@ do_install:append:imx-generic-bsp () { - cp -Rf --no-preserve=ownership ${B}/include/* ${D}${includedir} + + # Add tc folder headers install -d ${D}${includedir}/tc - cp -R ${B}/include/* ${D}${includedir} 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 @@ -10,10 +13,13 @@ do_install:append:imx-generic-bsp () { } do_install:append:qoriq-generic-bsp () { - cp -Rf --no-preserve=ownership ${B}/include/* ${D}${includedir} + + # Add tc folder headers install -d ${D}${includedir}/tc - cp -R ${B}/include/* ${D}${includedir} 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 -- cgit v1.2.3-54-g00ecf