From patchwork Fri Dec 14 21:05:48 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [meta-oe] rng-tools: Fixes for latest OE layouts
Date: Fri, 14 Dec 2012 21:05:48 -0000
From: Gary Thomas <gary@mlbassoc.com>
X-Patchwork-Id: 41049
Message-Id: <1355519149-23005-1-git-send-email-gary@mlbassoc.com>
To: openembedded-devel@lists.openembedded.org

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.

Signed-off-by: Gary Thomas <gary@mlbassoc.com>

---
meta-oe/recipes-support/rng-tools/files/default  |    3 ++-
 meta-oe/recipes-support/rng-tools/rng-tools_2.bb |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-support/rng-tools/files/default b/meta-oe/recipes-support/rng-tools/files/default
index ab7cd93..7aede9b 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_2.bb b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
index ef753cf..b94854a 100644
--- a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
+++ b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
@@ -15,12 +15,13 @@ inherit autotools update-rc.d
 do_install_append() {
         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
 }
 
 INITSCRIPT_NAME = "rng-tools"
 INITSCRIPT_PARAMS = "defaults"
+INITSCRIPT_PARAMS = "start 30 S . stop 30 0 6 1 ."