14 Commits

Author SHA1 Message Date
Martin Jansa 5c1e7c0052 mysql5: prevent using bundled zlib at all costs
* in some seldom cases mysql's m4 macro decides that system
  zlib (from DEPENDS) is not worthy and decides to use own
  bundled version which prefers stuff like static libz.a and
  stages libz.la again:
  mysql-5.1.40/config/ac-macros/zlib.m4
  NOTE: recipe mysql5-5.1.40-r11: task do_package_setscene: Started
  NOTE: recipe zlib-1.2.7-r0: task do_packagedata_setscene: Succeeded
  WARNING: The recipe zlib is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
  sysroots/om-gta04/usr/lib/libz.a
  Matched in manifest-om-gta04-mysql5
  Please verify which package should provide the above files.
  NOTE: recipe zlib-1.2.7-r0: task do_populate_sysroot_setscene: Succeeded

* this libz.la + libz.a is breaking many packages which are now trying to
  link shared libs against libz.a from mysql which was built without fPIC
  breaking libxml2, glib-2.0, gnutls, libpng, ...
  | ld: sysroots/om-gta04/usr/lib/libz.a(crc32.o): relocation R_ARM_MOVW_ABS_NC against `a local symbol' can not be used when making a shared object; recompile with -fPIC
  | sysroots/om-gta04/usr/lib/libz.a: could not read symbols: Bad value
  | collect2: ld returned 1 exit status

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-08-22 09:51:26 +02:00
Martin Jansa a45830a39b recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python
  tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
  tabs is the need to update a lot of recipes). Lately this advice
  was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
  error prone when someone is not sure if e.g.
  do_generate_toolchain_file() is Python or shell task and also allows
  to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
  potentially bad (shouldn't be used for indenting of multiline
  variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
  we're quite inconsistent wheater it's first character on line
  under opening quote or under first non-whitespace character in
  previous line.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
2013-04-15 16:23:17 +02:00
Marcin Juszkiewicz 5b427f6daa mysql: make it work after $libexec change - LP: #1068759
Mysql start scripts assumed that mysqld is in /usr/libexec/ directory.
It was true until 406bd38b4232f9f399ef5ffe0b4fac72ed605a23 landed in
OE-Core.

This changeset fixes mysqld start and initial databases population
scripts.

More: https://bugs.launchpad.net/linaro-oe/+bug/1068759

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-11-23 08:37:08 +01:00
Paul Eggleton d66c9a8b62 mysql5-native: remove PSTAGING_DISABLED
This variable is no longer used with OE-Core.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-28 13:57:38 +00:00
Paul Eggleton f50202f2b4 Remove NATIVE_INSTALL_WORKS
This variable is no longer used with OE-Core.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-28 13:57:38 +00:00
Paul Eggleton 415c49a0c7 mysql: always replace paths in mysql_config script
Path replacement was not happening on some machines if the MySQL build
scripts set a different path in the produced mysql_config script,
resulting in host paths being left in.

Original patch by Joe Slater <jslater@windriver.com>.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-10-24 08:28:12 +02:00
Marcin Juszkiewicz 44cb71bbc9 mysql: start at runlevel 5 not S
Without that change target system had to be restarted to get MySQL
running or it had to be run by hand. Reason was simple: mysql init
script was starting before S99configure when package was not yet
configured.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-10-19 11:42:14 +02:00
Paul Eggleton 3f95bb9073 mysql: fix include path reported by mysql_config
mysql_config should point to the directory where the MySQL include files
can be found and not its parent.

This fixes building modphp with mysql enabled, and allows cherokee to
actually enable mysql support.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-10-09 11:05:00 +02:00
Samuel Stirtzel c76965c517 mysql5: Fix QA warnings, move .a files to staticdev
Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-04-04 20:36:45 +02:00
Otavio Salvador 59de020063 More quotting fixes
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-02-29 14:52:45 +01:00
Martin Jansa 8cd93743d7 Quoting fixes
* We have various variables which are either not quoted at all or are
* half quoted. This patch fixes the bad exmaples so everything is consistent.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-02-26 23:57:23 +01:00
Martin Jansa 7c435edd02 mysql5: PR bump after including *_config in default SSTATE_SCAN_FILES
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-02-24 09:53:23 +01:00
Martin Jansa d0028e40a3 recipes: bump PR to rebuild .la files without libz.la
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-02-13 16:59:29 +01:00
Koen Kooi c58cc7d379 move layer into meta-oe in preparation for future splits
As per TSC decision

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2011-03-17 21:41:22 +01:00