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>
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch
index c17ebf1..d98fa56 100644
--- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch
+++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch
@@ -1,18 +1,18 @@
-From 3eed8388b49d5d3cbc2db74fee1b017eb4b40d0a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 2 Sep 2017 10:06:24 -0700
-Subject: [PATCH] Use __GLIBC__ to control use of gnu_get_libc_version
+From d701ceeb15662038435b80ba556a80c17f76d2dc Mon Sep 17 00:00:00 2001
+From: Vincent Prince <vincent.prince.fr@gmail.com>
+Date: Mon, 16 Sep 2019 13:30:13 +0200
+Subject: [PATCH 03/10] Use __GLIBC__ to control use of gnu_get_libc_version
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
---
-Upstream-Status: Pending
- src/mongo/util/processinfo_linux.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ src/mongo/util/processinfo_linux.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
-Index: git/src/mongo/util/processinfo_linux.cpp
-===================================================================
---- git.orig/src/mongo/util/processinfo_linux.cpp
-+++ git/src/mongo/util/processinfo_linux.cpp
+diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp
+index cccb91c..45c4b7d 100644
+--- a/src/mongo/util/processinfo_linux.cpp
++++ b/src/mongo/util/processinfo_linux.cpp
@@ -44,10 +44,10 @@
#include <unistd.h>
#ifdef __BIONIC__
@@ -27,8 +27,8 @@
#endif
#include <boost/filesystem.hpp>
-@@ -503,7 +503,7 @@ void ProcessInfo::SystemInfo::collectSys
- stringstream ss;
+@@ -546,7 +546,7 @@ void ProcessInfo::SystemInfo::collectSystemInfo() {
+ std::stringstream ss;
ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__;
bExtra.append("libcVersion", ss.str());
-#else
@@ -36,3 +36,6 @@
bExtra.append("libcVersion", gnu_get_libc_version());
#endif
if (!verSig.empty())
+--
+2.7.4
+