summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/iproute2
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:41:38 +0100
commit972c80a30c593874dc114ee15622ce3fb2a70513 (patch)
tree1ce9dce66687ae65aa6a79456906e3614935f04d /meta/recipes-connectivity/iproute2
parente4cbc86558ebb0f2bce98ccd249fe7a02f76a260 (diff)
downloadpoky-972c80a30c593874dc114ee15622ce3fb2a70513.tar.gz
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. (From OE-Core rev: 628de87240e9bc73ad63a32e5f67b58781d87dd0) Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/iproute2')
-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 @@
1From 3835b1cc4a55361443c2b37dea688da652217635 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sun, 31 Mar 2019 17:32:07 +0200
4Subject: [PATCH] make configure cross compile safe
5
6According to Kevin Tian:
7Upstream-Status: Pending
8
9Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
10Signed-off-by: Shane Wang <shane.wang@intel.com>
11
12---
13 configure | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
16diff --git a/configure b/configure
17index 45fcffb6..0c5c9146 100755
18--- a/configure
19+++ b/configure
20@@ -3,6 +3,7 @@
21 # This is not an autoconf generated configure
22 #
23 INCLUDE=${1:-"$PWD/include"}
24+SYSROOT=$1
25
26 # Output file which is input to Makefile
27 CONFIG=config.mk
28@@ -162,7 +163,7 @@ check_ipt_lib_dir()
29 return
30 fi
31
32- for dir in /lib /usr/lib /usr/local/lib; do
33+ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib; do
34 for file in "xtables" "iptables"; do
35 file="$dir/$file/lib*t_*so"
36 if [ -f $file ]; then
37--
382.17.1
39
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 @@
1require iproute2.inc 1require iproute2.inc
2 2
3SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ 3SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
4 file://configure-cross.patch \
5 file://0001-libc-compat.h-add-musl-workaround.patch \ 4 file://0001-libc-compat.h-add-musl-workaround.patch \
6 " 5 "
7 6