diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch | 20 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch | 32 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb (renamed from meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.4.bb) | 6 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-fix-compile-failure-with-libc-musl.patch | 80 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb (renamed from meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.6.0.bb) | 6 |
5 files changed, 4 insertions, 140 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch deleted file mode 100644 index 5b68f1966..000000000 --- a/meta-openembedded/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-openembedded/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch deleted file mode 100644 index 020ac2c3b..000000000 --- a/meta-openembedded/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 <jackie.huang@windriver.com> -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 <jackie.huang@windriver.com> -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-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.4.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb index d0e1a29dd..0189e19c0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb @@ -5,11 +5,9 @@ HOMEPAGE = "http://www.issihosts.com/haveged/index.html" LICENSE = "GPLv3" LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -# v1.9.4 -SRCREV = "faa40ff345af194d3253f5fb030403e3c9831c36" +# v1.9.6 +SRCREV = "1470a82a7f79110c79beea1ca5f2d3b0fd1a4668" 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" diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-fix-compile-failure-with-libc-musl.patch b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-fix-compile-failure-with-libc-musl.patch deleted file mode 100644 index e4bde80a0..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-fix-compile-failure-with-libc-musl.patch +++ /dev/null @@ -1,80 +0,0 @@ -From c51c2c543f3c78b2a68acc61f786f903f2e0fec8 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Sun, 9 Sep 2018 07:28:09 -0400 -Subject: [PATCH] fix compile failure with libc musl - -The lack of random_r in musl: -[snip] -|main.c:1393:7: warning: implicit declaration of function 'random_r'; -did you mean 'random'? [-Wimplicit-function-declaration] -| rv = random_r(&rand_data, &val); -| ^~~~~~~~ -| random -|main.c:1408:30: error: invalid application of 'sizeof' to incomplete -type 'struct random_data' -| memset(&rand_data, 0, sizeof(rand_data)); -[snip] - -s/random_r/random/, s/initstate_r/initstate/ and remove `static struct -random_data rand_data' - -Here is the man of `random_r()': -[snip] -The random_r() function is like random(3), except that instead of using -state information maintained in a global variable -[snip] - -So use random without state information is OK. - -Upstream-Status: Submitted [sanlock-devel@lists.fedorahosted.org] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - src/main.c | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/src/main.c b/src/main.c -index f60b4d3..602c400 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -84,7 +84,6 @@ static char command[COMMAND_MAX]; - static int cmd_argc; - static char **cmd_argv; - static struct thread_pool pool; --static struct random_data rand_data; - static char rand_state[32]; - static pthread_mutex_t rand_mutex = PTHREAD_MUTEX_INITIALIZER; - static const char *run_dir = NULL; -@@ -1386,16 +1385,15 @@ int get_rand(int a, int b); - - int get_rand(int a, int b) - { -- int32_t val; -- int rv; -+ long int rv; - - pthread_mutex_lock(&rand_mutex); -- rv = random_r(&rand_data, &val); -+ rv = random(); - pthread_mutex_unlock(&rand_mutex); - if (rv < 0) - return rv; - -- return a + (int) (((float)(b - a + 1)) * val / (RAND_MAX+1.0)); -+ return a + (int) (((float)(b - a + 1)) * rv / (RAND_MAX+1.0)); - } - - static void setup_host_name(void) -@@ -1405,9 +1403,7 @@ static void setup_host_name(void) - uuid_t uu; - - memset(rand_state, 0, sizeof(rand_state)); -- memset(&rand_data, 0, sizeof(rand_data)); -- -- initstate_r(time(NULL), rand_state, sizeof(rand_state), &rand_data); -+ initstate(time(NULL), rand_state, sizeof(rand_state)); - - /* use host name from command line */ - --- -2.8.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.6.0.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb index c51bccce3..9f7ce9c57 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb @@ -11,10 +11,8 @@ SECTION = "utils" LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" -SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ - file://0001-fix-compile-failure-with-libc-musl.patch \ - " -SRCREV = "90b2ffa77edd46bea007b7bb39bfd4d2db2ff7af" +SRC_URI = "git://pagure.io/sanlock.git;protocol=http" +SRCREV = "7afe0e66f5c7f24894896fad20ffa6f39733d80f" S = "${WORKDIR}/git" DEPENDS = "libaio util-linux" |