summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2012-09-25 17:38:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-26 14:54:38 +0100
commitfab44bdb346533edd4f702a83523d7c2414f74e5 (patch)
treef153e064f712d98301d12afe75958cc1689fea38 /meta
parent26daec758b2eaeb208356d5aa8a9a191bd366751 (diff)
downloadopenembedded-core-fab44bdb346533edd4f702a83523d7c2414f74e5.tar.gz
openembedded-core-fab44bdb346533edd4f702a83523d7c2414f74e5.tar.bz2
openembedded-core-fab44bdb346533edd4f702a83523d7c2414f74e5.zip
iproute2: Use configured values for ${base_sbindir} and ${libdir}
These were previously being hard-coded to "/sbin" and "/usr/lib" respectively, resulting in unpackaged files if the configured values were something else. Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2.inc2
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_3.5.1.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
index 7caf7d0eef..d8b1a17c11 100644
--- a/meta/recipes-connectivity/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
@@ -13,7 +13,7 @@ DEPENDS = "flex-native bison-native"
inherit update-alternatives
-EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin"
+EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'"
do_install () {
oe_runmake DESTDIR=${D} install
diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.5.1.bb b/meta/recipes-connectivity/iproute2/iproute2_3.5.1.bb
index fc7292ef4f..c1e9bd3a86 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_3.5.1.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_3.5.1.bb
@@ -1,6 +1,6 @@
require iproute2.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BPN}-${PV}.tar.xz \
file://configure-cross.patch"