Skip to contentSkip to conversation

rng-tools: remove duplicate initscript and wait for module load

PATCH In review Denys Dmytriyenko 2 participants 2 messages Sep 4, 2019 – Sep 9, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 rng-tools: remove duplicate initscript and wait for module load

Since Arago still has a mix of SysVinit iniscripts and systemd unit files, it enables both of the DISTRO_FEATURES, resulting in some duplication. It appears that rngd currently has a problem handling signals when forked in daemon mode. Hence, drop SysVinit initscript in favor of systemd service, as the latter one starts rngd in foreground. Also, add udev dependency rule on omap_rng module.

---
v2 - since dropping initscript, disable corresponding update-rc.d processing

 .../recipes-support/rng-tools/rng-tools/rngd.rules        |  1 +
 .../recipes-support/rng-tools/rng-tools_%.bbappend        | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 meta-arago-distro/recipes-support/rng-tools/rng-tools/rngd.rules
 create mode 100644 meta-arago-distro/recipes-support/rng-tools/rng-tools_%.bbappend
meta-arago-distro/recipes-support/rng-tools/rng-tools/rngd.rules new file +1 -0
new file mode 100644
index 0000000..a21c99b
@@ -0,0 +1 @@
+ACTION=="add", SUBSYSTEM=="module", KERNEL=="omap_rng", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
meta-arago-distro/recipes-support/rng-tools/rng-tools_%.bbappend new file +15 -0
new file mode 100644
index 0000000..2a7810f
@@ -0,0 +1,15 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PR_append = ".arago0"
+
+SRC_URI += "file://rngd.rules"
+
+do_install_append() {
+	# remove duplicate initscript
+	rm -f ${D}${sysconfdir}/init.d/rng-tools
+
+	install -d ${D}${sysconfdir}/udev/rules.d/
+	install -m0644 ${WORKDIR}/rngd.rules ${D}${sysconfdir}/udev/rules.d/
+}
+
+INHIBIT_UPDATERCD_BBCLASS = "1"
Signature · 1 line
2.7.4
#1 lore raw

Denys,

Can you backport this to ti2019.03?

Thanks,

Jake

Quoted 44 lines · Denys Dmytriyenko

Since Arago still has a mix of SysVinit iniscripts and systemd unit files, it enables both of the DISTRO_FEATURES, resulting in some duplication. It appears that rngd currently has a problem handling signals when forked in daemon mode. Hence, drop SysVinit initscript in favor of systemd service, as the latter one starts rngd in foreground. Also, add udev dependency rule on omap_rng module.

---
v2 - since dropping initscript, disable corresponding update-rc.d processing

  .../recipes-support/rng-tools/rng-tools/rngd.rules        |  1 +
  .../recipes-support/rng-tools/rng-tools_%.bbappend        | 15 +++++++++++++++
  2 files changed, 16 insertions(+)

create mode 100644 meta-arago-distro/recipes-support/rng-tools/rng-tools/rngd.rules create mode 100644 meta-arago-distro/recipes-support/rng-tools/rng-tools_%.bbappend

meta-arago-distro/recipes-support/rng-tools/rng-tools/rngd.rules new file +1 -0
new file mode 100644
index 0000000..a21c99b
@@ -0,0 +1 @@
+ACTION=="add", SUBSYSTEM=="module", KERNEL=="omap_rng", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
meta-arago-distro/recipes-support/rng-tools/rng-tools_%.bbappend new file +15 -0
new file mode 100644
index 0000000..2a7810f
@@ -0,0 +1,15 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PR_append = ".arago0"
+
+SRC_URI += "file://rngd.rules"
+
+do_install_append() {
+	# remove duplicate initscript
+	rm -f ${D}${sysconfdir}/init.d/rng-tools
+
+	install -d ${D}${sysconfdir}/udev/rules.d/
+	install -m0644 ${WORKDIR}/rngd.rules ${D}${sysconfdir}/udev/rules.d/
+}
+
+INHIBIT_UPDATERCD_BBCLASS = "1"