diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2013-11-15 16:33:06 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-11-18 23:14:09 +0100 |
commit | baa94eb95116f4f578aaebd5d4a2620e57377fec (patch) | |
tree | a991ad4e2b64bdb247b5acd1306bbc0732e434c0 /meta-oe/recipes-support | |
parent | a64bd5b7e4e95d71c8dd5439ac30f2e3fbcff77a (diff) | |
download | meta-openembedded-baa94eb95116f4f578aaebd5d4a2620e57377fec.tar.gz |
mariadb: fix QA Issue ELF binary has relocations in .text while multilib enabled
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>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch | 44 | ||||
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb_5.1.67.inc | 1 |
2 files changed, 45 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch b/meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch new file mode 100644 index 000000000..0530cd92f --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | storage: forbids absolute addresses on IA-32 | ||
2 | |||
3 | The shared lib has relocations in .text | ||
4 | ... | ||
5 | WARNING: QA Issue: ELF binary '/usr/lib/plugin/ha_xtradb.so.0.0.0' has relocations in .text | ||
6 | WARNING: QA Issue: ELF binary '/usr/lib/plugin/ha_innodb_plugin.so.0.0.0' has relocations in .text | ||
7 | ... | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
12 | --- | ||
13 | storage/innodb_plugin/plug.in | 2 +- | ||
14 | storage/xtradb/plug.in | 2 +- | ||
15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/storage/innodb_plugin/plug.in b/storage/innodb_plugin/plug.in | ||
18 | --- a/storage/innodb_plugin/plug.in | ||
19 | +++ b/storage/innodb_plugin/plug.in | ||
20 | @@ -50,7 +50,7 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [ | ||
21 | ;; | ||
22 | *86) | ||
23 | # Use absolute addresses on IA-32 | ||
24 | - INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic" | ||
25 | + # INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic" | ||
26 | ;; | ||
27 | esac | ||
28 | AC_SUBST(INNODB_DYNAMIC_CFLAGS) | ||
29 | diff --git a/storage/xtradb/plug.in b/storage/xtradb/plug.in | ||
30 | index a33f4dc..4c186fd 100644 | ||
31 | --- a/storage/xtradb/plug.in | ||
32 | +++ b/storage/xtradb/plug.in | ||
33 | @@ -51,7 +51,7 @@ MYSQL_PLUGIN_ACTIONS(xtradb, [ | ||
34 | ;; | ||
35 | *86) | ||
36 | # Use absolute addresses on IA-32 | ||
37 | - INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic" | ||
38 | + # INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic" | ||
39 | ;; | ||
40 | esac | ||
41 | AC_SUBST(INNODB_DYNAMIC_CFLAGS) | ||
42 | -- | ||
43 | 1.7.9.5 | ||
44 | |||
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc index 98d135f5f..e66f21544 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc +++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc | |||
@@ -16,6 +16,7 @@ SRC_URI = "http://mirrors.coreix.net/mariadb/mariadb-${PV}/kvm-tarbake-jaunty-x8 | |||
16 | file://fix-cve-2013-1861-1.patch \ | 16 | file://fix-cve-2013-1861-1.patch \ |
17 | file://fix-cve-2013-1861-2.patch \ | 17 | file://fix-cve-2013-1861-2.patch \ |
18 | file://zlib-let-libdir-configurable.patch \ | 18 | file://zlib-let-libdir-configurable.patch \ |
19 | file://storage-forbids-absolute-addresses-on-IA-32.patch \ | ||
19 | file://my.cnf \ | 20 | file://my.cnf \ |
20 | file://mysqld.sh" | 21 | file://mysqld.sh" |
21 | 22 | ||