diff options
-rw-r--r-- | meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch | 20 | ||||
-rw-r--r-- | meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch | 32 | ||||
-rw-r--r-- | meta-oe/recipes-extended/haveged/haveged_1.9.6.bb (renamed from meta-oe/recipes-extended/haveged/haveged_1.9.4.bb) | 6 |
3 files changed, 2 insertions, 56 deletions
diff --git a/meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch b/meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch deleted file mode 100644 index 5b68f1966..000000000 --- a/meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | Some ARM cpus does not report the cache size or say it is -1 | ||
2 | |||
3 | https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=866306 | ||
4 | |||
5 | Upstream-status: Pending | ||
6 | |||
7 | Index: haveged-1.9.2/src/havegetune.c | ||
8 | =================================================================== | ||
9 | --- haveged-1.9.2.orig/src/havegetune.c | ||
10 | +++ haveged-1.9.2/src/havegetune.c | ||
11 | @@ -795,6 +795,9 @@ static int vfs_configInfoCache( | ||
12 | ctype = vfs_configFile(pAnchor, path, vfs_configType); | ||
13 | strcpy(path+plen, "size"); | ||
14 | size = vfs_configFile(pAnchor, path, vfs_configInt); | ||
15 | + if (size == -1) { | ||
16 | + size = ctype == 'I' ? GENERIC_ICACHE : GENERIC_DCACHE; | ||
17 | + } | ||
18 | cfg_cacheAdd(pAnchor, SRC_VFS_INDEX, pArgs[1], level, ctype, size); | ||
19 | } | ||
20 | } | ||
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 deleted file mode 100644 index 020ac2c3b..000000000 --- a/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From b04eeea777df32364df74bd63fc5b7fb05d21c8d Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Tue, 27 Mar 2018 10:21:09 +0800 | ||
4 | Subject: [PATCH] init.d/Makefile.am: add missing dependency | ||
5 | |||
6 | install-data-hook should depend on install-exec-hook, or the | ||
7 | haveged.service might be installed incorrectly when build | ||
8 | with -j option. | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/jirka-h/haveged/pull/13] | ||
11 | |||
12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
13 | Signed-off-by: Khem Raj raj.khem@gmail.com | ||
14 | --- | ||
15 | init.d/Makefile.am | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/init.d/Makefile.am b/init.d/Makefile.am | ||
19 | index 5940f78..07bcdf7 100644 | ||
20 | --- a/init.d/Makefile.am | ||
21 | +++ b/init.d/Makefile.am | ||
22 | @@ -33,7 +33,7 @@ if ENABLE_SYSTEMD | ||
23 | install-exec-hook: | ||
24 | $(do_subst) < $(srcdir)/$(src_tmpl) > haveged.service; | ||
25 | |||
26 | -install-data-hook: | ||
27 | +install-data-hook: install-exec-hook | ||
28 | if ENABLE_SYSTEMD_LOOKUP | ||
29 | install -p -D -m644 haveged.service $(DESTDIR)`pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; | ||
30 | else | ||
31 | -- | ||
32 | 2.11.0 | ||
diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.4.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb index d0e1a29dd..0189e19c0 100644 --- a/meta-oe/recipes-extended/haveged/haveged_1.9.4.bb +++ b/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb | |||
@@ -5,11 +5,9 @@ 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 | # v1.9.4 | 8 | # v1.9.6 |
9 | SRCREV = "faa40ff345af194d3253f5fb030403e3c9831c36" | 9 | SRCREV = "1470a82a7f79110c79beea1ca5f2d3b0fd1a4668" |
10 | SRC_URI = "git://github.com/jirka-h/haveged.git \ | 10 | SRC_URI = "git://github.com/jirka-h/haveged.git \ |
11 | file://haveged-init.d-Makefile.am-add-missing-dependency.patch \ | ||
12 | file://fix-cpu-cache-size-detection.patch \ | ||
13 | " | 11 | " |
14 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
15 | 13 | ||