diff options
5 files changed, 174 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch b/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch new file mode 100644 index 0000000000..eeeb89942b --- /dev/null +++ b/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Busybox does not support ps -p so use pgrep | ||
2 | |||
3 | Upstream-Status: Inappropriate [embedded specific] | ||
4 | Based on changes from Diego Sueiro <Diego.Sueiro@arm.com> | ||
5 | |||
6 | Signed-off-by: Armin kuster <akuster808@gmail.com> | ||
7 | |||
8 | Index: kea-1.7.10/src/bin/keactrl/keactrl.in | ||
9 | =================================================================== | ||
10 | --- kea-1.7.10.orig/src/bin/keactrl/keactrl.in | ||
11 | +++ kea-1.7.10/src/bin/keactrl/keactrl.in | ||
12 | @@ -137,8 +137,8 @@ check_running() { | ||
13 | # Get the PID from the PID file (if it exists) | ||
14 | get_pid_from_file "${proc_name}" | ||
15 | if [ ${_pid} -gt 0 ]; then | ||
16 | - # Use ps to check if PID is alive | ||
17 | - ps -p ${_pid} 1>/dev/null | ||
18 | + # Use pgrep and grep to check if PID is alive | ||
19 | + pgrep -v 1 | grep ${_pid} 1>/dev/null | ||
20 | retcode=$? | ||
21 | if [ $retcode -eq 0 ]; then | ||
22 | # No error, so PID IS ALIVE | ||
diff --git a/meta/recipes-connectivity/kea/files/kea-dhcp-ddns-server b/meta/recipes-connectivity/kea/files/kea-dhcp-ddns-server new file mode 100644 index 0000000000..50fe40d439 --- /dev/null +++ b/meta/recipes-connectivity/kea/files/kea-dhcp-ddns-server | |||
@@ -0,0 +1,46 @@ | |||
1 | #!/bin/sh | ||
2 | ### BEGIN INIT INFO | ||
3 | # Provides: kea-dhcp-ddns-server | ||
4 | # Required-Start: $local_fs $network $remote_fs $syslog | ||
5 | # Required-Stop: $local_fs $network $remote_fs $syslog | ||
6 | # Default-Start: 2 3 4 5 | ||
7 | # Default-Stop: 0 1 6 | ||
8 | # Short-Description: ISC KEA DHCP IPv6 Server | ||
9 | ### END INIT INFO | ||
10 | |||
11 | PATH=/sbin:/usr/sbin:/bin:/usr/bin | ||
12 | DESC="kea-dhcp-ddns-server" | ||
13 | NAME=kea-dhcp-ddns | ||
14 | DAEMON=/usr/sbin/keactrl | ||
15 | DAEMON_ARGS=" -s dhcp_ddns" | ||
16 | |||
17 | set -e | ||
18 | |||
19 | # Exit if the package is not installed | ||
20 | [ -x "$DAEMON" ] || exit 0 | ||
21 | |||
22 | # Source function library. | ||
23 | . /etc/init.d/functions | ||
24 | |||
25 | case "$1" in | ||
26 | start) | ||
27 | echo -n "Starting $DESC: " | ||
28 | start-stop-daemon -S -b -n $NAME -x $DAEMON -- start $DAEMON_ARGS | ||
29 | echo "done." | ||
30 | ;; | ||
31 | stop) | ||
32 | echo -n "Stopping $DESC: " | ||
33 | kpid=`pidof $NAME` | ||
34 | kill $kpid | ||
35 | echo "done." | ||
36 | ;; | ||
37 | restart|force-reload) | ||
38 | # | ||
39 | $0 stop | ||
40 | $0 start | ||
41 | ;; | ||
42 | *) | ||
43 | echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 | ||
44 | exit 1 | ||
45 | ;; | ||
46 | esac | ||
diff --git a/meta/recipes-connectivity/kea/files/kea-dhcp4-server b/meta/recipes-connectivity/kea/files/kea-dhcp4-server new file mode 100644 index 0000000000..e83e51025d --- /dev/null +++ b/meta/recipes-connectivity/kea/files/kea-dhcp4-server | |||
@@ -0,0 +1,46 @@ | |||
1 | #!/bin/sh | ||
2 | ### BEGIN INIT INFO | ||
3 | # Provides: kea-dhcp4-server | ||
4 | # Required-Start: $local_fs $network $remote_fs $syslog | ||
5 | # Required-Stop: $local_fs $network $remote_fs $syslog | ||
6 | # Default-Start: 2 3 4 5 | ||
7 | # Default-Stop: 0 1 6 | ||
8 | # Short-Description: ISC KEA DHCP IPv6 Server | ||
9 | ### END INIT INFO | ||
10 | |||
11 | PATH=/sbin:/usr/sbin:/bin:/usr/bin | ||
12 | DESC="kea-dhcp4-server" | ||
13 | NAME=kea-dhcp4 | ||
14 | DAEMON=/usr/sbin/keactrl | ||
15 | DAEMON_ARGS=" -s dhcp4" | ||
16 | |||
17 | set -e | ||
18 | |||
19 | # Exit if the package is not installed | ||
20 | [ -x "$DAEMON" ] || exit 0 | ||
21 | |||
22 | # Source function library. | ||
23 | . /etc/init.d/functions | ||
24 | |||
25 | case "$1" in | ||
26 | start) | ||
27 | echo -n "Starting $DESC: " | ||
28 | start-stop-daemon -S -b -n $NAME -x $DAEMON -- start $DAEMON_ARGS | ||
29 | echo "done." | ||
30 | ;; | ||
31 | stop) | ||
32 | echo -n "Stopping $DESC: " | ||
33 | kpid=`pidof $NAME` | ||
34 | kill $kpid | ||
35 | echo "done." | ||
36 | ;; | ||
37 | restart|force-reload) | ||
38 | # | ||
39 | $0 stop | ||
40 | $0 start | ||
41 | ;; | ||
42 | *) | ||
43 | echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 | ||
44 | exit 1 | ||
45 | ;; | ||
46 | esac | ||
diff --git a/meta/recipes-connectivity/kea/files/kea-dhcp6-server b/meta/recipes-connectivity/kea/files/kea-dhcp6-server new file mode 100644 index 0000000000..10f2d22641 --- /dev/null +++ b/meta/recipes-connectivity/kea/files/kea-dhcp6-server | |||
@@ -0,0 +1,47 @@ | |||
1 | #!/bin/sh | ||
2 | ### BEGIN INIT INFO | ||
3 | # Provides: kea-dhcp6-server | ||
4 | # Required-Start: $local_fs $network $remote_fs $syslog | ||
5 | # Required-Stop: $local_fs $network $remote_fs $syslog | ||
6 | # Default-Start: 2 3 4 5 | ||
7 | # Default-Stop: 0 1 6 | ||
8 | # Short-Description: ISC KEA DHCP IPv6 Server | ||
9 | ### END INIT INFO | ||
10 | |||
11 | # PATH should only include /usr/* if it runs after the mountnfs.sh script | ||
12 | PATH=/sbin:/usr/sbin:/bin:/usr/bin | ||
13 | DESC="kea-dhcp6-server" | ||
14 | NAME=kea-dhcp6 | ||
15 | DAEMON=/usr/sbin/keactrl | ||
16 | DAEMON_ARGS=" -s dhcp6" | ||
17 | |||
18 | set -e | ||
19 | |||
20 | # Exit if the package is not installed | ||
21 | [ -x "$DAEMON" ] || exit 0 | ||
22 | |||
23 | # Source function library. | ||
24 | . /etc/init.d/functions | ||
25 | |||
26 | case "$1" in | ||
27 | start) | ||
28 | echo -n "Starting $DESC: " | ||
29 | start-stop-daemon -S -b -n $NAME -x $DAEMON -- start $DAEMON_ARGS | ||
30 | echo "done." | ||
31 | ;; | ||
32 | stop) | ||
33 | echo -n "Stopping $DESC: " | ||
34 | kpid=`pidof $NAME` | ||
35 | kill $kpid | ||
36 | echo "done." | ||
37 | ;; | ||
38 | restart|force-reload) | ||
39 | # | ||
40 | $0 stop | ||
41 | $0 start | ||
42 | ;; | ||
43 | *) | ||
44 | echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 | ||
45 | exit 1 | ||
46 | ;; | ||
47 | esac | ||
diff --git a/meta/recipes-connectivity/kea/kea_1.7.10.bb b/meta/recipes-connectivity/kea/kea_1.7.10.bb index 2ea4b12758..c9a5819e47 100644 --- a/meta/recipes-connectivity/kea/kea_1.7.10.bb +++ b/meta/recipes-connectivity/kea/kea_1.7.10.bb | |||
@@ -13,11 +13,18 @@ SRC_URI = "\ | |||
13 | file://kea-dhcp4.service \ | 13 | file://kea-dhcp4.service \ |
14 | file://kea-dhcp6.service \ | 14 | file://kea-dhcp6.service \ |
15 | file://kea-dhcp-ddns.service \ | 15 | file://kea-dhcp-ddns.service \ |
16 | file://kea-dhcp4-server \ | ||
17 | file://kea-dhcp6-server \ | ||
18 | file://kea-dhcp-ddns-server \ | ||
16 | file://fix-multilib-conflict.patch \ | 19 | file://fix-multilib-conflict.patch \ |
20 | file://fix_pid_keactrl.patch \ | ||
17 | " | 21 | " |
18 | SRC_URI[sha256sum] = "4e121f0e58b175a827581c69cb1d60778647049fa47f142940dddc9ce58f3c82" | 22 | SRC_URI[sha256sum] = "4e121f0e58b175a827581c69cb1d60778647049fa47f142940dddc9ce58f3c82" |
19 | 23 | ||
20 | inherit autotools systemd | 24 | inherit autotools systemd update-rc.d |
25 | |||
26 | INITSCRIPT_NAME = "kea-dhcp4-server" | ||
27 | INITSCRIPT_PARAMS = "defaults 30" | ||
21 | 28 | ||
22 | SYSTEMD_SERVICE_${PN} = "kea-dhcp4.service kea-dhcp6.service kea-dhcp-ddns.service" | 29 | SYSTEMD_SERVICE_${PN} = "kea-dhcp4.service kea-dhcp6.service kea-dhcp-ddns.service" |
23 | SYSTEMD_AUTO_ENABLE = "disable" | 30 | SYSTEMD_AUTO_ENABLE = "disable" |
@@ -44,8 +51,11 @@ do_configure_prepend() { | |||
44 | } | 51 | } |
45 | 52 | ||
46 | do_install_append() { | 53 | do_install_append() { |
54 | install -d ${D}${sysconfdir}/init.d | ||
47 | install -d ${D}${systemd_system_unitdir} | 55 | install -d ${D}${systemd_system_unitdir} |
56 | |||
48 | install -m 0644 ${WORKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} | 57 | install -m 0644 ${WORKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} |
58 | install -m 0755 ${WORKDIR}/kea-*-server ${D}${sysconfdir}/init.d | ||
49 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 59 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
50 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 60 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
51 | ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl | 61 | ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl |
@@ -55,6 +65,8 @@ do_install_append() { | |||
55 | rm -rf "${D}${localstatedir}" | 65 | rm -rf "${D}${localstatedir}" |
56 | } | 66 | } |
57 | 67 | ||
68 | CONFFILES_${PN} = "${sysconfdir}/kea/keactrl.conf" | ||
69 | |||
58 | FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a" | 70 | FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a" |
59 | FILES_${PN} += "${libdir}/hooks/*.so" | 71 | FILES_${PN} += "${libdir}/hooks/*.so" |
60 | 72 | ||