diff options
-rw-r--r-- | meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch | 10 | ||||
-rw-r--r-- | meta-oe/recipes-extended/haveged/haveged_1.9.4.bb (renamed from meta-oe/recipes-extended/haveged/haveged_1.9.2.bb) | 10 |
2 files changed, 10 insertions, 10 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 index 36fd57c9bc..020ac2c3b8 100644 --- 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 | |||
@@ -3,13 +3,14 @@ From: Jackie Huang <jackie.huang@windriver.com> | |||
3 | Date: Tue, 27 Mar 2018 10:21:09 +0800 | 3 | Date: Tue, 27 Mar 2018 10:21:09 +0800 |
4 | Subject: [PATCH] init.d/Makefile.am: add missing dependency | 4 | Subject: [PATCH] init.d/Makefile.am: add missing dependency |
5 | 5 | ||
6 | install-data-hook should epend on install-exec-hook, or the | 6 | install-data-hook should depend on install-exec-hook, or the |
7 | haveged.service might be installed incorrectly when build | 7 | haveged.service might be installed incorrectly when build |
8 | with -j option. | 8 | with -j option. |
9 | 9 | ||
10 | Upstream-Status: Inappropriate [no upstream mailing list] | 10 | Upstream-Status: Submitted [https://github.com/jirka-h/haveged/pull/13] |
11 | 11 | ||
12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
13 | Signed-off-by: Khem Raj raj.khem@gmail.com | ||
13 | --- | 14 | --- |
14 | init.d/Makefile.am | 2 +- | 15 | init.d/Makefile.am | 2 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
@@ -21,12 +22,11 @@ index 5940f78..07bcdf7 100644 | |||
21 | @@ -33,7 +33,7 @@ if ENABLE_SYSTEMD | 22 | @@ -33,7 +33,7 @@ if ENABLE_SYSTEMD |
22 | install-exec-hook: | 23 | install-exec-hook: |
23 | $(do_subst) < $(srcdir)/$(src_tmpl) > haveged.service; | 24 | $(do_subst) < $(srcdir)/$(src_tmpl) > haveged.service; |
24 | 25 | ||
25 | -install-data-hook: | 26 | -install-data-hook: |
26 | +install-data-hook: install-exec-hook | 27 | +install-data-hook: install-exec-hook |
27 | if ENABLE_SYSTEMD_LOOKUP | 28 | if ENABLE_SYSTEMD_LOOKUP |
28 | install -p -D -m644 haveged.service $(DESTDIR)`pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; | 29 | install -p -D -m644 haveged.service $(DESTDIR)`pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; |
29 | else | 30 | else |
30 | -- | 31 | -- |
31 | 2.11.0 | 32 | 2.11.0 |
32 | |||
diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.4.bb index bf1367391b..32aab59f16 100644 --- a/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb +++ b/meta-oe/recipes-extended/haveged/haveged_1.9.4.bb | |||
@@ -5,14 +5,14 @@ HOMEPAGE = "http://www.issihosts.com/haveged/index.html" | |||
5 | LICENSE = "GPLv3" | 5 | LICENSE = "GPLv3" |
6 | LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 6 | LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
7 | 7 | ||
8 | SRC_URI = "http://www.issihosts.com/haveged/haveged-${PV}.tar.gz \ | 8 | # v1.9.4 |
9 | SRCREV = "faa40ff345af194d3253f5fb030403e3c9831c36" | ||
10 | SRC_URI = "git://github.com/jirka-h/haveged.git \ | ||
9 | file://haveged-init.d-Makefile.am-add-missing-dependency.patch \ | 11 | file://haveged-init.d-Makefile.am-add-missing-dependency.patch \ |
10 | " | 12 | " |
13 | S = "${WORKDIR}/git" | ||
11 | 14 | ||
12 | SRC_URI[md5sum] = "fb1d8b3dcbb9d06b30eccd8aa500fd31" | 15 | UPSTREAM_CHECK_URI = "https://github.com/jirka-h/haveged/releases" |
13 | SRC_URI[sha256sum] = "f77d9adbdf421b61601fa29faa9ce3b479d910f73c66b9e364ba8642ccbfbe70" | ||
14 | |||
15 | UPSTREAM_CHECK_URI = "http://www.issihosts.com/haveged/downloads.html" | ||
16 | 16 | ||
17 | inherit autotools update-rc.d systemd | 17 | inherit autotools update-rc.d systemd |
18 | 18 | ||