[oe-commits] Phil Blundell : iproute2: Use configured values for ${base_sbindir} and ${libdir}
git at git.openembedded.org
git at git.openembedded.org
Wed Sep 26 14:04:47 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: fab44bdb346533edd4f702a83523d7c2414f74e5
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=fab44bdb346533edd4f702a83523d7c2414f74e5
Author: Phil Blundell <philb at gnu.org>
Date: Tue Sep 25 17:38:06 2012 +0100
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 at pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-connectivity/iproute2/iproute2.inc | 2 +-
.../iproute2/iproute2_3.5.1.bb | 2 +-
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"
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 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 @@
require iproute2.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BPN}-${PV}.tar.xz \
file://configure-cross.patch"
More information about the Openembedded-commits
mailing list