radvd: update to 1.9.8

Update radvd to version 1.9.8

* remove change-scanner-dependency.patch which is merged
* add 'status' subcommand for radvd.init

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

5 files changed, 21 insertions, 34 deletions

diff --git a/meta-networking/recipes-daemons/radvd/files/change-scanner-dependency.patch b/meta-networking/recipes-daemons/radvd/files/change-scanner-dependency.patch
deleted file mode 100644
index b190866c4..000000000
--- a/meta-networking/recipes-daemons/radvd/files/change-scanner-dependency.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-scanner.c is generated by flex using scanner.l, scanner.l needs gram.h
-when produce scanner.c, so redefine the dependency relation
-
-Upstream-Status: Pending
-
-Signed-off-by: Roy.Li <rongqing.li@windriver.com>
----
- Makefile.am |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 04b834b..2da986c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -131,5 +131,4 @@ dist-hook:
-        rm -f $(distdir)/gram.h
-        rm -f $(distdir)/scanner.c
- 
--scanner.o: gram.h
--
-+scanner.c: gram.h
--- 
-1.7.4.1
-
diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.init b/meta-networking/recipes-daemons/radvd/files/radvd.init
index a48dff8c8..921384cb0 100755
--- a/meta-networking/recipes-daemons/radvd/files/radvd.init
+++ b/meta-networking/recipes-daemons/radvd/files/radvd.init
@@ -9,6 +9,9 @@
 # Description:    router advertisement daemon
 ### END INIT INFO
 
+# Source function library.
+. /etc/init.d/functions
+
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/radvd
 NAME=radvd
@@ -95,6 +98,10 @@ case "$1" in
         rm -f $SAVED_SETTINGS
         echo "$NAME."
         ;;
+  status)
+        status $DAEMON;
+        exit $?
+        ;;
   reload|force-reload)
         echo "Reloading $DESC configuration files."
         start-stop-daemon --stop --signal HUP --quiet --pidfile \
@@ -116,7 +123,7 @@ case "$1" in
         ;;
   *)
         N=/etc/init.d/$NAME
-        echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+        echo "Usage: $N {start|stop|status|restart|reload|force-reload}" >&2
         exit 1
         ;;
 esac
diff --git a/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-networking/recipes-daemons/radvd/radvd.inc
index f314feef0..9e194012c 100644
--- a/meta-networking/recipes-daemons/radvd/radvd.inc
+++ b/meta-networking/recipes-daemons/radvd/radvd.inc
@@ -1,4 +1,11 @@
 SUMMARY = "IPv6 router advertisement daemon"
+DESCRIPTION = "radvd is the router advertisement daemon for IPv6. It \
+listens to router solicitations and sends router \
+advertisements as described in RFC 2461, Neighbor \
+Discovery for IP Version 6 (IPv6). With these \
+advertisements hosts can automatically configure their \
+addresses and some other parameters. They also can \
+choose a default router based on these advertisements."
 HOMEPAGE = "http://www.litech.org/radvd/"
 SECTION = "console/network"
 DEPENDS = "flex-native libdaemon"
diff --git a/meta-networking/recipes-daemons/radvd/radvd_1.9.1.bb b/meta-networking/recipes-daemons/radvd/radvd_1.9.1.bb
deleted file mode 100644
index 0dccdeddd..000000000
--- a/meta-networking/recipes-daemons/radvd/radvd_1.9.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-PR = "r1"
-
-require radvd.inc
-
-SRC_URI[md5sum] = "e807ad7e9a76d46b6133df391385cd31"
-SRC_URI[sha256sum] = "54eb5704a2b710ba946fa30d2bca811fa23b1b3bfab322c38cb0c2a9619aa933"
-
-SRC_URI += "\
-    file://change-scanner-dependency.patch"
diff --git a/meta-networking/recipes-daemons/radvd/radvd_1.9.8.bb b/meta-networking/recipes-daemons/radvd/radvd_1.9.8.bb
new file mode 100644
index 000000000..407eb43d3
--- /dev/null
+++ b/meta-networking/recipes-daemons/radvd/radvd_1.9.8.bb
@@ -0,0 +1,6 @@
+PR = "r0"
+
+require radvd.inc
+
+SRC_URI[md5sum] = "7a96a38252c3964ee18bbc1fdeae25fa"
+SRC_URI[sha256sum] = "645ccf1c9b16e769ff4179813712e580e2c8786d64a888d8afa1e296c057c1c1"