[oe-commits] [meta-openembedded] 46/69: haveged: update to 1.9.2
git at git.openembedded.org
git at git.openembedded.org
Mon Apr 9 00:02:03 UTC 2018
This is an automated email from the git hooks/post-receive script.
armin_kuster pushed a commit to branch master
in repository meta-openembedded.
commit 49390ebce5716963219a48ad97673fa50758348e
Author: Jackie Huang <jackie.huang at windriver.com>
AuthorDate: Tue Mar 27 11:22:20 2018 +0800
haveged: update to 1.9.2
* Drop the patch remove-systemd-unit-503.patch and init script
haveged.sysvinit, and use PACKAGECONFIG to set the correct
sevice file or init script for systemd or sysvinit.
* Add SuccessExitStatus to fix the failure when the service
is stopped.
* Fix an issue when build in parallel.
Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
...init.d-Makefile.am-add-missing-dependency.patch | 32 ++++++++++++++++++++
.../haveged/haveged/haveged.sysvinit | 35 ----------------------
.../haveged/haveged/remove-systemd-unit-503.patch | 20 -------------
.../haveged/{haveged_1.9.1.bb => haveged_1.9.2.bb} | 19 ++++++------
4 files changed, 42 insertions(+), 64 deletions(-)
diff --git a/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch b/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch
new file mode 100644
index 0000000..36fd57c
--- /dev/null
+++ b/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch
@@ -0,0 +1,32 @@
+From b04eeea777df32364df74bd63fc5b7fb05d21c8d Mon Sep 17 00:00:00 2001
+From: Jackie Huang <jackie.huang at windriver.com>
+Date: Tue, 27 Mar 2018 10:21:09 +0800
+Subject: [PATCH] init.d/Makefile.am: add missing dependency
+
+install-data-hook should epend on install-exec-hook, or the
+haveged.service might be installed incorrectly when build
+with -j option.
+
+Upstream-Status: Inappropriate [no upstream mailing list]
+
+Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
+---
+ init.d/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/init.d/Makefile.am b/init.d/Makefile.am
+index 5940f78..07bcdf7 100644
+--- a/init.d/Makefile.am
++++ b/init.d/Makefile.am
+@@ -33,7 +33,7 @@ if ENABLE_SYSTEMD
+ install-exec-hook:
+ $(do_subst) < $(srcdir)/$(src_tmpl) > haveged.service;
+
+-install-data-hook:
++install-data-hook: install-exec-hook
+ if ENABLE_SYSTEMD_LOOKUP
+ install -p -D -m644 haveged.service $(DESTDIR)`pkg-config --variable=systemdsystemunitdir systemd`/haveged.service;
+ else
+--
+2.11.0
+
diff --git a/meta-oe/recipes-extended/haveged/haveged/haveged.sysvinit b/meta-oe/recipes-extended/haveged/haveged/haveged.sysvinit
deleted file mode 100755
index 98b8857..0000000
--- a/meta-oe/recipes-extended/haveged/haveged/haveged.sysvinit
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-pidfile=/var/run/haveged.pid
-
-# source function library
-. /etc/init.d/functions
-
-case "$1" in
- start)
- echo -n "Starting havege entropy daemon... "
- start-stop-daemon --start --quiet --pidfile $pidfile --name haveged --startas haveged -- -w 1024 -v 0 && success || failure
- echo
- ;;
- stop)
- echo -n "Stopping havege entropy daemon... "
- start-stop-daemon --stop --quiet --pidfile $pidfile --name haveged
- success
- echo
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- status)
- status haveged
- ;;
- *)
- echo "Usage: /etc/init.d/haveged {start|stop|restart|status}"
- exit 1
-esac
-
-exit 0
diff --git a/meta-oe/recipes-extended/haveged/haveged/remove-systemd-unit-503.patch b/meta-oe/recipes-extended/haveged/haveged/remove-systemd-unit-503.patch
deleted file mode 100644
index df27bcb..0000000
--- a/meta-oe/recipes-extended/haveged/haveged/remove-systemd-unit-503.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/init.d/Makefile.am 2014-01-02 18:55:53.000000000 +0100
-+++ b/init.d/Makefile.am 2014-08-11 10:59:40.000000000 +0200
-@@ -34,11 +34,11 @@
- $(do_subst) < $(srcdir)/$(src_tmpl) > haveged.service;
-
- install-data-hook:
--if ENABLE_SYSTEMD_LOOKUP
-- install -p -m644 haveged.service `pkg-config --variable=systemdsystemunitdir systemd`/haveged.service;
--else
-- install -p -m644 haveged.service ($unit_dir)/haveged.service;
--endif
-- systemctl enable haveged.service;
-+#if ENABLE_SYSTEMD_LOOKUP
-+# install -p -m644 haveged.service `pkg-config --variable=systemdsystemunitdir systemd`/haveged.service;
-+#else
-+# install -p -m644 haveged.service ($unit_dir)/haveged.service;
-+#endif
-+# systemctl enable haveged.service;
-
- endif
diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.1.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb
similarity index 58%
rename from meta-oe/recipes-extended/haveged/haveged_1.9.1.bb
rename to meta-oe/recipes-extended/haveged/haveged_1.9.2.bb
index 419c85f..05ee842 100644
--- a/meta-oe/recipes-extended/haveged/haveged_1.9.1.bb
+++ b/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb
@@ -6,22 +6,23 @@ LICENSE = "GPLv3"
LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "http://www.issihosts.com/haveged/haveged-${PV}.tar.gz \
- file://remove-systemd-unit-503.patch \
- file://haveged.sysvinit \
+ file://haveged-init.d-Makefile.am-add-missing-dependency.patch \
"
-SRC_URI[md5sum] = "015ff58cd10607db0e0de60aeca2f5f8"
-SRC_URI[sha256sum] = "9c2363ed9542a6784ff08e247182137e71f2ddb79e8e6c1ac4ad50d21ced3715"
+SRC_URI[md5sum] = "fb1d8b3dcbb9d06b30eccd8aa500fd31"
+SRC_URI[sha256sum] = "f77d9adbdf421b61601fa29faa9ce3b479d910f73c66b9e364ba8642ccbfbe70"
inherit autotools update-rc.d systemd
EXTRA_OECONF = "\
- --enable-init=service.redhat \
--enable-nistest=yes \
--enable-olt=yes \
--enable-threads=no \
"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "--enable-init=service.redhat --enable-initdir=${systemd_system_unitdir}, --enable-init=sysv.redhat, systemd"
+
INITSCRIPT_PACKAGES = "${PN}"
INITSCRIPT_NAME = "haveged"
INITSCRIPT_PARAMS_${PN} = "defaults 9"
@@ -30,10 +31,10 @@ SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "haveged.service"
do_install_append() {
- install -D -m 755 ${WORKDIR}/haveged.sysvinit ${D}${sysconfdir}/init.d/haveged
-
- mkdir -p ${D}${systemd_unitdir}/system
- install -p -m644 ${B}/init.d/haveged.service ${D}${systemd_unitdir}/system
+ # 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
+ fi
}
MIPS_INSTRUCTION_SET = "mips"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list