summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>2019-07-24 08:23:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-26 08:40:59 +0100
commit628de87240e9bc73ad63a32e5f67b58781d87dd0 (patch)
tree1c635a6176502cfa7ff7bcabce618dc98887aa92
parente3043b2c86556d91387dfbdf155e9b5547cc20c4 (diff)
downloadopenembedded-core-contrib-628de87240e9bc73ad63a32e5f67b58781d87dd0.tar.gz
openembedded-core-contrib-628de87240e9bc73ad63a32e5f67b58781d87dd0.tar.bz2
openembedded-core-contrib-628de87240e9bc73ad63a32e5f67b58781d87dd0.zip
iproute2: drop pointless configure-cross.patch
The configure script has already found IPT_LIB_DIR via pkgconfig, so the configure-cross.patch really just introduces dead and broken fallback code. Broken, because the SYSROOT variable does not actually get set to a sensible value - the argument $1 passed to the configure script when invoked from the Makefile is KERNEL_INCLUDE, which we set to ${STAGING_INCDIR} in EXTRA_OEMAKE. Obviously that directory does not have /lib or /usr subdirectories, so we're not really helping the fallback logic in check_ipt_lib_dir() - in fact, we're more or less guaranteeing that we won't find those .so files. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch39
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_5.2.0.bb1
2 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch
deleted file mode 100644
index b0c4a088fa..0000000000
--- a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3835b1cc4a55361443c2b37dea688da652217635 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sun, 31 Mar 2019 17:32:07 +0200
-Subject: [PATCH] make configure cross compile safe
-
-According to Kevin Tian:
-Upstream-Status: Pending
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-Signed-off-by: Shane Wang <shane.wang@intel.com>
-
----
- configure | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 45fcffb6..0c5c9146 100755
---- a/configure
-+++ b/configure
-@@ -3,6 +3,7 @@
- # This is not an autoconf generated configure
- #
- INCLUDE=${1:-"$PWD/include"}
-+SYSROOT=$1
-
- # Output file which is input to Makefile
- CONFIG=config.mk
-@@ -162,7 +163,7 @@ check_ipt_lib_dir()
- return
- fi
-
-- for dir in /lib /usr/lib /usr/local/lib; do
-+ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib; do
- for file in "xtables" "iptables"; do
- file="$dir/$file/lib*t_*so"
- if [ -f $file ]; then
---
-2.17.1
-
diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.2.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.2.0.bb
index 8ef529d91a..1728cd69a1 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_5.2.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_5.2.0.bb
@@ -1,7 +1,6 @@
require iproute2.inc
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
- file://configure-cross.patch \
file://0001-libc-compat.h-add-musl-workaround.patch \
"