summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2012-09-25 16:38:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-26 14:02:28 (GMT)
commit4f68dd9303fdb3a8c0c1f0e79a37b4d1f3ca3717 (patch)
treeea526e51786e002c7fa49ea706dc0355194c0a38 /meta/recipes-connectivity
parent6bc5925ea962ff68dcfac72c221b2445f71c78aa (diff)
downloadpoky-4f68dd9303fdb3a8c0c1f0e79a37b4d1f3ca3717.tar.gz
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. (From OE-Core rev: fab44bdb346533edd4f702a83523d7c2414f74e5) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-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 7caf7d0..d8b1a17 100644
--- a/meta/recipes-connectivity/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
@@ -13,7 +13,7 @@ DEPENDS = "flex-native bison-native"
13 13
14inherit update-alternatives 14inherit update-alternatives
15 15
16EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin" 16EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'"
17 17
18do_install () { 18do_install () {
19 oe_runmake DESTDIR=${D} install 19 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 fc7292e..c1e9bd3 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 @@
1require iproute2.inc 1require iproute2.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BPN}-${PV}.tar.xz \ 5SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BPN}-${PV}.tar.xz \
6 file://configure-cross.patch" 6 file://configure-cross.patch"