Skip to contentSkip to conversation

mariadb: fix QA Issue ELF binary has relocations in .text while multilib enabled

PATCH In review Hongxu Jia 1 participant 3 messages Nov 15, 2013

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

cover mariadb: fix QA Issue ELF binary has relocations in .text while multilib enabled

The following changes since commit 20f352810d46daea9a20989b77f347fb8564ebf0:

cherokee: use cherokee-project.de mirror (2013-11-11 13:11:15 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/fix-mariadb-qa
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-mariadb-qa

Hongxu Jia (1):
mariadb: fix QA Issue ELF binary has relocations in .text while
multilib enabled

 ...orage-forbids-absolute-addresses-on-IA-32.patch | 44 ++++++++++++++++++++++
 meta-oe/recipes-support/mysql/mariadb_5.1.67.inc   |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 1/1 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.

---
 ...orage-forbids-absolute-addresses-on-IA-32.patch | 44 ++++++++++++++++++++++
 meta-oe/recipes-support/mysql/mariadb_5.1.67.inc   |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch
meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch new file +44 -0
new file mode 100644
index 0000000..0530cd9
@@ -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 <[email protected]>
+---
+ 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
+
meta-oe/recipes-support/mysql/mariadb_5.1.67.inc +1 -0
index 98d135f..e66f215 100644
@@ -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"
 
Signature · 1 line
1.8.1.2
author
#2 lore raw
Quoted 35 lines · Hongxu Jia

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.

---
  ...orage-forbids-absolute-addresses-on-IA-32.patch | 44 ++++++++++++++++++++++
  meta-oe/recipes-support/mysql/mariadb_5.1.67.inc   |  1 +
  2 files changed, 45 insertions(+)

create mode 100644 meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch

meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch new file +15 -0
new file mode 100644
index 0000000..0530cd9
@@ -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 <[email protected]>
+---
+ storage/innodb_plugin/plug.in |    2 +-
+ storage/xtradb/plug.in        |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)

meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch line 25

Quoted 10 lines
meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch new file +10 -0
+
+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"

No need to keep it in comments, just remove it.
I have done the modification in git:

http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-mariadb-qa

//Hongxu

Quoted 31 lines
meta-oe/recipes-support/mysql/mariadb/storage-forbids-absolute-addresses-on-IA-32.patch new file +19 -0
+ 		;;
+   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
+
meta-oe/recipes-support/mysql/mariadb_5.1.67.inc +1 -0
index 98d135f..e66f215 100644
@@ -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"