From: Phil Blundell Date: Tue, 25 Sep 2012 16:38:06 +0000 (+0100) Subject: iproute2: Use configured values for ${base_sbindir} and ${libdir} X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f68dd9303fdb3a8c0c1f0e79a37b4d1f3ca3717;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index 7caf7d0eef5..d8b1a17c11c 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 fc7292ef4fa..c1e9bd3a86d 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"