From a9cd417b6a518e18b4a0c93d7d95a8527f0f3fb2 Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Mon, 18 Jun 2007 02:25:08 +0000
Subject: iproute2: Use update-alternatives. Note that this moves the ip
 command from /sbin to /bin, to match where busybox was putting the ip
 command.

---
 packages/iproute2/iproute2.inc       | 10 +++++++++-
 packages/iproute2/iproute2_2.6.16.bb |  2 +-
 packages/iproute2/iproute2_2.6.18.bb |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/iproute2/iproute2.inc b/packages/iproute2/iproute2.inc
index e14bfdeefe..c417280cd6 100644
--- a/packages/iproute2/iproute2.inc
+++ b/packages/iproute2/iproute2.inc
@@ -12,15 +12,23 @@ SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz"
 
 S = "${WORKDIR}/${DIRNAME}-${PV}-${DATE}"
 
+inherit update-alternatives
+
 EXTRA_OEMAKE = "CC='${CC}' \
                 KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include \
                 DOCDIR=${docdir}/iproute2 \
                 SUBDIRS='lib tc ip' \
-                SBINDIR=/sbin"
+                SBINDIR=${base_sbindir}"
 
 do_install () {
         oe_runmake DESTDIR=${D} install
+        mv ${D}${base_sbindir}/ip ${D}${base_sbindir}/ip.iproute2
 }
 
 FILES_${PN} += "/usr/lib/tc/*"
 FILES_${PN}-dbg += "/usr/lib/tc/.debug"
+
+ALTERNATIVE_NAME = "ip"
+ALTERNATIVE_PATH = "${base_sbindir}/ip.iproute2"
+ALTERNATIVE_LINK = "${base_bindir}/ip"
+ALTERNATIVE_PRIORITY = "100"
diff --git a/packages/iproute2/iproute2_2.6.16.bb b/packages/iproute2/iproute2_2.6.16.bb
index fc87b9e3b5..9d261927f6 100644
--- a/packages/iproute2/iproute2_2.6.16.bb
+++ b/packages/iproute2/iproute2_2.6.16.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
                    file://new-flex-fix.patch;patch=1"
diff --git a/packages/iproute2/iproute2_2.6.18.bb b/packages/iproute2/iproute2_2.6.18.bb
index 9d85126b68..ad62b5344a 100644
--- a/packages/iproute2/iproute2_2.6.18.bb
+++ b/packages/iproute2/iproute2_2.6.18.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 
 SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
                    file://new-flex-fix.patch;patch=1"
-- 
cgit v1.2.3