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/mysql | |
| parent | a64bd5b7e4e95d71c8dd5439ac30f2e3fbcff77a (diff) | |
| download | meta-openembedded-contrib-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/mysql')
| -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 0000000000..0530cd92ff --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch @@ -0,0 +1,44 @@ +storage: forbids absolute addresses on IA-32 + +The shared lib has relocations in .text +... +WARNING: QA Issue: ELF binary '/usr/lib/plugin/ha_xtradb.so.0.0.0' has relocations in .text +WARNING: QA Issue: ELF binary '/usr/lib/plugin/ha_innodb_plugin.so.0.0.0' has relocations in .text +... + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + storage/innodb_plugin/plug.in | 2 +- + storage/xtradb/plug.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/storage/innodb_plugin/plug.in b/storage/innodb_plugin/plug.in +--- a/storage/innodb_plugin/plug.in ++++ b/storage/innodb_plugin/plug.in +@@ -50,7 +50,7 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [ + ;; + *86) + # Use absolute addresses on IA-32 +- INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic" ++ # INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic" + ;; + esac + AC_SUBST(INNODB_DYNAMIC_CFLAGS) +diff --git a/storage/xtradb/plug.in b/storage/xtradb/plug.in +index a33f4dc..4c186fd 100644 +--- a/storage/xtradb/plug.in ++++ b/storage/xtradb/plug.in +@@ -51,7 +51,7 @@ MYSQL_PLUGIN_ACTIONS(xtradb, [ + ;; + *86) + # Use absolute addresses on IA-32 +- INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic" ++ # INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic" + ;; + esac + AC_SUBST(INNODB_DYNAMIC_CFLAGS) +-- +1.7.9.5 + 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 98d135f5f6..e66f215443 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 file://fix-cve-2013-1861-1.patch \ file://fix-cve-2013-1861-2.patch \ file://zlib-let-libdir-configurable.patch \ + file://storage-forbids-absolute-addresses-on-IA-32.patch \ file://my.cnf \ file://mysqld.sh" |