Skip to contentSkip to conversation

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

PATCH Applied Phil Blundell 2 participants 2 messages Sep 25, 2012 – Sep 27, 2012

lore
Share & tools
lore

Phil Blundell

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 meta/recipes-connectivity/iproute2/iproute2.inc      |    2 +-
 meta/recipes-connectivity/iproute2/iproute2_3.5.1.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-connectivity/iproute2/iproute2.inc +1 -1
index 7caf7d0..d8b1a17 100644
@@ -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
meta/recipes-connectivity/iproute2/iproute2_3.5.1.bb +1 -1
index fc7292e..c1e9bd3 100644
@@ -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"
Signature · 1 line
1.7.10.4
Applied
#1 lore raw
Quoted 28 lines · Phil Blundell

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 <[email protected]>
---
  meta/recipes-connectivity/iproute2/iproute2.inc      |    2 +-
  meta/recipes-connectivity/iproute2/iproute2_3.5.1.bb |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-connectivity/iproute2/iproute2.inc +1 -1
index 7caf7d0..d8b1a17 100644
@@ -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
meta/recipes-connectivity/iproute2/iproute2_3.5.1.bb +0 -0
index fc7292e..c1e9bd3 100644

meta/recipes-connectivity/iproute2/iproute2_3.5.1.bb line 6

Quoted 7 lines
meta/recipes-connectivity/iproute2/iproute2_3.5.1.bb +1 -1
@@ -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!