[oe-commits] org.oe.dev iproute2: Use update-alternatives. Note that this moves the ip command from

[lenehan commit]

iproute2: Use update-alternatives. Note that this moves the ip command from
/sbin to /bin, to match where busybox was putting the ip command.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: f8ed821bbfdae8ad992988e3a108ae149f738bfa
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f8ed821bbfdae8ad992988e3a108ae149f738bfa
Files:
1
packages/iproute2/iproute2.inc
packages/iproute2/iproute2_2.6.16.bb
packages/iproute2/iproute2_2.6.18.bb
Diffs:

#
# mt diff -r11b0e95a346503aee118be5632b8ca617f00808e -rf8ed821bbfdae8ad992988e3a108ae149f738bfa
#
# 
# 
# patch "packages/iproute2/iproute2.inc"
#  from [68be970b353b426e113ae7d56d0a5ef1cb1910f4]
#    to [8ced56f6a6b7b1b35bc1eac1f631ae11a91617e0]
# 
# patch "packages/iproute2/iproute2_2.6.16.bb"
#  from [72733c7641b9bf180ce67d8fabe5b2aa228e515d]
#    to [d7129a2d48dca39c3cf69ba3382297249a83b45e]
# 
# patch "packages/iproute2/iproute2_2.6.18.bb"
#  from [ec20043c564decd8baffc6e1df45acb436574067]
#    to [ed105c98db7cbc002aa5185aac193dd86b7f6b89]
# 
============================================================
--- packages/iproute2/iproute2.inc	68be970b353b426e113ae7d56d0a5ef1cb1910f4
+++ packages/iproute2/iproute2.inc	8ced56f6a6b7b1b35bc1eac1f631ae11a91617e0
@@ -12,15 +12,23 @@ S = "${WORKDIR}/${DIRNAME}-${PV}-${DATE}
 
 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"
============================================================
--- packages/iproute2/iproute2_2.6.16.bb	72733c7641b9bf180ce67d8fabe5b2aa228e515d
+++ packages/iproute2/iproute2_2.6.16.bb	d7129a2d48dca39c3cf69ba3382297249a83b45e
@@ -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"
============================================================
--- packages/iproute2/iproute2_2.6.18.bb	ec20043c564decd8baffc6e1df45acb436574067
+++ packages/iproute2/iproute2_2.6.18.bb	ed105c98db7cbc002aa5185aac193dd86b7f6b89
@@ -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"