From e38e5e2dc744c73c3b0aff6a9937a70e8162cb9d Mon Sep 17 00:00:00 2001 From: Gary Thomas Date: Fri, 30 Jan 2015 16:20:45 +0800 Subject: rng-tools: Fixes for latest OE layouts The current recipe has a few installation errors: * The manipulation of configurable paths drops a '/' * The init script defaults are placed in the wrong file * Finer control over init script start/stop * The default device is non-standard This patch fixes these little nits and makes the package usable again. Based on the original patch: http://patchwork.openembedded.org/patch/41049/ Signed-off-by: Gary Thomas Signed-off-by: Ting Liu Signed-off-by: Martin Jansa --- meta-oe/recipes-support/rng-tools/files/default | 3 ++- meta-oe/recipes-support/rng-tools/rng-tools_4.bb | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-support/rng-tools/files/default b/meta-oe/recipes-support/rng-tools/files/default index ab7cd9327f..7aede9be03 100644 --- a/meta-oe/recipes-support/rng-tools/files/default +++ b/meta-oe/recipes-support/rng-tools/files/default @@ -1,2 +1,3 @@ # Specify rng device -RNG_DEVICE=/dev/hwrng +#RNG_DEVICE=/dev/hwrng +RNG_DEVICE=/dev/urandom diff --git a/meta-oe/recipes-support/rng-tools/rng-tools_4.bb b/meta-oe/recipes-support/rng-tools/rng-tools_4.bb index 0b40fc5479..b3d880ff35 100644 --- a/meta-oe/recipes-support/rng-tools/rng-tools_4.bb +++ b/meta-oe/recipes-support/rng-tools/rng-tools_4.bb @@ -24,13 +24,13 @@ do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d "${D}${sysconfdir}/init.d" install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools - sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir},' \ + sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ ${D}${sysconfdir}/init.d/rng-tools install -d "${D}${sysconfdir}/default" - install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/rng-tools fi } INITSCRIPT_NAME = "rng-tools" -INITSCRIPT_PARAMS = "defaults" +INITSCRIPT_PARAMS = "start 30 S . stop 30 0 6 1 ." -- cgit 1.2.3-korg