aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/mysql
Commit message (Collapse)AuthorAgeFilesLines
* mariadb: Do not use ucontext_* APIs with muslKhem Raj2017-11-152-0/+29
| | | | | | | | | musl has ucontext.h header but does not implement the APIs Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit b545c0643d2b2a1f1a816e789ff67116c613de5b) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
* mariadb: use faster download URLTim Orling2016-11-291-1/+1
| | | | | | | | | The current URL takes about 2 hours to download. Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> (cherry picked from commit 2f652ec3dc99e930e73443789b7168d2629d980e) Signed-off-by: Armin Kuster <akuster808@gmail.com>
* mariadb: update to version 5.5.52Armin Kuster2016-10-053-3/+2
| | | | | | | Update to latest from 5.5.50 to 5.5.52, maintenance updates. includes CVE-2016-6662 affects < 5.5.51 Signed-off-by: Armin Kuster <akuster808@gmail.com>
* mariadb: replace the CC with CC_VERSION and CXX with CXX_VERSIONYue Tao2016-10-052-0/+27
| | | | | | | | | | mysqlbug.sh is a bug report script. It makes a report with the build information, including gcc version. The CC is the local path of gcc, which is useless for bug report, and the path may expose private information, so change it to CC_VERSION. Signed-off-by: Yue Tao <Yue.Tao@windriver.com> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: add libdbd-mysql-perl to RDEPENDSMingli Yu2016-10-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Add libdbd-mysql-perl to RDEPENDS as mysql_setpermission depends on DBD::mysql module root@test:~# mysql_setpermission -h Option h is ambiguous (help, host) Password for user to connect to MySQL: install_driver(mysql) failed: Can't locate DBD/mysql.pm in @INC (you may need to install the DBD::mysql module) (@INC contains: /etc/perl /usr/lib64/perl/site_perl/5.22.1/ /usr/lib64/perl/site_perl/5.22.1 /usr/lib64/perl/vendor_perl/5.22.1/ /usr/lib64/perl/vendor_perl/5.22.1 /usr/lib64/perl/5.22.1/ /usr/lib64/perl/5.22.1 /usr/local/lib/site_perl /usr/lib64/perl/5.22.1 .) at (eval 11) line 3, <STDIN> line 1. Perhaps the DBD::mysql perl module hasn't been fully installed, or perhaps the capitalisation of 'mysql' isn't right. Available drivers: DBM, ExampleP, File, Gofer, Proxy, Sponge. at /usr/bin/mysql_setpermission line 90. * Add libmysqlclient to Provides as libdbd-mysql-perl depend on it Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: add libdbi-perl to RDEPENDSZhixiong Chi2016-10-031-1/+1
| | | | | | | | | | | | The commands(mysql_convert_table_format and mysql_setpermission) need the supported API provided by the libdbi-perl package. So add the libdbi-perl to the variable RDEPENDS of mariabdb-server. Move libdbi-perl from meta-perl to meta-oe Signed-off-by: Zhixiong Chi <Zhixiong.Chi@windriver.com> Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* meta-oe: fix indentationMartin Jansa2016-08-221-2/+2
| | | | | | | | * remove tabs which sneaked in since last cleanup * meta-oe layers are using consistent indentation with 4 spaces, see http://www.openembedded.org/wiki/Styleguide Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: upgrade to 5.5.50Kai Kang2016-07-293-2/+3
| | | | | | | | | Upgrade mariadb from 5.5.46 to 5.5.50. * update runtime dependency of mariadb-setupdb which requires command install Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: Fix rootfs creation errorsLi xin2016-04-281-1/+4
| | | | | | | | error: file /usr/share/doc/README from install of mariadb-leftovers-5.5.46-* conflicts with file from package dmidecode-doc-2.12-* Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: -native also needs gold workaroundKoen Kooi2016-01-141-0/+3
| | | | | | | When the host distro uses gold mariadb-native fails to build. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb.inc: fix mysqld hung at first init time based on systemdHongxu Jia2015-12-186-25/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While SYSTEMD_AUTO_ENABLE_mariadb-server = "enable", the mysqld service hungs. ... [ **] A start job is running for Run pending postinsts (25s / no limit) [ OK ] Stopped MariaDB database server. ... In mariadb-server's pkg_postinst, it install db at first runtime. And the following 'systemctl mysqld restart' casued the hunging. So the fix idea is to reomove pkg_postinst and still install db at first runtime. Introduce mysql-systemd-start from ${S}/packaging/rpm-oel/. For review convenience, we add them as file. The mysql-systemd-start provides two functions: the install_db is to install db at fist runtime (the first runtime means if a db existed, the install_db will directly exit); the pinger is to wait for mysqld service startup completed. The mysqld.service add ExecStartPost than previous which invoke 'mysql-systemd-start post' to wait for mysqld service startup completed. We add a package to provide install_db, so the user could choose it to install database for mariadb at first boot before mysqld started. It also fix another issue: When you manually restart mysqld and do mysql test to connect the server, the return of the restart could make sure mysqld is ready, and the following db connect will not fail with: ... Can't connect to local MySQL server through socket ... Tweak my.cnf to remove obsolete/incorrect parameter. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: update to 5.5.46Randy MacLeod2015-11-063-2/+2
| | | | | | | | | | This is the latest release in the 5.5.x stable series. It fixes 11 CVEs as listed: https://mariadb.com/kb/en/mariadb/mariadb-5546-release-notes/ and fixes 10s of internal MariaDB tracked defects. Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: Easy linkage of code using libmysqlclient_rOtavio Salvador2015-10-131-0/+3
| | | | | | | | | | | | The libmysqlclient_r library is now a symbolic link for the libmysqlclient one, however some code still requires it for linking. To easy the transition, when installing the libmysqlclient-dev we should include the libmysqlclient-r-dev as well. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mysql-python: upgrade to 1.2.5Roy Li2015-09-232-22/+3
| | | | | | | remove the remove-distribute.patch, v1.2.5 has a similar fix Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: update to 5.5.45Koen Kooi2015-08-314-51/+9
| | | | | | | This is the latest release in the 5.5.x stable series. The CVE patch has been applied upstream. Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: fix tarball fetch URLMario Domenech Goulart2015-08-311-1/+1
| | | | | | | | http://mirror.stshosting.co.uk/mariadb responds with a 404 error, so use http://archive.mariadb.org instead. Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: update for packgeconfig valgrindKai Kang2015-07-161-1/+1
| | | | | | | | | | | | | | | | When 'valgrind' is not in PACKAGECONFIG, 'WITHOUT_VALGRIND' is passed to cmake but it is not a valid cmake macro. Warning messages show in log.do_configure: CMake Warning: Manually-specified variables were not used by the project: WITHOUT_VALGRIND Use -DWITH_VALGRIND=FALSE instead. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: fix floating dependency on krb5Roy Li2015-06-171-0/+9
| | | | | | | | | | | | | Mariadb depends on openssl, openssl conditionally depends on krb5 by checking if OPENSSL_NO_KRB5 is defined, but cmake can not handle "ifndef" and always ask krb5.h if krb5.h exist when cmake make_depend; Faking a kssl.h if krb5 is not in PACKAGECONF, which does not include krb5 related declaration, install the faked kssl.h into build dir to be searched firstly Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: Security Advisory -CVE-2015-2305Roy Li2015-06-082-0/+44
| | | | | | | https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-2305 Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb.inc: use x86 over-ride instead of i586Andre McCurdy2015-06-081-1/+1
| | | | | | | Support i686 without needing to duplicate the i586 over-ride. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: upgrade to 5.5.43Roy Li2015-05-134-2/+34
| | | | | Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: make it be able to work with SELinuxRoy Li2015-02-123-1/+3
| | | | | | | | | | | 1. change the datadir from /var/mysql to /var/lib/mysql 2. after creating datedir, restorecon on it, make SELinux be able to work 3. Add the PIDFile for systemd unit file, otherwise systemctl can not stop mysqld Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: mariadb-server depends on mariadb-clientRoy Li2015-02-121-1/+2
| | | | | | | | | /etc/init.d/mysqld from mariadb-server uses mysqladmin, which is installed into mariadb-client, so add the dependency to make this script be able to run Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: update to 5.5.41Paul Eggleton2015-01-084-49/+2
| | | | | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: add dependency libeventKang Kai2014-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mariadb failed to build: | make[2]: *** No rule to make target '/.../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libevent.so', needed by 'tests/async_queries'. Stop. | make[2]: Leaving directory '/.../bitbake_build/tmp/work/core2-64-wrs-linux/mariadb/5.5.40-r0/build' CMakeFiles/Makefile2:6742: recipe for target 'tests/CMakeFiles/async_queries.dir/all' failed | make[1]: *** [tests/CMakeFiles/async_queries.dir/all] Error 2 It is an rare case that when configure mariadb, libevent exists in sysroot. But when do compile for mariadb, libevent is gone somehow. That causes build fails. Run follow commands could reproduce this error: $ bitbake libevent $ bitbake mariadb -c cleansstate $ bitbake mariadb -c configure $ bitbake libevent -c clean $ bitbake mariadb Add if without libevent, test case tests/async_queries.c will not be built. The case is helpful to do unit test. So add libevent as a dependency to fix the error and make sure async_queries.c will be built. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: re-package configure filesKang Kai2014-11-242-3/+12
| | | | | | | | | | | | | | | | | | | | There are 3 configure files under /etc/my.cnf.d: client.cnf: options for client library mysql-clients.cnf: options for MariaDB tools such as mysqladmin, etc server.cnf: options for server They are packaged to mariadb-leftover at this moment. That is not correct. Split them into sub-packages: client.cnf --> libmysqlclient mysql-clients.cnf --> mariadb-client server.cnf --> mariadb-server Make these files as configure file by CONFFILES and update global configure file my.cnf to include /etc/my.cnf.d as well. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: Update from version 5.5.39 to 5.5.40Kang Kai2014-11-244-6/+53
| | | | | | | | | | | * rename mariadb_5.5.39.inc -> mariadb.inc * add dependency bision-native for mariadb-native * add revert-fix-for-MDEV-5120.patch to revert an commit for mariadb test suite which causes packages mysql-python and modphp fail to build * add PACKAGECONFIG 'libedit' Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: Check valgrind headers only if WITH_VALGRIND is setJackie Huang2014-11-242-0/+43
| | | | | | | | | Changes: - Add patch to check valgrind headers only if WITH_VALGRIND is set - Add PACKAGECONFIG for valgrind and disable it by default Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: use ${PN} for SYSTEMD_AUTO_ENABLEChen Qi2014-11-071-1/+1
| | | | | | | | Use ${PN} instead of hardcoding 'mariadb' so that everything works fine in case of multilib. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: change socket location in my.cnfChen Qi2014-11-071-2/+2
| | | | | | | | | | | | | | Change socket location to /var/lib/mysql/mysql.sock. Otherwise, we could spot errors in systemd systems like below. mysqladmin: connect to server at 'localhost' failed error: 'Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)' Check that mysqld is running and that the socket: '/tmp/mysql.sock' exists! This is because mysqld.service is using PrivateTmp=true. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: drop the anonymous function and use proper install layoutJackie Huang2014-10-041-22/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The anonymous function redefined bindir to bindir_noprefix (and others), which broke the sstate between build dirs. The redefined *_noprefix was to used to pass to the INSTALL_* variables to change the layout as we want, but in fact we can do this in other ways instead of the pain one: 1) Change the default layout and a little adjustment. There are 4 install layout: STANDALONE(default), RPM, DEB and SVR4. And RPM is the one close to what we are using. 2) Don't use prefix and pass full paths to INSTALL_*. The mariadb's cmake define some of the INSTALL_* relative to CMAKE_INSTALL_PREFIX, So we can use empty CMAKE_INSTALL_PREFIX, then we can pass our full paths to INSTALL_* directly. This patch set the default layout to RPM and pass paths only for: - INSTALL_DOCDIR: no prefix prepending, so ${datadir} works. - INSTALL_LIBDIR/INSTALL_PLUGINDIR: use ${baselib}. The mysql-test is moved from /usr to /usr/share which is more reasonable, fix the FILES inclusion accordingly. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: use ${PN} for SYSTEMD_SERVICEChen Qi2014-09-261-2/+2
| | | | | | | Use ${PN} for SYSTEMD_SERVICE to avoid errors in case of multilib. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: upgrade from 5.5.38 to 39Kang Kai2014-08-283-2/+2
| | | | | | | | Upgrade mariadb from 5.5.38 to 5.5.39. Previous upgrade made a lot of work, so it is easy this time. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: add systemd unit fileChen Qi2014-08-272-2/+33
| | | | | | | | | | The service file mainly comes from Fedora20. This patch also adds a configuration file under /etc/tmpfiles.d so that mysqld could start correctly. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: change the group of /var/lib/mysql from 'nogroup' to 'mysql'.Hongxu Jia2014-08-271-1/+1
| | | | | | | | | The commit 8f637f9bbcdda1dc7a1998d243708c727aa6016f added mysql group, we should change the group of /var/lib/mysql from 'nogroup' to 'mysql' also. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: refer ubuntu/redhat to add mysql groupHongxu Jia2014-08-211-2/+2
| | | | | | | | | | | In ubuntu/redhat, we have: ... ps -eo user,group,cmd | grep "mysql" mysql mysql /usr/sbin/mysqld ... Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: update to 5.5.38Paul Eggleton2014-08-1020-1187/+286
| | | | | | | | | | | | | * Upstream switched from autotools to cmake * Separate build dir and parallel make now work * Library versioning no longer used for plugins; other libtool cruft gone * Proper upstream initscript * Plugins moved from client library package to mariadb-server package (matches how Fedora packages these) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: handle seperate builddirKoen Kooi2014-05-031-2/+2
| | | | | Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: add perl and perl modules to RDEPENDSChong Lu2014-05-031-0/+13
| | | | | | | | Perl and perl modules don't be installed in small image, but mariadb-server, mariadb-client and mariadb-leftovers need them in runtime, so we add them to RDEPENDS. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
* mariadb: use /bin/false as the login shellChong.Lu@windriver.com2014-04-201-1/+1
| | | | | | | | | Use /bin/false as the login shell, just like what Ubuntu does, otherwise there might be secure issue. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: convert remaining SUMMARY/DESCRIPTION cosmetic issuesMatthieu CRAPET2014-02-231-1/+1
| | | | | | | | | | | | | Changes: - rename SUMMARY with length > 80 to DESCRIPTION - rename DESCRIPTION with length < 80 to (non present tag) SUMMARY - drop final point character at the end of SUMMARY string - remove trailing whitespace of SUMMARY line Note: don't bump PR Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: move linker fix to .incKoen Kooi2014-02-232-4/+3
| | | | | | | When using a recent cross-binutils you need this fix as well, so move it from -native to the .inc. Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: Add patch to fix urecognized optionsAndrei Gherzan2014-01-102-1/+19
| | | | | | | | | | Add patch to tell autoconf about with-plugin option. In this way we avoid warnings like: configure: WARNING: unrecognized options: --with-plugin-maria Change-Id: Id64ac01d7f2072e1bca8979c5da3e8c6520105cb Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb-native: fix dependenciesMartin Jansa2013-12-313-3/+2
| | | | | | | | * unlike BBCLASSEXTENDed native support, dependencies in mariadb-native don't get automatic -native suffix, so mariadb-native was depending on target ncurses and zlib. * move the dependency from .inc and apply it with right suffix Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb-native: fix link error on Ubuntu 13.10Wenzong Fan2013-12-212-0/+40
| | | | | | | | | | | | | | | | | | | | | | | Below errors only occurs on Ubuntu 13.10: $arch-linux-libtool: link: g++ ... -o .libs/mysqltest_embedded \ ../../libmysqld/.libs/libmysqld.so -ldl ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlopen' ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlclose' ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlerror' ../../libmysqld/.libs/libmysqld.so: undefined reference to `dlsym' GCC/ld verion on the host: gcc (Ubuntu/Linaro 4.8.1-10ubuntu8) 4.8.1 GNU ld (GNU Binutils for Ubuntu) 2.23.52.20130913 This is a strange behavior on Ub13.10, it fails even '-ldl' in the link command line. This patch will append '-ldl' to dependency_libs in libmysqld.la. Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: fix QA Issue ELF binary has relocations in .text while multilib enabledHongxu Jia2013-11-182-0/+45
| | | | | | | | | | | | bitbake lib32-mariadb ... WARNING: QA Issue: ELF binary 'bitbake_build/tmp/work/x86-wrsmllib32-linux/lib32-mariadb/5.1.67-r0/packages-split/lib32-libmysqlclient/usr/lib/plugin/ha_xtradb.so.0.0.0' has relocations in .text WARNING: QA Issue: ELF binary 'bitbake_build/tmp/work/x86-wrsmllib32-linux/lib32-mariadb/5.1.67-r0/packages-split/lib32-libmysqlclient/usr/lib/plugin/ha_innodb_plugin.so.0.0.0' has relocations in .text ... The mariadb used absolute addresses on IA-32, we should forbid this. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: Remove PR = r0 from all recipesMartin Jansa2013-11-011-1/+0
| | | | | | | | | | | * Remove all PR = "r0" from all .bb files in meta-oe repo. This was done with the command sed -e '/^PR.*=.*r0\"/d' meta*/recipes*/*/*.bb -i * We've switching to the PR server, PR bumps are no longer needed and this saves people either accidentally bumping them or forgetting to remove the lines (r0 is the default anyway). Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb-native: depends on zlib-nativeWenzong Fan2013-10-311-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mariadb will provide zlib.* if it can't find zlib binaries and headers from sysroots path. We have set it to use external zlib.* firstly with these definitions/configs in inc file: + DEPENDS = "ncurses zlib" + --with-zlib-dir=${STAGING_EXECPREFIXDIR} But native bb file overrides the dependencies with: + DEPENDS = "ncurses-native" If mariadb-naitve was built before zlib-native, its own zlib will be built and provide zlib.la which will brake other packages link to real zlib with errors like: * .../usr/lib/libz.a(gzclose.o): relocation R_X86_64_32 against \ `a local symbol' can not be used when making a shared object; \ recompile with -fPIC * .../usr/lib/libz.a: could not read symbols: Bad value By removing the DEPENDS = "ncurses-native" from the native bb file, mariadb-native will still have the DEPENDS (ncurses zlib) from the inc file, and since the recipe is mariadb-native, this is equivalent to DEPENDS = "ncurses-native zlib-native" due to the map_dependencies() inner fuction for native_virtclass_handler() in "oe-core/meta/classes/ native.bbclass". Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: Add mysql5 to RPROVIDES for backwards compatibilityHongxu Jia2013-10-141-6/+18
| | | | | | | | | | | | | | | It failed to build image while IMAGE_INSTALL += "mysql5" For backwards compatibility: - Add mysql5 to RPROVIDES_${PN} - Add mysql5-dbg to RPROVIDES_${PN}-dbg - Add mysql5-leftovers to RPROVIDES_${PN}-leftovers - Use "+=" instead of "=" in RPROVIDES_${PN}-client and RPROVIDES_${PN}-server The same to RREPLACES and RCONFLICTS. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* mariadb: fix do_configure failed while multilib is usedHongxu Jia2013-10-142-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here is the error log from mariadb's configure test ... checking for zlib compression library... configure: error: headers or binaries were not found in /home/jiahongxu/yocto/build-20131009-mysql/ bitbake_build/tmp/sysroots/qemux86-64/usr/{include,lib} ... When multilib is used, the baselib is assigned with "lib64", here is the log from 'bitbake mariadb -e' ... 4738 # $baselib [3 operations] 4739 # set conf/bitbake.conf:10 4740 # "${BASELIB}" 4741 # set conf/bitbake.conf:11 4742 # [vardepvalue] "${baselib}" 4743 # set /home/jiahongxu/yocto/build-20131009-mysql/layers/oe-core/meta/conf/multilib.conf:2 4744 # "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or 'INVALID'), True) or d.getVar('BASELIB', True)}" 4745 # computed: 4746 # "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or 'INVALID'), True) or d.getVar('BASELIB', True)}" 4747 baselib="lib64" ... In this situation, the zlib locates in 'lib64' rather than 'lib'. But mariadb's confiure test still searches zlib in 'lib'. Modify mariadb's confiure to let lib dir configurable rather than hardcode could fix this issue. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
generated by cgit v1.2 (git 2.18.0) at 2023-04-02 09:07:24 +0000