htb-init: fix ip location, use init script, update package_arch

OE has alternatives setup for ip and the link is installed in /bin/ip, rather
than /sbin/ip, so fix that. Also, setup rc links by default and set
package_arch to all since it's just an init script.

Update RDEPENDS since versioning doesn't work here.

Signed-off-by: Roman I Khimov <khimov@altell.ru>

diff --git a/recipes/htb-init/htb-init_0.8.5.bb b/recipes/htb-init/htb-init_0.8.5.bb
index a70da77..69d61e2 100644 (file)
--- a/recipes/htb-init/htb-init_0.8.5.bb
+++ b/recipes/htb-init/htb-init_0.8.5.bb
@@ -1,18 +1,24 @@
 DESCRIPTION = "HTB.init is a shell script that allows for easy setup of HTB-based traffic control on Linux."
 HOMEPAGE = "http://sourceforge.net/projects/htbinit"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/htbinit/htb.init-v${PV} \
        file://htb.init+ingress+predef+verbose.diff;patch=1;pnum=0 \
        file://htb-basic-verbose.diff;patch=1;pnum=0"
 RRECOMMENDS = "kernel-module-sch-ingress kernel-module-cls-route kernel-module-cls-u32 kernel-module-cls-fw kernel-module-sch-sfq kernel-module-sch-htb"
-RDEPENDS = "iproute2 (>= 2.6.8-r1)"
+RDEPENDS = "iproute2"
 
 S="${WORKDIR}"
 
+inherit update-rc.d
+INITSCRIPT_NAME = "htb"
+
 do_install() {
        install -d ${D}${sysconfdir}/init.d
        install -d ${D}${sysconfdir}/htb
        install -m 755 ${S}/htb.init-v${PV} ${D}${sysconfdir}/init.d/htb
+       sed -r -i "s,IP=/sbin/ip,IP=${base_bindir}/ip," ${D}${sysconfdir}/init.d/htb
 }
+
+PACKAGE_ARCH = "all"