| Message ID | 20220726193322.1569574-1-limon.anibal@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [PATCHv2] ] recipes-support: rng-tools change systemd service name | expand |
On 7/27/22 10:51 AM, An?bal Lim?n wrote: > > > On Wed, Jul 27, 2022 at 5:44 AM Luca Ceresoli <luca.ceresoli@bootlin.com > <mailto:luca.ceresoli@bootlin.com>> wrote: > > Hello Aníbal, > > On Tue, 26 Jul 2022 14:33:22 -0500 > "An?bal Lim?n" <limon.anibal@gmail.com > <mailto:limon.anibal@gmail.com>> wrote: > > > From: Aníbal Limón <limon.anibal@gmail.com > <mailto:limon.anibal@gmail.com>> > > > > 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 > > ... > > > > Signed-off-by: Aníbal Limón <limon.anibal@gmail.com > <mailto:limon.anibal@gmail.com>> > > --- > > .../rng-tools/{rngd.service => rng-tools.service} | 0 > > meta/recipes-support/rng-tools/rng-tools_6.15.bb > <http://rng-tools_6.15.bb> | 12 ++++++------ > > 2 files changed, 6 insertions(+), 6 deletions(-) > > rename meta/recipes-support/rng-tools/rng-tools/{rngd.service => > rng-tools.service} (100%) > > > > diff --git > a/meta/recipes-support/rng-tools/rng-tools/rngd.service > b/meta/recipes-support/rng-tools/rng-tools/rng-tools.service > > similarity index 100% > > rename from meta/recipes-support/rng-tools/rng-tools/rngd.service > > rename to meta/recipes-support/rng-tools/rng-tools/rng-tools.service > > diff --git a/meta/recipes-support/rng-tools/rng-tools_6.15.bb > <http://rng-tools_6.15.bb> > b/meta/recipes-support/rng-tools/rng-tools_6.15.bb > <http://rng-tools_6.15.bb> > > index 0696351903..efc08b5e0a 100644 > > --- a/meta/recipes-support/rng-tools/rng-tools_6.15.bb > <http://rng-tools_6.15.bb> > > +++ b/meta/recipes-support/rng-tools/rng-tools_6.15.bb > <http://rng-tools_6.15.bb> > > @@ -11,7 +11,7 @@ DEPENDS = "sysfsutils openssl" > > SRC_URI = > "git://github.com/nhorman/rng-tools.git;branch=master;protocol=https > <http://github.com/nhorman/rng-tools.git;branch=master;protocol=https> \ > > file://init \ > > file://default \ > > - file://rngd.service \ > > + file://rng-tools.service \ > > This feels strange to me: "rng-tools" does not look like a daemon name, > but rather a, well, tools name. Maybe "rng-daemon" would clarify? > > > Another option is to change the init daemon to be called rngd. I think yet another way is to check for condition when sysvinit compatibility is enabled during install time and decide if we need to install both sysvinit script and systemd service or not. I do not think renaming .service file is a good solution here. > > Regards, > Anibal > > > Still I'm taking this patch for testing, I'll replace it with v2 should > you send one. > > However please note there is an extra ']' in the subject: [PATCHv2]] > should be [PATCHv2]. This leads 'git am' to produce a commit starting > with a "] " prefix. I fixed it while applying, however you should check > that in the future. > > Best regards. > -- > Luca Ceresoli, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com <https://bootlin.com> > > > > >
diff --git a/meta/recipes-support/rng-tools/rng-tools/rngd.service b/meta/recipes-support/rng-tools/rng-tools/rng-tools.service similarity index 100% rename from meta/recipes-support/rng-tools/rng-tools/rngd.service rename to meta/recipes-support/rng-tools/rng-tools/rng-tools.service diff --git a/meta/recipes-support/rng-tools/rng-tools_6.15.bb b/meta/recipes-support/rng-tools/rng-tools_6.15.bb index 0696351903..efc08b5e0a 100644 --- a/meta/recipes-support/rng-tools/rng-tools_6.15.bb +++ b/meta/recipes-support/rng-tools/rng-tools_6.15.bb @@ -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 }