Commit Graph

41 Commits

Author SHA1 Message Date
Khem Raj
abbca30bd6 mariadb: Fix build with clang/musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-06-18 08:33:07 -07:00
Khem Raj
0298521fcd mariadb: Include missing sys/type.h for ssize_t
musl finds this problem in sources where its missing to include
needed system header for ssize_t

Fixes
wsrep-lib/include/wsrep/gtid.hpp:80:5: error: unknown type name 'ssize_t'; did you mean 'size_t'?
    ssize_t scan_from_c_str(const char* buf, size_t buf_len,
    ^~~~~~~
    size_t

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-06-01 09:00:39 -07:00
Khem Raj
2183f08941 mariadb: Upgrade to 10.5.10
Drop fix-a-building-failure.patch because upstream has made is narrower
to apply to emulator builds and not just any cross compiling builds

Add missing dependency on boost

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-05-11 08:27:27 -07:00
Andreas Müller
ca18e276d6 mariadb: Fix configure
Assume recent CMake upgrade made this pop up.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-05-11 08:27:27 -07:00
Khem Raj
bd8e72c139 mariadb: Fix build on newer 32bit architectures
newer 32bit arches e.g. RV32 and ARC do not have __NR_io_getevents
syscall and have started of with 64bit time_t so there is no 32bit
version

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-04-06 09:02:12 -07:00
wangmy
7e64cce442 mariadb: upgrade 10.5.8 -> 10.5.9
refresh c11_atomics.patch
remove 0001-stacktrace-t.c-make-the-test-conditional.patch since it is
included in 10.5.9

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-04-06 09:02:12 -07:00
Martin Jansa
046e7067bf mysql-python, lio-utils, openlmi-tools: add conditional PNBLACKLIST like meta-python2 does
* it depends on target python(2) recipes from meta-python2 which are restricted with this
  conditional since:
  https://git.openembedded.org/meta-python2/commit/?h=hardknott&id=10c65fc18998d302f34634ffceaf31ab335056dd

* telepathy-idle and cherokee from:
  meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb
  meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
  also depend on meta-python2, but use only pythonnative from there, so they aren't blacklisted.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-03-28 12:12:57 -07:00
Khem Raj
e68935ce28 mariadb: Fix build on musl/ppc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-03-13 19:41:13 -08:00
Mingli Yu
486d0fa33e mariadb: upgrade to 10.5.8
Fixes for the following security vulnerabilities:
CVE-2020-14812
CVE-2020-14765
CVE-2020-14776
CVE-2020-14789
CVE-2020-28912 (MDEV-24040)

Rebase c11_atomics.patch to avoid fuzz warnings and add
a patch to fix below build error on musl.
/prj/tmp/work/cortexa57-poky-linux-musl/mariadb/10.5.8-r0/recipe-sysroot-native/usr/bin/aarch64-poky-linux-musl/../../libexec/aarch64-poky-linux-musl/gcc/aarch64-poky-linux-musl/10.2.0/ld.bfd: /usr/src/debug/mariadb/10.5.8-r0/mariadb-10.5.8/unittest/mysys/stacktrace-t.c:36: undefined reference to `my_safe_print_str'

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-01-27 10:21:14 -08:00
Kai Kang
c1ac3cd7d9 mariadb: add package config zstd
Add package config zstd to fix file-rdeps issue when ccache is enabled:

| ERROR: mariadb-10.5.6-r0 do_package_qa: QA Issue:
|  /usr/lib64/plugin/ha_rocksdb.so contained in package mariadb-server
|  requires libzstd.so.1() (64bit), but no providers found in
|  RDEPENDS_mariadb-server? [file-rdeps]

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-01-26 14:41:11 -08:00
Khem Raj
512712f9c4 mariadb: Fix build on 32bit arches with 64bit time_t
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-11-15 12:25:53 -08:00
Mingli Yu
2fffe8c60f mariadb: Upgrade to 10.5.6
Fixes for the following security vulnerabilities:
- CVE-2020-15180

Rebase one patch and remove one backported patch

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-10-14 08:39:34 -07:00
Mingli Yu
e6d770e0f2 mariadb: package executables named with mariadb
After mariadb upgrades to 10.5.x, the below commit introduced:
9e1b3af4a49 MDEV-21303 Make executables MariaDB named

Before the above commit:
 $ ls -l tmp-glibc/work/core2-64-wrs-linux/mariadb/10.4.12-r0/build/scripts/mysql_install_db
 -rwxr-xr-x 1 myu users 21649 Aug 20 10:36 tmp-glibc/work/core2-64-wrs-linux/mariadb/10.4.12-r0/build/scripts/mysql_install_db
 $ ls -l tmp-glibc/work/core2-64-wrs-linux/mariadb/10.4.12-r0/build/scripts/mariadb-install-db
 lrwxrwxrwx 1 myu users 16 Aug 20 10:36 tmp-glibc/work/core2-64-wrs-linux/mariadb/10.4.12-r0/build/scripts/mariadb-install-db -> mysql_install_db

After the above commit:
 $ ls -l tmp-glibc/work/corei7-64-wrs-linux/mariadb/10.5.4-r0/build/scripts/mysql_install_db
 lrwxrwxrwx 1 myu users 18 Aug 19 15:02 tmp-glibc/work/corei7-64-wrs-linux/mariadb/10.5.4-r0/build/scripts/mysql_install_db -> mariadb-install-db
 $ ls -l tmp-glibc/work/corei7-64-wrs-linux/mariadb/10.5.4-r0/build/scripts/mariadb-install-db
 -rwxr-xr-x 1 myu users 21630 Aug 19 15:02 tmp-glibc/work/corei7-64-wrs-linux/mariadb/10.5.4-r0/build/scripts/mariadb-install-db

So package the corresponding mariadb named executables to -server and
-client packages and also correct MULTILIB_SCRIPTS part accordingly.

Also cleanup some deprecated files defined for mariadb-server
and mariadb-client.

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-08-20 01:10:38 -07:00
Mingli Yu
3478865459 mariadb: not use the bundled libpcre2
>From mariadb 10.5.1, it starts to use pcre2 [1] which is the bundled
libpre2 by default. If using the bundled one, it will fetch, unpack
and build the libpcre2 during mariadb do_compile phase as mariadb uses
the bundled libpcre2 as an external project, more details in [2].

To avoid downloading the libpcre2 source from website during mariadb
do_compile phase, switch to use the system libpcre2.

[1] https://mariadb.com/kb/en/pcre/
[2] https://github.com/MariaDB/server/blob/10.5/cmake/pcre.cmake

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-08-04 23:25:55 -07:00
Mingli Yu
8fa0a3ace6 mariadb: upgrade to 10.5.4
* Remove one backported patch
* Remove SRC_URI[md5sum]
* Rebase two patches to fix fuzz warnings
* Add curl depends to fix below error:
  | ./mariadb-10.5.4/storage/maria/libmarias3/libmarias3/marias3.h:26:10: fatal error: curl/curl.h: No such file or directory

* update the pam_user_map.so install logic as below commit introduced in this new
  mariadb version
  236aed3f5f0 MDEV-21656: Wrong directory for pam_user_map.so JIRA:https://jira.mariadb.org/browse/MDEV-17292

* Backport a patch to fix the undefined reference to `crc32c_arm64' on arm64

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-07-28 12:55:35 -07:00
Mingli Yu
4ebfa9afa4 mariadb: clean the empty /lib dir
When usrmerge is enabled in DISTRO_FEATURES, there
comes below error:
ERROR: mariadb-10.4.12-r0 do_package_qa: QA Issue: mariadb-leftovers package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge]
ERROR: mariadb-10.4.12-r0 do_package_qa: QA run found fatal errors. Please consider fixing them.

It is because empty /lib dir exists in mariadb-leftovers
as below:
 $ rpm -qpl mariadb-leftovers-10.4.12-r0.core2_64.rpm |grep ^/lib
 /lib

Considering the empty /lib dir is introduced when pam
is enabled in DISTRO_FEATURES, so remove the empty /lib
dir when pam is enabled to fix the above error.

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-04-16 08:43:06 -07:00
Mingli Yu
9cfdcdda1b mariadb: Upgrade to 10.4.12
* Fixes for the following security vulnerabilities:
  CVE-2020-2574
  CVE-2020-7221

* Rework fix-arm-atomic.patch to remove fuzz warnings

* Fix the warning when pam is enabled in DISTRO_FEATURES:
  WARNING: mariadb-10.4.12-r0 do_package_qa: QA Issue: mariadb-dbg: found library in wrong location: /lib/security/.debug/pam_user_map.so
  mariadb-leftovers: found library in wrong location: /lib/security/pam_user_map.so [libdir]

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-04-09 21:05:59 -07:00
Jeremy A. Puhlman
c90be40eb9 mariadb: Add pam_auth to server package.
When pam is enabled, the pam plugin in pulled into the
server package but not the auth tool which results in
following error on boot:

Starting to install database for mariadb
chown: cannot access '/usr/lib/plugin/auth_pam_tool_dir': No such file
or directory
Cannot change ownership of the '/usr/lib/plugin/auth_pam_tool_dir'
directory
 to the 'mysql' user. Check that you have the necessary permissions and
try again.

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-02-18 18:17:20 -08:00
Khem Raj
e4a2593a21 recipes: Replace using BBPATH with BBFILE_COLLECTIONS for meta-python2 check
BBPATH check actually does not work

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-01-22 19:21:39 -08:00
Khem Raj
8c0c7f0a37 recipes: Turn inherit classes from meta-py2 to conditional constructs
helps parsing without meta-py2 in mix

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-01-22 14:20:35 -08:00
Khem Raj
e47f8dfd83 mysql-python: Enable only when meta-py2 is present
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-01-22 09:56:35 -08:00
Khem Raj
5057746583 meta-oe: Remove using python2
This change makes the parsing go though, we still might have build
issues, which will be reported in world builds seprately

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-01-22 09:56:34 -08:00
Sumit Garg
0e18982b1a mariadb: fix library LZ4 lookup
While cross-compiling mariadb package it tries to link lz4 library
present in the target sysroot and if not found it tries to link host
lz4 library which is incorrect leading to linker errors. So fix that
via restricting lz4 library lookup to target sysroot only.

Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-01-13 18:34:32 -08:00
Khem Raj
8107206163 mariadb: Upgrade to 10.4.11
Backport a rocksdb patch to fix clang error
Refresh existing patches as needed
Switch SRC_URI to downloads.mariadb.org since archive.mariadb.org is too
slow if no mirrors are used

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-12-29 10:32:10 -08:00
Kai Kang
b69e4d8b2e mariadb: replace dependency readline with libedit
Because readline changed its license to GPLv3 from version 6.0, if
build mariadb for distribution, it skips readline and turns to libedit.
If no libedit available, it uses bundled readline in the source code
finally. There is readline 8.0 in oe-core, so remove dependency readline
and use libedit instead.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-11-20 06:57:27 -08:00
Zheng Ruoqin
bf561c4d6c mariadb: upgrade 10.3.16 -> 10.3.18
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-11-07 17:43:44 -08:00
Denys Dmytriyenko
35a85e1f78 mariadb: update SRC_URI to use archive.mariadb.org
archive.mariadb.org does not go 404 on releases over time

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-10-05 09:53:30 -07:00
Kai Kang
22486241fd mariadb: fix file conflictions when multilib enabled
When multilib is enabled, it complains file conflictions of
/usr/bin/mysql_install_db and /usr/bin/mysqld_safe.

Inherit multilib_script to solve the issues.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-09-04 08:56:30 -07:00
Mingli Yu
52a326728a mariadb: Upgrade to 10.3.16
License-Update:
The address of Free Software Foundation updated

Bug fixes:
 MDEV-19490: show tables fails when selecting the information_schema database
 MDEV-19541: InnoDB crashes when trying to recover a corrupted page

More details check:
 https://jira.mariadb.org/browse/MDEV-19490
 https://jira.mariadb.org/browse/MDEV-19541

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-06-17 08:17:12 -07:00
Mingli Yu
7341b7f796 mariadb: Upgrade to 10.3.15
Fixes for the following security vulnerabilities:
 CVE-2019-2614
 CVE-2019-2627
 CVE-2019-2628

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-24 10:11:28 -07:00
Mingli Yu
e51545e4c3 mariadb: fix atomic support on arm
Check to link with libatomic to enable C11
atomics support to fix below build error on arm:
| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)':
| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8'

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-03-15 09:17:11 -07:00
Mingli Yu
5173929d7f mysql-python: fix compilation with MariaDB 10.3.13
Use standard API function MYSQL_OPT_RECONNECT
instead of direct modification of internal structures
which does not work for MariaDB to fix below compile
issue.
| _mysql.c: In function '_mysql_ConnectionObject_ping':
| _mysql.c:2005:41: error: 'MYSQL' {aka 'struct st_mysql'} has no member named 'reconnect'

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-03-07 09:33:45 -08:00
Mingli Yu
8f817f91a3 mariadb: Upgrade to 10.3.13
Per https://mariadb.org/about/maintenance-policy/,
mariadb 5.5.x series only supported until next year
April 2020, so upgrade it to 10.3.13.

Remove some deprecated patches, add some
new patches to fix build failure and rework
two patches to avoid fuzz warnings.

Add -latomic to linker flags for armv5

Use -pthread to link for mussing  atomic symbols on arches e.g. riscv

Fixes issues like
ld.bfd: librocksdblib.a(memtable.cc.o):/usr/include/c++/9.0.1/bits/atomic_base.h:438: more undefined references to `__atomic_compare_exchange_1' follow

Fix build with musl

add libxml2 to depends

Fix build with clang

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-03-06 11:31:36 -08:00
Mingli Yu
60f3d467d7 mariadb: Upgrade to 5.5.62
MariaDB 5.5.62 is a maintenance release.

It includes bugfixes and updates, including from
MySQL 5.5.62.
. XtraDB updated to 5.5.61-38.13
. Fixes for the following security vulnerabilities:
  CVE-2018-3282
  CVE-2018-3174

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-11-02 12:56:23 -07:00
Hongxu Jia
3f6b81b85c mariadb: split one dpg package
Multiple -dbg packages per recipe is not encouraged, and only one is
recommended and the code only works properly in some cases for one.

Add RPROVIDES_${PN}-dbg to be compatiable with previous dbg packages
requiring.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-09-18 20:17:02 -07:00
Mingli Yu
edc253a4d2 mariadb: Upgrade to 5.5.61
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-08-03 09:34:29 -07:00
Yi Zhao
b843c660dd mariadb: add UPSTREAM_CHECK_URI
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-05-29 12:56:19 -07:00
Khem Raj
231e4946e1 mariadb: Upgrade to 5.5.60
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-05-26 21:10:55 -07:00
Hongxu Jia
3efa3d2bb0 mariadb: 5.5.57 -> 5.5.59
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2018-05-01 18:17:01 -07:00
Andreas Müller
df74ac6f4d mariadb(-native): refresh fix-mysqlclient-r-version.patch
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2018-04-08 17:00:06 -07:00
Armin Kuster
31f337c1af mysql: move to recipes-dbs
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2018-03-01 16:10:35 -08:00