From 3653d75c6f893a218f2444f9b4f71493c7f13d6c Mon Sep 17 00:00:00 2001
From: Mikko Gronoff <mikko.gronoff@qt.io>
Date: Wed, 10 Oct 2018 13:32:48 +0300
Subject: rng-tools: update rng-tools .bbappend

poky(sumo) has now a systemd service file with appropriate installation
in recipe, but the rngd.service file itself is still broken using
/dev/urandom as a RNG_DEVICE. Update bbappend, leaving fixed
rngd.service file override in place.

poky commit where systemd service added:
b5fc88b3d35cc97c357ade91f0c9f376e3aed1cf rng-tools: add systemd service
file

init script (leaving systemd broken) was fixed in poky with commit:
b3b7ee4097b42b06f92127ca98663a96284ee185 rng-tools: Fix crazy defaults

Change-Id: I3330718543fd68dd9102d3f4ed3479c23d254321
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 .../recipes-support/rng-tools/rng-tools_5.bbappend    | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'meta-boot2qt-distro')

diff --git a/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend
index dedddf0..dba4af2 100644
--- a/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend
+++ b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,19 +27,4 @@
 ##
 ############################################################################
 
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += "\
-    file://rngd.service \
-    "
-
-inherit systemd
-
-do_install_append() {
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-        install -d ${D}${systemd_unitdir}/system
-        install -m 644 ${WORKDIR}/rngd.service ${D}${systemd_unitdir}/system
-        sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/rngd.service
-    fi
-}
-
-SYSTEMD_SERVICE_${PN} = "rngd.service"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-- 
cgit v1.2.3-54-g00ecf