Patchwork [meta-oe] mariadb: move linker fix to .inc

login
register
mail settings
Submitter Koen Kooi
Date Feb. 19, 2014, 8:23 a.m.
Message ID <1392798218-17950-1-git-send-email-koen.kooi@linaro.org>
Download mbox | patch
Permalink /patch/66957/
State Accepted, archived
Headers show

Comments

Koen Kooi - Feb. 19, 2014, 8:23 a.m.
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>
---
 meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb | 3 ---
 meta-oe/recipes-support/mysql/mariadb_5.1.67.inc       | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)
Diego Sueiro - Feb. 19, 2014, 9:03 a.m.
On Wed, Feb 19, 2014 at 5:23 AM, Koen Kooi <koen.kooi@linaro.org> wrote:

> +           file://fix-link-error-ub1310.patch \
>

Should not the patch name and description to be modified since it is no
longer associated with Ubuntu 13.10?

Regards,

--
*dS
Diego Sueiro

Administrador do Embarcados
www.embarcados.com.br

/*long live rock 'n roll*/
Koen Kooi - Feb. 19, 2014, 9:23 a.m.
On 02/19/2014 10:03 AM, Diego Sueiro wrote:
>
> On Wed, Feb 19, 2014 at 5:23 AM, Koen Kooi <koen.kooi@linaro.org
> <mailto:koen.kooi@linaro.org>> wrote:
>
>     +           file://fix-link-error-ub1310.patch \
>
>
> Should not the patch name and description to be modified since it is no
> longer associated with Ubuntu 13.10?

To be honest: the patch shouldn't have gone in named like that, since 
it's a binutils problem, not an ubuntu problem.

You are correct that a renamed would be good, but I'm too lazy to do 
that right now :)

Patch

diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
index 15605d0..942afcc 100644
--- a/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
+++ b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
@@ -9,9 +9,6 @@  PACKAGES = ""
 EXTRA_OEMAKE = ""
 EXTRA_OECONF = " --with-embedded-server "
 
-SRC_URI += "file://fix-link-error-ub1310.patch \
-"
-
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
     mv -f ${D}${libdir}/mysql/* ${D}${libdir}
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 e311ed7..100b3a7 100644
--- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc
+++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc
@@ -17,7 +17,9 @@  SRC_URI = "http://mirrors.coreix.net/mariadb/mariadb-${PV}/kvm-tarbake-jaunty-x8
            file://storage-forbids-absolute-addresses-on-IA-32.patch \
            file://my.cnf \
            file://mysqld.sh \
-           file://avoid-plugin-options-warnings.patch"
+           file://avoid-plugin-options-warnings.patch \
+           file://fix-link-error-ub1310.patch \
+          "
 
 SRC_URI[md5sum] = "44c331fa91943155e4796f89e17a0612"
 SRC_URI[sha256sum] = "33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8"