summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-09-18 15:10:39 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2017-09-18 13:37:55 +0000
commitee729f80a65419e780164c2f6510d1a0cb558cd7 (patch)
tree879a81cc3b93339c0f2506928176a4a8174050fd
parent425889c267fa79ed371b83bcb1ebb94463c7e9d7 (diff)
downloadmeta-boot2qt-ee729f80a65419e780164c2f6510d1a0cb558cd7.tar.gz
rng-tools: include RNG daemon to image
The rngd reads from hardware random number generator device (/dev/hwrng) and feeds that to /dev/random. Better entropy at boot time is now required since Qt is using getentropy() for random numbers, which blocks on boot if there is not enough generated entropy. Unlike the upstream recipe, this one is configured to use /dev/hwrng instead of /dev/urandom, which means the device needs to have a working HWRNG configuration. Task-number: QTBUG-63188 Change-Id: Icead7576572d7614de8468f1cceaf522dd45dc8d Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
-rw-r--r--recipes/packagegroup/packagegroup-b2qt-embedded-base.bb1
-rw-r--r--recipes/rng-tools/rng-tools/rngd.service9
-rw-r--r--recipes/rng-tools/rng-tools_5.bbappend45
3 files changed, 55 insertions, 0 deletions
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index 65f7f5e..b6573e2 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -52,6 +52,7 @@ RDEPENDS_${PN} = "\
52 tzdata-asia \ 52 tzdata-asia \
53 tzdata-europe \ 53 tzdata-europe \
54 connman \ 54 connman \
55 rng-tools \
55 ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "weston weston-examples", "", d)} \ 56 ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "weston weston-examples", "", d)} \
56 ${MACHINE_EXTRA_INSTALL} \ 57 ${MACHINE_EXTRA_INSTALL} \
57 " 58 "
diff --git a/recipes/rng-tools/rng-tools/rngd.service b/recipes/rng-tools/rng-tools/rngd.service
new file mode 100644
index 0000000..22c7361
--- /dev/null
+++ b/recipes/rng-tools/rng-tools/rngd.service
@@ -0,0 +1,9 @@
1[Unit]
2Description=Hardware RNG Entropy Gatherer Daemon
3
4[Service]
5ExecStart=@SBINDIR@/rngd -f
6SuccessExitStatus=66
7
8[Install]
9WantedBy=multi-user.target
diff --git a/recipes/rng-tools/rng-tools_5.bbappend b/recipes/rng-tools/rng-tools_5.bbappend
new file mode 100644
index 0000000..dedddf0
--- /dev/null
+++ b/recipes/rng-tools/rng-tools_5.bbappend
@@ -0,0 +1,45 @@
1############################################################################
2##
3## Copyright (C) 2017 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
31SRC_URI += "\
32 file://rngd.service \
33 "
34
35inherit systemd
36
37do_install_append() {
38 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
39 install -d ${D}${systemd_unitdir}/system
40 install -m 644 ${WORKDIR}/rngd.service ${D}${systemd_unitdir}/system
41 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/rngd.service
42 fi
43}
44
45SYSTEMD_SERVICE_${PN} = "rngd.service"