diff options
author | Kang Kai <kai.kang@windriver.com> | 2014-01-17 15:25:52 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-01-22 12:22:39 +0100 |
commit | 9e174abc4a5fd5fe14b974b1ab20933874ddb112 (patch) | |
tree | ffda69f232c98fcecacf24345edfb74c5a34da25 /meta-networking/recipes-daemons/radvd/files | |
parent | 039b0190d9049768876af892cf9e18324a8d7c63 (diff) | |
download | meta-openembedded-9e174abc4a5fd5fe14b974b1ab20933874ddb112.tar.gz |
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>
Diffstat (limited to 'meta-networking/recipes-daemons/radvd/files')
-rw-r--r-- | meta-networking/recipes-daemons/radvd/files/change-scanner-dependency.patch | 24 | ||||
-rwxr-xr-x | meta-networking/recipes-daemons/radvd/files/radvd.init | 9 |
2 files changed, 8 insertions, 25 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 @@ | |||
1 | scanner.c is generated by flex using scanner.l, scanner.l needs gram.h | ||
2 | when produce scanner.c, so redefine the dependency relation | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | ||
7 | --- | ||
8 | Makefile.am | 3 +-- | ||
9 | 1 files changed, 1 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/Makefile.am b/Makefile.am | ||
12 | index 04b834b..2da986c 100644 | ||
13 | --- a/Makefile.am | ||
14 | +++ b/Makefile.am | ||
15 | @@ -131,5 +131,4 @@ dist-hook: | ||
16 | rm -f $(distdir)/gram.h | ||
17 | rm -f $(distdir)/scanner.c | ||
18 | |||
19 | -scanner.o: gram.h | ||
20 | - | ||
21 | +scanner.c: gram.h | ||
22 | -- | ||
23 | 1.7.4.1 | ||
24 | |||
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 @@ | |||
9 | # Description: router advertisement daemon | 9 | # Description: router advertisement daemon |
10 | ### END INIT INFO | 10 | ### END INIT INFO |
11 | 11 | ||
12 | # Source function library. | ||
13 | . /etc/init.d/functions | ||
14 | |||
12 | PATH=/sbin:/bin:/usr/sbin:/usr/bin | 15 | PATH=/sbin:/bin:/usr/sbin:/usr/bin |
13 | DAEMON=/usr/sbin/radvd | 16 | DAEMON=/usr/sbin/radvd |
14 | NAME=radvd | 17 | NAME=radvd |
@@ -95,6 +98,10 @@ case "$1" in | |||
95 | rm -f $SAVED_SETTINGS | 98 | rm -f $SAVED_SETTINGS |
96 | echo "$NAME." | 99 | echo "$NAME." |
97 | ;; | 100 | ;; |
101 | status) | ||
102 | status $DAEMON; | ||
103 | exit $? | ||
104 | ;; | ||
98 | reload|force-reload) | 105 | reload|force-reload) |
99 | echo "Reloading $DESC configuration files." | 106 | echo "Reloading $DESC configuration files." |
100 | start-stop-daemon --stop --signal HUP --quiet --pidfile \ | 107 | start-stop-daemon --stop --signal HUP --quiet --pidfile \ |
@@ -116,7 +123,7 @@ case "$1" in | |||
116 | ;; | 123 | ;; |
117 | *) | 124 | *) |
118 | N=/etc/init.d/$NAME | 125 | N=/etc/init.d/$NAME |
119 | echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 | 126 | echo "Usage: $N {start|stop|status|restart|reload|force-reload}" >&2 |
120 | exit 1 | 127 | exit 1 |
121 | ;; | 128 | ;; |
122 | esac | 129 | esac |