ChangeLog:
https://github.com/radvd-project/radvd/blob/v2.20/CHANGES
* Drop backport patch
* Add dependency libbsd
* Update rdavd.service
* Install systemd service file and sysvinit script separately through
conditional statements.
Signed-off-by: Yi Zhao <yi.z...@windriver.com>
---
...ude.h-change-in-46883f8a1a02fe42040d.patch | 32 -------------
.../recipes-daemons/radvd/files/radvd.init | 0
.../recipes-daemons/radvd/files/radvd.service | 7 ++-
.../radvd/{radvd_2.19.bb => radvd_2.20.bb} | 48 ++++++++++---------
4 files changed, 30 insertions(+), 57 deletions(-)
delete mode 100644
meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch
mode change 100755 => 100644
meta-networking/recipes-daemons/radvd/files/radvd.init
rename meta-networking/recipes-daemons/radvd/{radvd_2.19.bb => radvd_2.20.bb}
(56%)
diff --git
a/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch
b/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch
deleted file mode 100644
index 57338d4713..0000000000
---
a/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 15f439c555289f900eb33111b010bf1266f97edb Mon Sep 17 00:00:00 2001
-From: Jonathan Davies <j...@protonmail.com>
-Date: Thu, 25 Nov 2021 15:29:18 +0000
-Subject: [PATCH] Reverts the include.h change in
- 46883f8a1a02fe42040dd8e48aec0ed871545d4d
-
-Closes: #158
-
-Upstream-Status: Backport
[https://github.com/radvd-project/radvd/commit/06689f8c06f44c7e87f7ff1d814428f88375b53f]
-Signed-off-by: Jonathan Davies <j...@protonmail.com>
-Signed-off-by: Khem Raj <raj.k...@gmail.com>
----
- includes.h | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/includes.h b/includes.h
-index ef30b10..c528c86 100644
---- a/includes.h
-+++ b/includes.h
-@@ -76,12 +76,7 @@
- #include <sys/sysctl.h>
- #endif
-
--#if !defined(__GLIBC__) && defined(linux)
--#include <linux/if.h>
--#define IF_NAMESIZE IFNAMSIZ
--#else
- #include <net/if.h>
--#endif
-
- #ifdef HAVE_NET_IF_DL_H
- #include <net/if_dl.h>
diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.init
b/meta-networking/recipes-daemons/radvd/files/radvd.init
old mode 100755
new mode 100644
diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.service
b/meta-networking/recipes-daemons/radvd/files/radvd.service
index e60798a6b3..9230543c48 100644
--- a/meta-networking/recipes-daemons/radvd/files/radvd.service
+++ b/meta-networking/recipes-daemons/radvd/files/radvd.service
@@ -4,8 +4,11 @@ After=network.target
ConditionPathExists=@SYSCONFDIR@/radvd.conf
[Service]
-EnvironmentFile=-@SYSCONFDIR@/default/radvd
-ExecStart=@SBINDIR@/radvd -n $OPTIONS
+Type=forking
+EnvironmentFile=@SYSCONFDIR@/default/radvd
+ExecStart=@SBINDIR@/radvd $OPTIONS
+PIDFile=/run/radvd.pid
+ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
diff --git a/meta-networking/recipes-daemons/radvd/radvd_2.19.bb
b/meta-networking/recipes-daemons/radvd/radvd_2.20.bb
similarity index 56%
rename from meta-networking/recipes-daemons/radvd/radvd_2.19.bb
rename to meta-networking/recipes-daemons/radvd/radvd_2.20.bb
index a8a116cbe5..e2d606823b 100644
--- a/meta-networking/recipes-daemons/radvd/radvd_2.19.bb
+++ b/meta-networking/recipes-daemons/radvd/radvd_2.20.bb
@@ -8,7 +8,7 @@ addresses and some other parameters. They also can \
choose a default router based on these advertisements."
HOMEPAGE = "http://www.litech.org/radvd/";
SECTION = "net"
-DEPENDS = "flex-native bison-native libdaemon "
+DEPENDS = "flex-native bison-native libdaemon libbsd"
# License is BSD-Style (with advertising clause) but also has an additional
0th clause
LICENSE = "radvd"
@@ -20,9 +20,8 @@ SRC_URI =
"http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \
file://volatiles.03_radvd \
file://radvd.default \
file://radvd.conf \
-
file://0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch \
"
-SRC_URI[sha256sum] =
"c36470706fec3a9e6bed394ffea08acaff5dac647848d26b96bb9b9c65d58da0"
+SRC_URI[sha256sum] =
"af37c5a81d59f3bdc00d83056606ffa1810d4550beed6caa4f81181246494220"
inherit autotools useradd pkgconfig systemd
@@ -30,34 +29,37 @@ SYSTEMD_SERVICE:${PN} = "radvd.service"
SYSTEMD_AUTO_ENABLE = "disable"
do_install:append () {
- install -m 0755 -d ${D}${sysconfdir}/init.d \
- ${D}${sysconfdir}/default/volatiles \
- ${D}${docdir}/radvd
- # Install init script and volatiles
- install -m 0755 ${UNPACKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd
- sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd
- sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd
- sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd
- sed -i
's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!'
${D}${sysconfdir}/init.d/radvd
+ install -m 0755 -d ${D}${sysconfdir}/default
+ install -m 0644 ${UNPACKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf
+ install -m 0644 ${UNPACKDIR}/radvd.default ${D}${sysconfdir}/default/radvd
- install -m 0644 ${UNPACKDIR}/volatiles.03_radvd
${D}${sysconfdir}/default/volatiles/03_radvd
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false',
d)}; then
+ install -m 0755 -d ${D}${sysconfdir}/init.d \
+ ${D}${sysconfdir}/default/volatiles
- # Install systemd service files
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${UNPACKDIR}/radvd.service ${D}${systemd_unitdir}/system
- sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \
- -e 's#@SBINDIR@#${sbindir}#g' \
- -e 's#@BASE_BINDIR@#${base_bindir}#g'
${D}${systemd_unitdir}/system/radvd.service
+ install -m 0755 ${UNPACKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd
+ sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd
+ sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd
+ sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd
+ sed -i
's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!'
${D}${sysconfdir}/init.d/radvd
- # Install default environment file
- install -m 0644 ${UNPACKDIR}/radvd.default ${D}${sysconfdir}/default/radvd
+ install -m 0644 ${UNPACKDIR}/volatiles.03_radvd
${D}${sysconfdir}/default/volatiles/03_radvd
+ fi
+
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
d)}; then
+ install -m 0755 -d ${D}${systemd_unitdir}/system
+
+ install -m 0644 ${UNPACKDIR}/radvd.service
${D}${systemd_unitdir}/system
+ sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \
+ -e 's#@SBINDIR@#${sbindir}#g' \
+ ${D}${systemd_unitdir}/system/radvd.service
+ fi
# Documentation
+ install -m 0755 -d ${D}${docdir}/radvd
for i in radvd.conf.example README; do \
install -m 0644 ${S}/$i ${D}${docdir}/radvd; \
done
-
- install -m 0644 ${UNPACKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf
}
USERADD_PACKAGES = "${PN}"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#115550):
https://lists.openembedded.org/g/openembedded-devel/message/115550
Mute This Topic: https://lists.openembedded.org/mt/111359823/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
