public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: "Markus Fuchs" <mklntf@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Markus Fuchs <mklntf@gmail.com>
Subject: [meta-oe][PATCH] haveged: remove appending of the service file
Date: Thu, 19 Nov 2020 20:54:27 +0100	[thread overview]
Message-ID: <20201119195427.11968-1-mklntf@gmail.com> (raw)

Commit c1dd93296ff69c0c29dfaa22f586b8738e71ee52 ("haveged: use the
Fedora service file available from upstream") changed the systemd
service file from service.redhat to service.fedora.
The line "SuccessExitStatus=137 143" is available in service.fedora, so
it is not necessary to append SuccessExitStatus=137 to the service file.

Signed-off-by: Markus Fuchs <mklntf@gmail.com>
---
 meta-oe/recipes-extended/haveged/haveged_1.9.13.bb | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb
index 50326ea2f..6d4979f4a 100644
--- a/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb
+++ b/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb
@@ -32,15 +32,11 @@ SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE_${PN} = "haveged.service"
 
 do_install_append() {
-    # The exit status is 143 when the service is stopped
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-        sed -i '/ExecStart/a SuccessExitStatus=143' ${D}${systemd_system_unitdir}/haveged.service
-        # Hybrid systemd-sysvinit distros must install the initscript manually
-        if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-            install -d ${D}${INIT_D_DIR}
-            sed -e "s,@SBINDIR@,${sbindir},g" <${S}/init.d/sysv.redhat >${D}${INIT_D_DIR}/haveged
-            chmod 755 ${D}${INIT_D_DIR}/haveged
-        fi
+    # Hybrid systemd-sysvinit distros must install the initscript manually
+    if ${@bb.utils.contains('DISTRO_FEATURES', ['systemd', 'sysvinit'], 'true', 'false', d)}; then
+        install -d ${D}${INIT_D_DIR}
+        sed -e "s,@SBINDIR@,${sbindir},g" <${S}/init.d/sysv.redhat >${D}${INIT_D_DIR}/haveged
+        chmod 755 ${D}${INIT_D_DIR}/haveged
     fi
 }
 
-- 
2.29.2


                 reply	other threads:[~2020-11-19 19:54 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201119195427.11968-1-mklntf@gmail.com \
    --to=mklntf@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox