rng-tools: Change systemd service name to work with sysvinit

Change systemd service name from rngd -> rng-tools to avoid load twice
the service when sysvinit compatibility is enabled,

...
root@:~# ps  | grep rng
   23 root         0 SW   [hwrng]
13109 root      3528 R    /usr/sbin/rngd -f -r /dev/hwrng
13117 root      2348 S    grep rng
29418 root     12756 S    /usr/sbin/rngd -r /dev/hwrng
...

(From OE-Core rev: 945dfe2e4ba8581a19ebdc833100e87ed96c5d08)

Signed-off-by: Aníbal Limón <limon.anibal@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Aníbal Limón
2022-07-26 14:33:22 -05:00
committed by Richard Purdie
parent c6d0348206
commit 30ae37b756
2 changed files with 6 additions and 6 deletions

View File

@@ -11,7 +11,7 @@ DEPENDS = "sysfsutils openssl"
SRC_URI = "git://github.com/nhorman/rng-tools.git;branch=master;protocol=https \
file://init \
file://default \
file://rngd.service \
file://rng-tools.service \
"
SRCREV = "381f69828b782afda574f259c1b7549f48f9bb77"
@@ -32,7 +32,7 @@ PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl libxml2
INITSCRIPT_NAME = "rng-tools"
INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ."
SYSTEMD_SERVICE:${PN} = "rngd.service"
SYSTEMD_SERVICE:${PN} = "rng-tools.service"
CFLAGS += " -DJENT_CONF_ENABLE_INTERNAL_TIMER "
@@ -44,18 +44,18 @@ do_configure:prepend() {
do_install:append() {
install -Dm 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools
install -Dm 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools
install -Dm 0644 ${WORKDIR}/rngd.service \
${D}${systemd_system_unitdir}/rngd.service
install -Dm 0644 ${WORKDIR}/rng-tools.service \
${D}${systemd_system_unitdir}/rng-tools.service
sed -i \
-e 's,@SYSCONFDIR@,${sysconfdir},g' \
-e 's,@SBINDIR@,${sbindir},g' \
${D}${sysconfdir}/init.d/rng-tools \
${D}${systemd_system_unitdir}/rngd.service
${D}${systemd_system_unitdir}/rng-tools.service
if [ "${@bb.utils.contains('PACKAGECONFIG', 'nistbeacon', 'yes', 'no', d)}" = "yes" ]; then
sed -i \
-e '/^IPAddressDeny=any/d' \
-e '/^RestrictAddressFamilies=/ s/$/ AF_INET AF_INET6/' \
${D}${systemd_system_unitdir}/rngd.service
${D}${systemd_system_unitdir}/rng-tools.service
fi
}