From bbbd5f468dc9c43b203cac3775f6c1b782ca7cba Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 30 Oct 2020 15:42:48 -0500 Subject: meta-openembedded: subtree update:2258c9a767..164a6030b0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alejandro Hernandez Samaniego (1): emacs: Fix packaging for emacs-minimal Andreas Müller (8): fluidsynth: upgrade 2.1.3 -> 2.1.5 hdf5: Shorten SUMMARY and move long text to DESCRIPTION wxwidgets: add opengl PACKAGECONFIG / enable it if opengl is in DISTRO_FEATURES wxwidgets: Add what's necessary so that consumers of wxwidgets_git can find it wxwidgets: upgrade 3.1.3 -> 3.1.4 babl: upgrade 0.1.78 -> 0.1.82 gegl: upgrade 0.4.24 -> 0.4.26 gimp: upgrade 2.10.20 -> 2.10.22 Andrej Valek (2): nss: upgrade 3.56 -> 3.57 nspr: upgrade 4.26 -> 4.29 Chen Qi (2): open-isns: use /run instead of /var/run in systemd service file openhpi: use /run instead of /var/run in systemd service file Daniel Ammann (2): dhex: add homepage pcsc-tools: add new package Fagundes, Paulo (1): vnstat: add recipe Gianfranco Costamagna (1): vboxguestdrivers: upgrade 6.1.14 -> 6.1.16 Gianluca Pacchiella (1): Add missing dependencies for rsnapshot. Khem Raj (5): meta-openembedded: Add gatesgarth to LAYERSERIES_COMPAT apitrace: Disable secuirty flags for clang iscsi-initiator-utils: Silence a clang warning on 64bit systems minifi-cpp: Do not use lld on riscv32 redis: Fix build with clang on riscv32 Leon Anavi (44): python3-aiohttp: Upgrade 3.6.2 -> 3.6.3 python3-ujson: Upgrade 3.2.0 -> 4.0.1 python3-passlib: Upgrade 1.7.2 -> 1.7.4 python3-croniter: Upgrade 0.3.34 -> 0.3.35 python3-isort: Upgrade 5.5.4 -> 5.6.4 python3-prompt-toolkit: Upgrade 3.0.7 -> 3.0.8 python3-yarl: Upgrade 1.6.0 -> 1.6.2 python3-sqlparse: Upgrade 0.3.1 -> 0.4.1 python3-sqlalchemy: Upgrade 1.3.19 -> 1.3.20 python3-sentry-sdk: Upgrade 0.18.0 -> 0.19.0 python3-markdown: Upgrade 3.3 -> 3.3.1 python3-pywbemtools: Upgrade 0.7.3 -> 0.8.0 python3-xlsxwriter: Upgrade 1.3.6 -> 1.3.7 python3-luma-core: Upgrade 1.17.1 -> 1.17.2 python3-graphviz: Upgrade 0.14.1 -> 0.14.2 python3-yappi: Upgrade 1.2.5 -> 1.3.0 python3-iniconfig: Upgrade 1.0.1 -> 1.1.1 transmission: Upgrade 2.94 -> 3.00 python3-regex: Upgrade 2020.10.11 -> 2020.10.15 python3-colorama: Upgrade 0.4.3 -> 0.4.4 python3-zipp: Upgrade 3.3.0 -> 3.3.1 python3-pychromecast: Upgrade 7.5.0 -> 7.5.1 python3-semver: Upgrade 2.10.2 -> 2.13.0 python3-pydicti: Upgrade 1.1.3 -> 1.1.4 python3-humanize: Upgrade 3.0.1 -> 3.1.0 python3-dominate: Upgrade 2.5.2 -> 2.6.0 python3-urllib3: Upgrade 1.25.10 -> 1.25.11 python3-bitarray: Upgrade 1.5.3 -> 1.6.0 python3-markdown: Upgrade 3.3.1 -> 3.3.2 python3-pymisp: Upgrade 2.4.131 -> 2.4.133 python3-typeguard: Upgrade 2.9.1 -> 2.10.0 python3-traitlets: Upgrade 5.0.4 -> 5.0.5 python3-sentry-sdk: Upgrade 0.19.0 -> 0.19.1 python3-lxml: Upgrade 4.5.2 -> 4.6.1 python3-regex: Upgrade 2020.10.15 -> 2020.10.23 python3-google-api-python-client: Upgrade 1.12.3 -> 1.12.5 python3-cryptography: Upgrade 3.1.1 -> 3.2 python3-psutil: Upgrade 5.7.2 -> 5.7.3 python3-pyparted: Upgrade 3.11.6 -> 3.11.7 python3-tqdm: Upgrade 4.50.2 -> 4.51.0 python3-u-msgpack-python: Upgrade 2.7.0 -> 2.7.1 python3-luma-core: Upgrade 1.17.2 -> 1.17.3 python3-zipp: Upgrade 3.3.1 -> 3.4.0 python3-aiohttp: Upgrade 3.6.3 -> 3.7.1 Luca Boccassi (2): Add recipe for fsverity-utils Add new recipe for squashfs-tools-ng Mario Schuknecht (1): wireguard-tools: Fix systemd service installation Martin Jansa (3): packagegroup-meta-multimedia: include fdk-aac and mpd only with commercial in LICENSE_FLAGS_WHITELIST python3-colorama: add native and nativesdk to BBCLASSEXTEND mpd: add commercial LICENSE_FLAGS when ffmpeg or aac PACKAGECONFIG is enabled Michael Tretter (1): apitrace: add new recipe Mingli Yu (1): mariadb: Upgrade to 10.5.6 Pascal Bach (1): fmt: make available as native and nativesdk Pierre-Jean Texier (3): c-periphery: upgrade 2.2.1 -> 2.2.4 c-periphery: fix typo in SUMMARY stunnel: upgrade 5.56 -> 5.57 Qi.Chen@windriver.com (4): php: use /run instead /var/run in systemd service file lmsensors: use /run instead of /var/run for systemd service cyrus-sasl: use /run instead of /var/run for systemd service file freediameter: use /run instead of /var/run in systemd service file Ross Burton (2): mpv: fetch waf in do_fetch glmark2: no need to patch waf Sakib Sajal (1): python3-prettytable: add python3-wcwidth to RDEPENDS Siming Yuan (1): python3-paramiko: fixing runtime dependencies Taisei Nakano (1): anthy: add GPLv2 to LICENSE and add LIC_FILES_CHKSUM Ulrich Ölmann (1): usb-modeswitch, usb-modeswitch-data: fix usrmerge Yi Zhao (2): samba: upgrade 4.10.17 -> 4.10.18 networkmanager: remove PACKAGECONFIG[dhclient] Zang Ruochen (13): firewalld: upgrade 0.9.0 -> 0.9.1 mtr: upgrade 0.93 -> 0.94 wireshark: upgrade 3.2.6 -> 3.2.7 hwdata: upgrade 0.339 -> 0.340 libmbim: upgrade 1.24.2 -> 1.24.4 linuxptp: upgrade 3.0 -> 3.1 memtester: upgrade 4.4.0 -> 4.5.0 paho-mqtt-c: upgrade 1.3.5 -> 1.3.6 mm-common: upgrade 1.0.1 -> 1.0.2 poppler: upgrade 20.09.0 -> 20.10.0 spdlog: upgrade 1.8.0 -> 1.8.1 libcgi-perl: upgrade 4.50 -> 4.51 libcurses-perl: upgrade 1.36 -> 1.37 zangrc (8): gphoto2: upgrade 2.5.23 -> 2.5.26 libgphoto2: upgrade 2.5.25 -> 2.5.26 libmtp: upgrade 1.1.17 -> 1.1.18 libp11: upgrade 0.4.10 -> 0.4.11 libpwquality: upgrade 1.4.2 -> 1.4.4 libqmi: upgrade 1.26.4 -> 1.26.6 nano: upgrade 5.2 -> 5.3 protobuf: upgrade 3.13.0 -> 3.13.0.1 Signed-off-by: Andrew Geissler Change-Id: Ie105cfe99ae7dab0f6f1fd8d88d43a1979faf486 --- .../recipes-dbs/mysql/mariadb-native_10.5.4.bb | 20 --------- .../recipes-dbs/mysql/mariadb-native_10.5.6.bb | 20 +++++++++ .../meta-oe/recipes-dbs/mysql/mariadb.inc | 3 +- .../mariadb/0001-Fix-library-LZ4-lookup.patch | 4 +- ...RocksDB-undefined-reference-to-crc32c_arm.patch | 48 ---------------------- .../meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb | 27 ------------ .../meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb | 27 ++++++++++++ 7 files changed, 50 insertions(+), 99 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb (limited to 'meta-openembedded/meta-oe/recipes-dbs/mysql') diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb deleted file mode 100644 index 73b2a0980..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb +++ /dev/null @@ -1,20 +0,0 @@ -require mariadb.inc -inherit native - -PROVIDES += "mysql5-native" -DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native" - -RDEPENDS_${PN} = "" -PACKAGES = "" -EXTRA_OEMAKE = "" - -do_install() { - oe_runmake 'DESTDIR=${D}' install - - install -d ${D}${bindir} - install -m 0755 sql/gen_lex_hash ${D}${bindir}/ - install -m 0755 sql/gen_lex_token ${D}${bindir}/ - install -m 0755 extra/comp_err ${D}${bindir}/ - install -m 0755 scripts/comp_sql ${D}${bindir}/ -} - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb new file mode 100644 index 000000000..73b2a0980 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb @@ -0,0 +1,20 @@ +require mariadb.inc +inherit native + +PROVIDES += "mysql5-native" +DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native" + +RDEPENDS_${PN} = "" +PACKAGES = "" +EXTRA_OEMAKE = "" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + + install -d ${D}${bindir} + install -m 0755 sql/gen_lex_hash ${D}${bindir}/ + install -m 0755 sql/gen_lex_token ${D}${bindir}/ + install -m 0755 extra/comp_err ${D}${bindir}/ + install -m 0755 scripts/comp_sql ${D}${bindir}/ +} + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 46a64006d..7c92bbaad 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -19,9 +19,8 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ file://0001-Fix-library-LZ4-lookup.patch \ - file://0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch \ " -SRC_URI[sha256sum] = "26db2becc9cec37e99a4e73390bd2eaa74568e21f9cf110359f4f68b37154c72" +SRC_URI[sha256sum] = "ff05dd69e9f6992caf1053242db704f04eda6f9accbcc98b74edfaf6013c45c4" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch index 574dfd317..0cf0560e1 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch @@ -14,12 +14,12 @@ index e97dd63e2b0..2f4694e727c 100644 +++ b/cmake/FindLZ4.cmake @@ -1,5 +1,10 @@ -find_path(LZ4_INCLUDE_DIR NAMES lz4.h) --find_library(LZ4_LIBRARY NAMES lz4) +-find_library(LZ4_LIBRARIES NAMES lz4) +find_path(LZ4_INCLUDE_DIR + NAMES lz4.h + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) + -+find_library(LZ4_LIBRARY ++find_library(LZ4_LIBRARIES + NAMES lz4 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch deleted file mode 100644 index 1856c1af7..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d88ea260882ca414e940cd6af225617f00503f71 Mon Sep 17 00:00:00 2001 -From: Krunal Bauskar -Date: Mon, 27 Jul 2020 18:38:10 +0800 -Subject: [PATCH] MDEV-23137: RocksDB: undefined reference to crc32c_arm64 - -RocksDB fails to build on arm64: undefined reference to - `crc32c_arm64(unsigned int, unsigned char const*, unsigned int)' - -MariaDB uses storage/rocksdb/build_rocksdb.cmake to compile RocksDB. -Said cmake missed adding crc32c_arm64 compilation target so if -machine native architecture supported crc32 then complier would enable -usage of function defined in crc32c_arm64 causing the listed error. - -Added crc32c_arm64 complition target. - -closes #1642 - -Upstream-Status: Backport - -Signed-off-by: Mingli Yu ---- - storage/rocksdb/build_rocksdb.cmake | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake -index 3f3dca7e990..7d2252c5f77 100644 ---- a/storage/rocksdb/build_rocksdb.cmake -+++ b/storage/rocksdb/build_rocksdb.cmake -@@ -442,6 +442,16 @@ else() - util/crc32c_ppc.c - util/crc32c_ppc_asm.S) - endif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") -+ # aarch -+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") -+ CHECK_CXX_COMPILER_FLAG("-march=armv8-a+crc+crypto" HAS_ARMV8_CRC) -+ if(HAS_ARMV8_CRC) -+ message(STATUS " HAS_ARMV8_CRC yes") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function") -+ list(APPEND ROCKSDB_SOURCES -+ util/crc32c_arm64.cc) -+ endif(HAS_ARMV8_CRC) -+ endif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") - endif() - SET(SOURCES) - FOREACH(s ${ROCKSDB_SOURCES}) --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb deleted file mode 100644 index e6743fe97..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -require mariadb.inc - -EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" - -DEPENDS += "mariadb-native bison-native libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" - -PROVIDES += "mysql5 libmysqlclient" - -RPROVIDES_${PN} += "mysql5" -RREPLACES_${PN} += "mysql5" -RCONFLICTS_${PN} += "mysql5" - -RPROVIDES_${PN}-dbg += "mysql5-dbg" -RREPLACES_${PN}-dbg += "mysql5-dbg" -RCONFLICTS_${PN}-dbg += "mysql5-dbg" - -RPROVIDES_${PN}-leftovers += "mysql5-leftovers" -RREPLACES_${PN}-leftovers += "mysql5-leftovers" -RCONFLICTS_${PN}-leftovers += "mysql5-leftovers" - -RPROVIDES_${PN}-client += "mysql5-client" -RREPLACES_${PN}-client += "mysql5-client" -RCONFLICTS_${PN}-client += "mysql5-client" - -RPROVIDES_${PN}-server += "mysql5-server" -RREPLACES_${PN}-server += "mysql5-server" -RCONFLICTS_${PN}-server += "mysql5-server" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb new file mode 100644 index 000000000..e6743fe97 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb @@ -0,0 +1,27 @@ +require mariadb.inc + +EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" + +DEPENDS += "mariadb-native bison-native libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" + +PROVIDES += "mysql5 libmysqlclient" + +RPROVIDES_${PN} += "mysql5" +RREPLACES_${PN} += "mysql5" +RCONFLICTS_${PN} += "mysql5" + +RPROVIDES_${PN}-dbg += "mysql5-dbg" +RREPLACES_${PN}-dbg += "mysql5-dbg" +RCONFLICTS_${PN}-dbg += "mysql5-dbg" + +RPROVIDES_${PN}-leftovers += "mysql5-leftovers" +RREPLACES_${PN}-leftovers += "mysql5-leftovers" +RCONFLICTS_${PN}-leftovers += "mysql5-leftovers" + +RPROVIDES_${PN}-client += "mysql5-client" +RREPLACES_${PN}-client += "mysql5-client" +RCONFLICTS_${PN}-client += "mysql5-client" + +RPROVIDES_${PN}-server += "mysql5-server" +RREPLACES_${PN}-server += "mysql5-server" +RCONFLICTS_${PN}-server += "mysql5-server" -- cgit v1.2.3