diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-27 15:23:48 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-27 15:23:52 +0300 |
commit | 779d0acafa041a9df8ff46c614778538ab68acbd (patch) | |
tree | 39df5c7c2c0040c667131b35e01fa2e674cb78e7 /meta-openembedded/meta-oe/recipes-extended/sanlock | |
parent | 9856fce4c853303bacbe5464a24759daeeb34684 (diff) | |
download | openbmc-779d0acafa041a9df8ff46c614778538ab68acbd.tar.xz |
meta-openembedded: subtree update:466fd78ac6..41fe46157c
Callaghan, Dan (2):
firewalld: add UPSTREAM_CHECK_URI
add new recipes for python-lrparsing, python3-lrparsing
Khem Raj (2):
mongodb: Remove non building arches from COMPATIBLE_HOST
uim: Fix cross-builds
Martin Jansa (1):
libmicrohttpd: backport the fix for building with older gnutls
Oleksandr Kravchuk (4):
libyui: update to 3.6.0
libyui-ncurses: udpate to 2.52.0
sanlock: update to 3.6.0
tesseract-lang: update to 4.0.0
Randy MacLeod (1):
crash: update from 7.2.6 to 7.2.7
Robert Yang (8):
python-asn1crypto: extend to nativesdk
python-incremental: Drop broken nativesdk
fuse: Fix installed-vs-shipped for nativesdk
keyutils: Fix installed-vs-shipped for nativesdk
libnet-ssleay-perl: Drop broken native
libnet-dns-sec-perl: Drop broken native
iperf3: Drop broken native
spice: Drop broken native
Trevor Gamblin (1):
haveged: upgrade v1.9.4 -> v1.9.6
Zang Ruochen (5):
xterm: upgrade 348 -> 349
python-cmd2: upgrade 0.9.16 -> 0.9.17
python-protobuf: upgrade 3.9.1 -> 3.9.2
python-alembic: upgrade 1.2.0 -> 1.2.1
python-paste: upgrade 3.2.0 -> 3.2.1
Change-Id: I4491ea47f5e54f4f3843a77c720d0a89304c36a5
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/sanlock')
-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 |
2 files changed, 2 insertions, 84 deletions
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" |