Patchwork iproute2: Use configured values for ${base_sbindir} and ${libdir}

login
register
mail settings
Submitter Phil Blundell
Date Sept. 25, 2012, 4:38 p.m.
Message ID <1348591087.31293.83.camel@phil-desktop>
Download mbox | patch
Permalink /patch/37211/
State Accepted
Commit fab44bdb346533edd4f702a83523d7c2414f74e5
Headers show

Comments

Phil Blundell - Sept. 25, 2012, 4:38 p.m.
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>
---
 meta/recipes-connectivity/iproute2/iproute2.inc      |    2 +-
 meta/recipes-connectivity/iproute2/iproute2_3.5.1.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Saul Wold - Sept. 27, 2012, 3:47 p.m.
On 09/25/2012 09:38 AM, Phil Blundell wrote:
> 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>
> ---
>   meta/recipes-connectivity/iproute2/iproute2.inc      |    2 +-
>   meta/recipes-connectivity/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"
>

Merged into OE-Core

Thanks
	Sau!

Patch

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"