diff options
author | Nicola Lunghi <nick83ola@gmail.com> | 2019-06-12 14:00:05 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-14 22:48:22 +0100 |
commit | 6f7eaf80f71aa17124c7f0be8f52902a5194ca7b (patch) | |
tree | fe0fd00d8a777add3f778b153be43cd6242f3ecc /meta/recipes-support/rng-tools/rng-tools_6.6.bb | |
parent | e00d88475d0ed7b161f5f58dd13bc9a72e3efdf9 (diff) | |
download | poky-6f7eaf80f71aa17124c7f0be8f52902a5194ca7b.tar.gz |
rng-tools: harmonise systemd and sysvinit
this commit will permit to read the option from
/etc/default/rng-tools both from systemd and sysvinit unit file.
(From OE-Core rev: 16ced1a253c74c01ca414db2f1a010c083213b91)
Signed-off-by: Nicola Lunghi <nick83ola@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/rng-tools/rng-tools_6.6.bb')
-rw-r--r-- | meta/recipes-support/rng-tools/rng-tools_6.6.bb | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/meta/recipes-support/rng-tools/rng-tools_6.6.bb b/meta/recipes-support/rng-tools/rng-tools_6.6.bb index 41959a2695..b0afa4b0eb 100644 --- a/meta/recipes-support/rng-tools/rng-tools_6.6.bb +++ b/meta/recipes-support/rng-tools/rng-tools_6.6.bb | |||
@@ -44,18 +44,13 @@ do_configure_prepend() { | |||
44 | } | 44 | } |
45 | 45 | ||
46 | do_install_append() { | 46 | do_install_append() { |
47 | install -d "${D}${sysconfdir}/init.d" | 47 | install -Dm 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools |
48 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools | 48 | install -Dm 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools |
49 | sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ | 49 | install -Dm 0644 ${WORKDIR}/rngd.service \ |
50 | ${D}${sysconfdir}/init.d/rng-tools | 50 | ${D}${systemd_system_unitdir}/rngd.service |
51 | 51 | sed -i \ | |
52 | # Only install the default script when 'sysvinit' is in DISTRO_FEATURES. | 52 | -e 's,@SYSCONFDIR@,${sysconfdir},' \ |
53 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 53 | -e 's,@SBINDIR@,${sbindir},' \ |
54 | install -d "${D}${sysconfdir}/default" | 54 | ${D}${sysconfdir}/init.d/rng-tools \ |
55 | install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools | 55 | ${D}${systemd_system_unitdir}/rngd.service |
56 | fi | ||
57 | |||
58 | install -d ${D}${systemd_unitdir}/system | ||
59 | install -m 644 ${WORKDIR}/rngd.service ${D}${systemd_unitdir}/system | ||
60 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/rngd.service | ||
61 | } | 56 | } |