From 072e2389fd357e01fb3b4c5522bb9ff8f62da256 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 25 Sep 2019 08:16:16 -0400 Subject: 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 --- ...engines-splice-remove-buggy-mem_align-set.patch | 43 ----------- .../meta-oe/recipes-benchmark/fio/fio_3.15.bb | 46 ----------- .../meta-oe/recipes-benchmark/fio/fio_3.16.bb | 45 +++++++++++ ...-strerror_r-implementation-glibc-specific.patch | 31 ++++++++ .../mongodb/mongodb/0003-fix-musl-strerror_r.patch | 30 -------- .../meta-oe/recipes-dbs/mongodb/mongodb_git.bb | 2 +- .../recipes-devtools/protobuf/protobuf_3.9.1.bb | 90 ---------------------- .../recipes-devtools/protobuf/protobuf_3.9.2.bb | 90 ++++++++++++++++++++++ .../python/python3-test-generator_0.1.2.bb | 15 ++++ 9 files changed, 182 insertions(+), 210 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.15.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-test-generator_0.1.2.bb (limited to 'meta-openembedded') 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 cb18032d2..000000000 --- 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 -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 -Signed-off-by: Jens Axboe -Signed-off-by: Liwei Song ---- - 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.15.bb deleted file mode 100644 index df81759da..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.15.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Filesystem and hardware benchmark and stress tool" -DESCRIPTION = "fio is an I/O tool meant to be used both for benchmark and \ -stress/hardware verification. It has support for a number of I/O engines, \ -I/O priorities (for newer Linux kernels), rate I/O, forked or threaded jobs, \ -and much more. It can work on block devices as well as files. fio accepts \ -job descriptions in a simple-to-understand text format. Several example job \ -files are included. fio displays all sorts of I/O performance information." -HOMEPAGE = "http://freecode.com/projects/fio" -SECTION = "console/tests" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "libaio zlib" -RDEPENDS_${PN} = "python bash" - -PACKAGECONFIG_NUMA = "numa" -# ARM does not currently support NUMA -PACKAGECONFIG_NUMA_arm = "" -PACKAGECONFIG_NUMA_armeb = "" - -PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" -PACKAGECONFIG[numa] = ",--disable-numa,numactl" - -SRCREV = "01bf5128d0581e267383f280c6a1dcd26517240f" -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" - -# avoids build breaks when using no-static-libs.inc -DISABLE_STATIC = "" - -EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" -EXTRA_OECONF = "--disable-optimizations" - -do_configure() { - ./configure ${EXTRA_OECONF} -} - -do_install() { - oe_runmake install DESTDIR=${D} prefix=${prefix} mandir=${mandir} - install -d ${D}/${docdir}/${PN} - cp -R --no-dereference --preserve=mode,links -v ${S}/examples ${D}/${docdir}/${PN}/ -} diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb new file mode 100644 index 000000000..092b2bead --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb @@ -0,0 +1,45 @@ +SUMMARY = "Filesystem and hardware benchmark and stress tool" +DESCRIPTION = "fio is an I/O tool meant to be used both for benchmark and \ +stress/hardware verification. It has support for a number of I/O engines, \ +I/O priorities (for newer Linux kernels), rate I/O, forked or threaded jobs, \ +and much more. It can work on block devices as well as files. fio accepts \ +job descriptions in a simple-to-understand text format. Several example job \ +files are included. fio displays all sorts of I/O performance information." +HOMEPAGE = "http://freecode.com/projects/fio" +SECTION = "console/tests" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libaio zlib" +RDEPENDS_${PN} = "python bash" + +PACKAGECONFIG_NUMA = "numa" +# ARM does not currently support NUMA +PACKAGECONFIG_NUMA_arm = "" +PACKAGECONFIG_NUMA_armeb = "" + +PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" +PACKAGECONFIG[numa] = ",--disable-numa,numactl" + +SRCREV = "92f75708b530989fdb13b50be6604f44b80d038d" +SRC_URI = "git://git.kernel.dk/fio.git \ + file://0001-update-the-interpreter-paths.patch \ +" + +S = "${WORKDIR}/git" + +# avoids build breaks when using no-static-libs.inc +DISABLE_STATIC = "" + +EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" +EXTRA_OECONF = "--disable-optimizations" + +do_configure() { + ./configure ${EXTRA_OECONF} +} + +do_install() { + oe_runmake install DESTDIR=${D} prefix=${prefix} mandir=${mandir} + install -d ${D}/${docdir}/${PN} + cp -R --no-dereference --preserve=mode,links -v ${S}/examples ${D}/${docdir}/${PN}/ +} 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 000000000..5337fcdbf --- /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 +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 +--- + 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 c6035894e..000000000 --- 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 d3c19d6c4..3e77ac32f 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 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.2 \ 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.1.bb deleted file mode 100644 index 94d8def77..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.1.bb +++ /dev/null @@ -1,90 +0,0 @@ -SUMMARY = "Protocol Buffers - structured data serialisation mechanism" -DESCRIPTION = "Protocol Buffers are a way of encoding structured data in an \ -efficient yet extensible format. Google uses Protocol Buffers for almost \ -all of its internal RPC protocols and file formats." -HOMEPAGE = "https://github.com/google/protobuf" -SECTION = "console/tools" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" - -DEPENDS = "zlib" -DEPENDS_append_class-target = " protobuf-native" - -SRCREV = "655310ca192a6e3a050e0ca0b7084a2968072260" - -SRC_URI = "git://github.com/google/protobuf.git;branch=3.9.x \ - file://run-ptest \ - file://0001-protobuf-fix-configure-error.patch \ - file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \ - file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ -" -S = "${WORKDIR}/git" - -inherit autotools-brokensep pkgconfig ptest - -PACKAGECONFIG ??= "" -PACKAGECONFIG[python] = ",," - -EXTRA_OECONF += "--with-protoc=echo" - -TEST_SRC_DIR = "examples" -LANG_SUPPORT = "cpp ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" - -do_compile_ptest() { - mkdir -p "${B}/${TEST_SRC_DIR}" - - # Add the location of the cross-compiled header and library files - # which haven't been installed yet. - cp "${B}/protobuf.pc" "${B}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|Cflags:|Cflags: -I${S}/src|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|Libs:|Libs: -L${B}/src/.libs|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" - export PKG_CONFIG_PATH="${B}/${TEST_SRC_DIR}" - - # Save the pkgcfg sysroot variable, and update it to nothing so - # that it doesn't append the sysroot to the beginning of paths. - # The header and library files aren't installed to the target - # system yet. So the absolute paths were specified above. - save_pkg_config_sysroot_dir=$PKG_CONFIG_SYSROOT_DIR - export PKG_CONFIG_SYSROOT_DIR= - - # Compile the tests - for lang in ${LANG_SUPPORT}; do - oe_runmake -C "${S}/${TEST_SRC_DIR}" ${lang} - done - - # Restore the pkgconfig sysroot variable - export PKG_CONFIG_SYSROOT_DIR=$save_pkg_config_sysroot_dir -} - -do_install_ptest() { - local olddir=`pwd` - - cd "${S}/${TEST_SRC_DIR}" - install -d "${D}/${PTEST_PATH}" - for i in add_person* list_people*; do - if [ -x "$i" ]; then - install "$i" "${D}/${PTEST_PATH}" - fi - done - cp "${S}/${TEST_SRC_DIR}/addressbook_pb2.py" "${D}/${PTEST_PATH}" - cd "$olddir" -} - -PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-lite" - -FILES_${PN}-compiler = "${bindir} ${libdir}/libprotoc${SOLIBS}" -FILES_${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}" - -RDEPENDS_${PN}-compiler = "${PN}" -RDEPENDS_${PN}-dev += "${PN}-compiler" -RDEPENDS_${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python-protobuf', '', d)}" - -MIPS_INSTRUCTION_SET = "mips" - -BBCLASSEXTEND = "native nativesdk" - -LDFLAGS_append_arm = " -latomic" -LDFLAGS_append_mips = " -latomic" -LDFLAGS_append_powerpc = " -latomic" -LDFLAGS_append_mipsel = " -latomic" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.2.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.2.bb new file mode 100644 index 000000000..a007b2a69 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.2.bb @@ -0,0 +1,90 @@ +SUMMARY = "Protocol Buffers - structured data serialisation mechanism" +DESCRIPTION = "Protocol Buffers are a way of encoding structured data in an \ +efficient yet extensible format. Google uses Protocol Buffers for almost \ +all of its internal RPC protocols and file formats." +HOMEPAGE = "https://github.com/google/protobuf" +SECTION = "console/tools" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" + +DEPENDS = "zlib" +DEPENDS_append_class-target = " protobuf-native" + +SRCREV = "52b2447247f535663ac1c292e088b4b27d2910ef" + +SRC_URI = "git://github.com/google/protobuf.git;branch=3.9.x \ + file://run-ptest \ + file://0001-protobuf-fix-configure-error.patch \ + file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \ + file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ +" +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig ptest + +PACKAGECONFIG ??= "" +PACKAGECONFIG[python] = ",," + +EXTRA_OECONF += "--with-protoc=echo" + +TEST_SRC_DIR = "examples" +LANG_SUPPORT = "cpp ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" + +do_compile_ptest() { + mkdir -p "${B}/${TEST_SRC_DIR}" + + # Add the location of the cross-compiled header and library files + # which haven't been installed yet. + cp "${B}/protobuf.pc" "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Cflags:|Cflags: -I${S}/src|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Libs:|Libs: -L${B}/src/.libs|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + export PKG_CONFIG_PATH="${B}/${TEST_SRC_DIR}" + + # Save the pkgcfg sysroot variable, and update it to nothing so + # that it doesn't append the sysroot to the beginning of paths. + # The header and library files aren't installed to the target + # system yet. So the absolute paths were specified above. + save_pkg_config_sysroot_dir=$PKG_CONFIG_SYSROOT_DIR + export PKG_CONFIG_SYSROOT_DIR= + + # Compile the tests + for lang in ${LANG_SUPPORT}; do + oe_runmake -C "${S}/${TEST_SRC_DIR}" ${lang} + done + + # Restore the pkgconfig sysroot variable + export PKG_CONFIG_SYSROOT_DIR=$save_pkg_config_sysroot_dir +} + +do_install_ptest() { + local olddir=`pwd` + + cd "${S}/${TEST_SRC_DIR}" + install -d "${D}/${PTEST_PATH}" + for i in add_person* list_people*; do + if [ -x "$i" ]; then + install "$i" "${D}/${PTEST_PATH}" + fi + done + cp "${S}/${TEST_SRC_DIR}/addressbook_pb2.py" "${D}/${PTEST_PATH}" + cd "$olddir" +} + +PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-lite" + +FILES_${PN}-compiler = "${bindir} ${libdir}/libprotoc${SOLIBS}" +FILES_${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}" + +RDEPENDS_${PN}-compiler = "${PN}" +RDEPENDS_${PN}-dev += "${PN}-compiler" +RDEPENDS_${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python-protobuf', '', d)}" + +MIPS_INSTRUCTION_SET = "mips" + +BBCLASSEXTEND = "native nativesdk" + +LDFLAGS_append_arm = " -latomic" +LDFLAGS_append_mips = " -latomic" +LDFLAGS_append_powerpc = " -latomic" +LDFLAGS_append_mipsel = " -latomic" 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 000000000..14943a4bd --- /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" -- cgit v1.2.3