meta-openembedded: subtree update:290ad988fb..b315c1a024

Alex Kiernan (1):
      ostree: Add recipe

Bartosz Golaszewski (3):
      python3-ruamel-yaml: new package
      sshfs-fuse: upgrade 2.10 -> 3.5.2
      python3-dtschema: new package

Hongzhi.Song (1):
      numactl: fix a error about lib32-numactl

Jens Rehsack (1):
      libstatgrab: add recipe for libstatgrab-0.92

Leon Anavi (1):
      mosquitto: update to 1.6.6

Naveen Saini (1):
      rrdtool: suppress appending of installation to perllocal.pod

Oleksandr Kravchuk (1):
      jasper: update to 2.0.16

Peiran Hong (1):
      nmap: Update to 7.80

Randy MacLeod (1):
      rsyslog: update from 8.1907.0 to 8.1908.0

Vincent Prince (1):
      mongodb: bump to version 4.2.0+git18ce5c9

Yi Zhao (1):
      phpmyadmin: upgrade 4.9.0.1 -> 4.9.1

Zang Ruochen (5):
      python-alembic: upgrade 1.1.0 -> 1.2.0
      python-msgpack: upgrade 0.6.1 -> 0.6.2
      python-pysocks: upgrade 1.7.0 -> 1.7.1
      python-pytest: upgrade 5.1.2 -> 5.1.3
      python-urllib3: upgrade 1.25.3 -> 1.25.5

Change-Id: I247e7d6f6ce9fcba0f345e9f9e72cf9a52f98340
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

2 files changed, 101 insertions, 0 deletions

diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch
new file mode 100644
index 000000000..506101711
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch
@@ -0,0 +1,100 @@
+From 68485f8516884377e54c623b0deff73f97321d96 Mon Sep 17 00:00:00 2001
+From: "Hongzhi.Song" <hongzhi.song@windriver.com>
+Date: Thu, 19 Sep 2019 04:32:31 -0400
+Subject: [PATCH] numademo: fix error on 32bit system
+
+Error Info on 32bit:
+root@intel-x86:~# numademo -t -e 1M
+Configured Nodes does not match available memory nodes
+
+That's because sizeof(long)=4Word, but sizeof(long long)=8Word
+on 32bit. So (long long) assigning to (long) maybe cause overflow.
+
+long numa_node_size(int node, long *freep)
+{
+    ...
+    long sz = numa_node_size64_int(node, &f2);
+    ~^^~
+    return sz;
+    ...
+}
+long long numa_node_size64(int node, long long *freep)
+~^^   ^^~
+{
+    ...
+}
+
+Unify the return type of above functions.
+
+Upstream-Status: Accepted [next version is after 2.0.13 or 2.0.14]
+[https://github.com/numactl/numactl/commit/a7c4bc790a191d3e42b63850b409c1a72b75a4e1]
+                 Submitted [https://github.com/numactl/numactl/pull/79]
+[The first patch was merged but has a error, then the second fix it.]
+
+Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
+---
+ libnuma.c         | 4 ++--
+ numa.h            | 2 +-
+ numademo.c        | 2 +-
+ test/move_pages.c | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libnuma.c b/libnuma.c
+index cac8851..8b5c6aa 100644
+--- a/libnuma.c
++++ b/libnuma.c
+@@ -791,10 +791,10 @@ long long numa_node_size64(int node, long long *freep)
+ 
+ make_internal_alias(numa_node_size64);
+ 
+-long numa_node_size(int node, long *freep)
++long long numa_node_size(int node, long long *freep)
+ {
+ 	long long f2;
+-	long sz = numa_node_size64_int(node, &f2);
++	long long sz = numa_node_size64_int(node, &f2);
+ 	if (freep)
+ 		*freep = f2;
+ 	return sz;
+diff --git a/numa.h b/numa.h
+index 3a8c543..268fb1d 100644
+--- a/numa.h
++++ b/numa.h
+@@ -143,7 +143,7 @@ int numa_preferred(void);
+ 
+ /* Return node size and free memory */
+ long long numa_node_size64(int node, long long *freep);
+-long numa_node_size(int node, long *freep);
++long long numa_node_size(int node, long long *freep);
+ 
+ int numa_pagesize(void);
+ 
+diff --git a/numademo.c b/numademo.c
+index a720db0..8c56da8 100644
+--- a/numademo.c
++++ b/numademo.c
+@@ -301,7 +301,7 @@ int max_node, numnodes;
+ int get_node_list(void)
+ {
+         int a, got_nodes = 0;
+-        long free_node_sizes;
++        long long free_node_sizes;
+ 
+         numnodes = numa_num_configured_nodes();
+         node_to_use = (int *)malloc(numnodes * sizeof(int));
+diff --git a/test/move_pages.c b/test/move_pages.c
+index d1d8436..f8ff25d 100644
+--- a/test/move_pages.c
++++ b/test/move_pages.c
+@@ -26,7 +26,7 @@ int *node_to_use;
+ int get_node_list()
+ {
+         int a, got_nodes = 0, max_node, numnodes;
+-        long free_node_sizes;
++        long long free_node_sizes;
+ 
+         numnodes = numa_num_configured_nodes();
+         node_to_use = (int *)malloc(numnodes * sizeof(int));
+-- 
+2.23.0
+
diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb b/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb
index f13b1795f..20b7fed86 100644
--- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb
+++ b/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb
@@ -18,6 +18,7 @@ SRC_URI = "git://github.com/numactl/numactl \
     file://Makefile \
     file://run-ptest \
     file://0001-define-run-test-target.patch \
+    file://0001-numademo-fix-error-on-32bit-system.patch \
 "
 
 S = "${WORKDIR}/git"