meta-openembedded: subtree update:b315c1a024..466fd78ac6
Anuj Mittal (1):
python3-test-generator: add recipe
Khem Raj (1):
mongodb: Fix build on musl/aarch64
Zang Ruochen (2):
fio: upgrade 3.15 -> 3.16
protobuf: upgrade 3.9.1 -> 3.9.2
Change-Id: I05a56fd5ecc017abc350bced6071680a58ccb8dc
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch b/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch
deleted file mode 100644
index cb18032..0000000
--- a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8ca8a05d92fa799fe93a6edc27b058802211fddc Mon Sep 17 00:00:00 2001
-From: Jens Axboe <axboe@kernel.dk>
-Date: Sat, 3 Aug 2019 08:33:24 -0600
-Subject: [PATCH] engines/splice: remove buggy ->mem_align set
-
-Two things wrong here:
-
-1) We align buffers by default, so no need for splice to do anything
- extra.
-2) ->mem_align is not a true/false setting, it's the alignment itself.
- Hence the current setting to 1 is just buggy.
-
-Upstream-Status: Backport [https://github.com/axboe/fio/commit/8ca8a05d92fa799fe93a6edc27b058802211fddc]
-
-Fixes: https://github.com/axboe/fio/issues/810
-Reported-by: Sitsofe Wheeler <sitsofe@yahoo.com>
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Liwei Song <liwei.song@windriver.com>
----
- engines/splice.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/engines/splice.c b/engines/splice.c
-index feb764feb2f4..6fc36bb6f154 100644
---- a/engines/splice.c
-+++ b/engines/splice.c
-@@ -278,13 +278,6 @@ static int fio_spliceio_init(struct thread_data *td)
- */
- sd->vmsplice_to_user_map = 1;
-
-- /*
-- * And if vmsplice_to_user works, we definitely need aligned
-- * buffers. Just set ->odirect to force that.
-- */
-- if (td_read(td))
-- td->o.mem_align = 1;
--
- td->io_ops_data = sd;
- return 0;
- }
---
-2.22.0
-
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.15.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb
similarity index 92%
rename from meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.15.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb
index df81759..092b2be 100644
--- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.15.bb
+++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb
@@ -21,10 +21,9 @@
PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}"
PACKAGECONFIG[numa] = ",--disable-numa,numactl"
-SRCREV = "01bf5128d0581e267383f280c6a1dcd26517240f"
+SRCREV = "92f75708b530989fdb13b50be6604f44b80d038d"
SRC_URI = "git://git.kernel.dk/fio.git \
file://0001-update-the-interpreter-paths.patch \
- file://0001-engines-splice-remove-buggy-mem_align-set.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch
new file mode 100644
index 0000000..5337fcd
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch
@@ -0,0 +1,31 @@
+From ca004968b8d2149f72d4edcfe029489a8c5e10ca Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 23 Sep 2019 12:31:31 -0700
+Subject: [PATCH] Mark one of strerror_r implementation glibc specific
+
+glibc has two incompatible strerror_r definitions, one of them is
+specific to glibc, mark this one so
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/mongo/util/errno_util.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mongo/util/errno_util.cpp b/src/mongo/util/errno_util.cpp
+index 564c0071ea..4f7e1d3a38 100644
+--- a/src/mongo/util/errno_util.cpp
++++ b/src/mongo/util/errno_util.cpp
+@@ -61,7 +61,7 @@ std::string errnoWithDescription(int errNumber) {
+ char buf[kBuflen];
+ char* msg{nullptr};
+
+-#if defined(__GNUC__) && defined(_GNU_SOURCE) && \
++#if defined(__GNUC__) && defined(_GNU_SOURCE) && defined(__GLIBC__) && \
+ (!defined(__ANDROID_API__) || !(__ANDROID_API__ <= 22)) && !defined(EMSCRIPTEN)
+ msg = strerror_r(errNumber, buf, kBuflen);
+ #elif defined(_WIN32)
+--
+2.23.0
+
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch
deleted file mode 100644
index c603589..0000000
--- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: git/src/mongo/util/errno_util.cpp
-===================================================================
---- git.orig/src/mongo/util/errno_util.cpp
-+++ git/src/mongo/util/errno_util.cpp
-@@ -49,6 +49,16 @@ const char kUnknownMsg[] = "Unknown erro
- const int kBuflen = 256; // strerror strings in non-English locales can be large.
- } // namespace
-
-+inline char const * strerror_r_helper( char const * r, char const * )
-+{
-+ return r;
-+}
-+
-+inline char const * strerror_r_helper( int r, char const * buffer )
-+{
-+ return r == 0? buffer: "Unknown error";
-+}
-+
- std::string errnoWithDescription(int errNumber) {
- #if defined(_WIN32)
- if (errNumber == -1)
-@@ -63,7 +73,7 @@ std::string errnoWithDescription(int err
-
- #if defined(__GNUC__) && defined(_GNU_SOURCE) && \
- (!defined(__ANDROID_API__) || !(__ANDROID_API__ <= 22)) && !defined(EMSCRIPTEN)
-- msg = strerror_r(errNumber, buf, kBuflen);
-+ msg = strerror_r_helper(strerror_r(errNumber, buf, kBuflen));
- #elif defined(_WIN32)
-
- LPWSTR errorText = nullptr;
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
index d3c19d6..3e77ac3 100644
--- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
+++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
@@ -25,8 +25,8 @@
file://0003-Fix-unknown-prefix-env.patch \
"
SRC_URI_append_libc-musl ="\
+ file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \
file://0002-Fix-default-stack-size-to-256K.patch \
- file://0003-fix-musl-strerror_r.patch \
file://0004-wiredtiger-Disable-strtouq-on-musl.patch \
"
diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.1.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.2.bb
similarity index 97%
rename from meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.1.bb
rename to meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.2.bb
index 94d8def..a007b2a 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.1.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.2.bb
@@ -10,7 +10,7 @@
DEPENDS = "zlib"
DEPENDS_append_class-target = " protobuf-native"
-SRCREV = "655310ca192a6e3a050e0ca0b7084a2968072260"
+SRCREV = "52b2447247f535663ac1c292e088b4b27d2910ef"
SRC_URI = "git://github.com/google/protobuf.git;branch=3.9.x \
file://run-ptest \
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-test-generator_0.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-test-generator_0.1.2.bb
new file mode 100644
index 0000000..14943a4
--- /dev/null
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-test-generator_0.1.2.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Generator is a helper for generating test methods for nose while still using unittest."
+DESCRIPTION = "Python package with modified subclasses of all stdlib XML \
+parsers that prevent any potentially malicious operation."
+
+LICENSE = "ISC"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=041a2bff595d40ccb4b36356f89dab00"
+
+SRC_URI[md5sum] = "6c69e73ba5b4b3ed62f7bcda071c64f1"
+SRC_URI[sha256sum] = "ad5925c814bfe79497b43df096e3bb52c166d1577f7aff160137301676232f4a"
+
+inherit pypi setuptools3
+
+DEPENDS += "python3-nose-native"
+
+RDEPENDS_${PN} += "python3-six"