From e7e1bc43ca5d2209edb927ec3840719bb27e0350 Mon Sep 17 00:00:00 2001 From: Xiangyu Chen Date: Wed, 22 Mar 2023 12:32:48 +0800 Subject: rng-tools: splitting the rng-tools systemd/sysvinit serivce as a package Since we removed the openssh dependency[1] on rng-tools, there are no package requiring rng-tools in oe-core, meta-oe, meta-virt, and the /dev/random won't block anymore after linux-5.6[2], one of the reasons for keeping rng-tools build into the image is that it can be used to test[3], so splitting the rng-tools systemd/systvinit service as a package. If someone needs rng-tools daemon service, they can enable the rng-tools-service package by directly. Reference: [1] https://git.openembedded.org/openembedded-core/commit/?id=868dfb46d96a27ec9041cb902fb769330277257d [2] https://github.com/torvalds/linux/commit/30c08efec8884fb106b8e57094baa51bb4c44e32 [3] https://linux.die.net/man/1/rngtest (From OE-Core rev: a7b1d5418eb3a90eb14780ab6336790ab73e4692) Signed-off-by: Xiangyu Chen Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-support/rng-tools/rng-tools_6.16.bb | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/rng-tools/rng-tools_6.16.bb b/meta/recipes-support/rng-tools/rng-tools_6.16.bb index 02abe486bb..b31b2662cf 100644 --- a/meta/recipes-support/rng-tools/rng-tools_6.16.bb +++ b/meta/recipes-support/rng-tools/rng-tools_6.16.bb @@ -30,13 +30,22 @@ PACKAGECONFIG[libp11] = "--with-pkcs11,--without-pkcs11,libp11 openssl" PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl libxml2" PACKAGECONFIG[qrypt] = "--with-qrypt,--without-qrypt,curl" -INITSCRIPT_NAME = "rng-tools" -INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ." +INITSCRIPT_PACKAGES = "${PN}-service" +INITSCRIPT_NAME:${PN}-service = "rng-tools" +INITSCRIPT_PARAMS:${PN}-service = "start 03 2 3 4 5 . stop 30 0 6 1 ." -SYSTEMD_SERVICE:${PN} = "rng-tools.service" +SYSTEMD_PACKAGES = "${PN}-service" +SYSTEMD_SERVICE:${PN}-service = "rng-tools.service" CFLAGS += " -DJENT_CONF_ENABLE_INTERNAL_TIMER " +PACKAGES =+ "${PN}-service" + +FILES:${PN}-service += " \ + ${sysconfdir}/init.d/rng-tools \ + ${sysconfdir}/default/rng-tools \ +" + # Refer autogen.sh in rng-tools do_configure:prepend() { cp ${S}/README.md ${S}/README -- cgit v1.2.3-54-g00ecf