From eb91a133cad9ef66a47173c9d52c4a6ecdad9034 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Wed, 25 Sep 2019 09:25:33 -0400 Subject: haveged: upgrade v1.9.4 -> v1.9.6 Both of the patches used in v1.9.4 have been incorporated in v1.9.6, so they are no longer required - see upstream commits ceab89ad and f2193587. Signed-off-by: Trevor Gamblin Signed-off-by: Khem Raj --- .../haveged/fix-cpu-cache-size-detection.patch | 20 ---------- ...init.d-Makefile.am-add-missing-dependency.patch | 32 ---------------- meta-oe/recipes-extended/haveged/haveged_1.9.4.bb | 43 ---------------------- meta-oe/recipes-extended/haveged/haveged_1.9.6.bb | 41 +++++++++++++++++++++ 4 files changed, 41 insertions(+), 95 deletions(-) delete mode 100644 meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch delete mode 100644 meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch delete mode 100644 meta-oe/recipes-extended/haveged/haveged_1.9.4.bb create mode 100644 meta-oe/recipes-extended/haveged/haveged_1.9.6.bb (limited to 'meta-oe') 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 5b68f19661..0000000000 --- a/meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch +++ /dev/null @@ -1,20 +0,0 @@ -Some ARM cpus does not report the cache size or say it is -1 - -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=866306 - -Upstream-status: Pending - -Index: haveged-1.9.2/src/havegetune.c -=================================================================== ---- haveged-1.9.2.orig/src/havegetune.c -+++ haveged-1.9.2/src/havegetune.c -@@ -795,6 +795,9 @@ static int vfs_configInfoCache( - ctype = vfs_configFile(pAnchor, path, vfs_configType); - strcpy(path+plen, "size"); - size = vfs_configFile(pAnchor, path, vfs_configInt); -+ if (size == -1) { -+ size = ctype == 'I' ? GENERIC_ICACHE : GENERIC_DCACHE; -+ } - cfg_cacheAdd(pAnchor, SRC_VFS_INDEX, pArgs[1], level, ctype, size); - } - } 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 020ac2c3b8..0000000000 --- a/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b04eeea777df32364df74bd63fc5b7fb05d21c8d Mon Sep 17 00:00:00 2001 -From: Jackie Huang -Date: Tue, 27 Mar 2018 10:21:09 +0800 -Subject: [PATCH] init.d/Makefile.am: add missing dependency - -install-data-hook should depend on install-exec-hook, or the -haveged.service might be installed incorrectly when build -with -j option. - -Upstream-Status: Submitted [https://github.com/jirka-h/haveged/pull/13] - -Signed-off-by: Jackie Huang -Signed-off-by: Khem Raj raj.khem@gmail.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_1.9.4.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.4.bb deleted file mode 100644 index d0e1a29ddf..0000000000 --- a/meta-oe/recipes-extended/haveged/haveged_1.9.4.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "haveged - A simple entropy daemon" -DESCRIPTION = "The haveged project is an attempt to provide an easy-to-use, unpredictable random number generator based upon an adaptation of the HAVEGE algorithm. Haveged was created to remedy low-entropy conditions in the Linux random device that can occur under some workloads, especially on headless servers." -AUTHOR = "Gary Wuertz" -HOMEPAGE = "http://www.issihosts.com/haveged/index.html" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -# v1.9.4 -SRCREV = "faa40ff345af194d3253f5fb030403e3c9831c36" -SRC_URI = "git://github.com/jirka-h/haveged.git \ - file://haveged-init.d-Makefile.am-add-missing-dependency.patch \ - file://fix-cpu-cache-size-detection.patch \ -" -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_URI = "https://github.com/jirka-h/haveged/releases" - -inherit autotools update-rc.d systemd - -EXTRA_OECONF = "\ - --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" - -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 - fi -} - -MIPS_INSTRUCTION_SET = "mips" diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb new file mode 100644 index 0000000000..0189e19c09 --- /dev/null +++ b/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb @@ -0,0 +1,41 @@ +SUMMARY = "haveged - A simple entropy daemon" +DESCRIPTION = "The haveged project is an attempt to provide an easy-to-use, unpredictable random number generator based upon an adaptation of the HAVEGE algorithm. Haveged was created to remedy low-entropy conditions in the Linux random device that can occur under some workloads, especially on headless servers." +AUTHOR = "Gary Wuertz" +HOMEPAGE = "http://www.issihosts.com/haveged/index.html" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +# v1.9.6 +SRCREV = "1470a82a7f79110c79beea1ca5f2d3b0fd1a4668" +SRC_URI = "git://github.com/jirka-h/haveged.git \ +" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/jirka-h/haveged/releases" + +inherit autotools update-rc.d systemd + +EXTRA_OECONF = "\ + --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" + +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 + fi +} + +MIPS_INSTRUCTION_SET = "mips" -- cgit 1.2.3-korg