Skip to contentSkip to conversation

mariadb: 5.5.55 -> 5.5.57

PATCH In review [email protected] 2 participants 7 messages Aug 17, 2017 – Aug 23, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mariadb: 5.5.55 -> 5.5.57

From: Kai Kang <[email protected]>

Upgrade mariadb from 5.5.55 to 5.5.57.

* update SRC_URI that mariadb.com doesn't provides source tarball of 5.5.57
* remove gcc7.patch which is not needed any more

---
 .../{mariadb-native_5.5.55.bb => mariadb-native_5.5.57.bb}  |  0
 meta-oe/recipes-support/mysql/mariadb.inc                   |  8 ++++----
 meta-oe/recipes-support/mysql/mariadb/gcc7.patch            | 13 -------------
 .../mysql/{mariadb_5.5.55.bb => mariadb_5.5.57.bb}          |  0
 4 files changed, 4 insertions(+), 17 deletions(-)
 rename meta-oe/recipes-support/mysql/{mariadb-native_5.5.55.bb => mariadb-native_5.5.57.bb} (100%)
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/gcc7.patch
 rename meta-oe/recipes-support/mysql/{mariadb_5.5.55.bb => mariadb_5.5.57.bb} (100%)
meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb renamed from meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb
rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb
meta-oe/recipes-support/mysql/mariadb.inc +4 -4
index fd9dcbd..32e3eaa 100644
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${PV}.tar.gz \
+SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \
            file://fix-cmake-module-path.patch \
            file://remove-bad-path.patch \
            file://fix-mysqlclient-r-version.patch \
@@ -17,10 +17,10 @@ SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P
            file://fix-a-building-failure.patch \
            file://change-cc-to-cc-version.patch \
            file://0001-disable-ucontext-on-musl.patch \
-           file://gcc7.patch \
           "
-SRC_URI[md5sum] = "54a0bbbc9b67308e7c076622d02f0fcd"
-SRC_URI[sha256sum] = "cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86"
+
+SRC_URI[md5sum] = "2d4104aae0b9e5efa8878918bd329cb4"
+SRC_URI[sha256sum] = "5dbde98d7e4a5a1721b6cbed7898b2549a88866247951cf586057975c6cea641"
 
 S = "${WORKDIR}/mariadb-${PV}"
 
meta-oe/recipes-support/mysql/mariadb/gcc7.patch deleted +0 -13
deleted file mode 100644
index 3e75b26..0000000
@@ -1,13 +0,0 @@
-Index: mariadb-5.5.55/client/mysql.cc
-===================================================================
---- mariadb-5.5.55.orig/client/mysql.cc
-+++ mariadb-5.5.55/client/mysql.cc
-@@ -2850,7 +2850,7 @@ You can turn off this feature to get a q
-         mysql_free_result(fields);
-         break;
-       }
--      field_names[i][num_fields*2]= '\0';
-+      field_names[i][num_fields*2][0]= '\0';
-       j=0;
-       while ((sql_field=mysql_fetch_field(fields)))
-       {
meta-oe/recipes-support/mysql/mariadb_5.5.57.bb renamed from meta-oe/recipes-support/mysql/mariadb_5.5.55.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb_5.5.55.bb
rename to meta-oe/recipes-support/mysql/mariadb_5.5.57.bb
Signature · 1 line
2.10.1
author
#1 lore raw
Quoted 3 lines · On 2017年08月17日 17:28, [email protected] wrote:

From: Kai Kang <[email protected]>

Upgrade mariadb from 5.5.55 to 5.5.57.

Forgot [meta-oe] in title. Sorry for inconvenience.

--Kai

Quoted 69 lines

* update SRC_URI that mariadb.com doesn't provides source tarball of 5.5.57
* remove gcc7.patch which is not needed any more

---
  .../{mariadb-native_5.5.55.bb => mariadb-native_5.5.57.bb}  |  0
  meta-oe/recipes-support/mysql/mariadb.inc                   |  8 ++++----
  meta-oe/recipes-support/mysql/mariadb/gcc7.patch            | 13 -------------
  .../mysql/{mariadb_5.5.55.bb => mariadb_5.5.57.bb}          |  0
  4 files changed, 4 insertions(+), 17 deletions(-)

rename meta-oe/recipes-support/mysql/{mariadb-native_5.5.55.bb => mariadb-native_5.5.57.bb} (100%) delete mode 100644 meta-oe/recipes-support/mysql/mariadb/gcc7.patch
rename meta-oe/recipes-support/mysql/{mariadb_5.5.55.bb => mariadb_5.5.57.bb} (100%)

meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb renamed from meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb
rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb
meta-oe/recipes-support/mysql/mariadb.inc +4 -4
index fd9dcbd..32e3eaa 100644
@@ -4,7 +4,7 @@ SECTION = "libs"
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${PV}.tar.gz \
+SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \
             file://fix-cmake-module-path.patch \
             file://remove-bad-path.patch \
             file://fix-mysqlclient-r-version.patch \
@@ -17,10 +17,10 @@ SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P
             file://fix-a-building-failure.patch \
             file://change-cc-to-cc-version.patch \
             file://0001-disable-ucontext-on-musl.patch \
-           file://gcc7.patch \
            "
-SRC_URI[md5sum] = "54a0bbbc9b67308e7c076622d02f0fcd"
-SRC_URI[sha256sum] = "cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86"
+
+SRC_URI[md5sum] = "2d4104aae0b9e5efa8878918bd329cb4"
+SRC_URI[sha256sum] = "5dbde98d7e4a5a1721b6cbed7898b2549a88866247951cf586057975c6cea641"
 
  S = "${WORKDIR}/mariadb-${PV}"
 
meta-oe/recipes-support/mysql/mariadb/gcc7.patch deleted +0 -13
deleted file mode 100644
index 3e75b26..0000000
@@ -1,13 +0,0 @@
-Index: mariadb-5.5.55/client/mysql.cc
-===================================================================
---- mariadb-5.5.55.orig/client/mysql.cc
-+++ mariadb-5.5.55/client/mysql.cc
-@@ -2850,7 +2850,7 @@ You can turn off this feature to get a q
-         mysql_free_result(fields);
-         break;
-       }
--      field_names[i][num_fields*2]= '\0';
-+      field_names[i][num_fields*2][0]= '\0';
-       j=0;
-       while ((sql_field=mysql_fetch_field(fields)))
-       {
meta-oe/recipes-support/mysql/mariadb_5.5.57.bb renamed from meta-oe/recipes-support/mysql/mariadb_5.5.55.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb_5.5.55.bb
rename to meta-oe/recipes-support/mysql/mariadb_5.5.57.bb
Signature · 2 lines
Regards,
Neil | Kai Kang
#2 lore raw

Like the previous version this one fails to build for qemuarm when security_flags.inc are enabled (maybe only in combination with gold and thumb), can you please look into it?

http://errors.yoctoproject.org/Errors/Details/152655/

Quoted 106 lines · Kang Kai
Quoted 4 lines · On 2017年08月17日 17:28, [email protected] wrote:

From: Kai Kang <[email protected]>

Upgrade mariadb from 5.5.55 to 5.5.57.

Forgot [meta-oe] in title. Sorry for inconvenience.

--Kai

meta-oe/recipes-support/mysql/mariadb_5.5.57.bb

Quoted 80 lines

* update SRC_URI that mariadb.com doesn't provides source tarball of 5.5.57
* remove gcc7.patch which is not needed any more

---
  .../{mariadb-native_5.5.55.bb => mariadb-native_5.5.57.bb}  |  0
  meta-oe/recipes-support/mysql/mariadb.inc                   |  8
++++----
  meta-oe/recipes-support/mysql/mariadb/gcc7.patch            | 13
-------------
  .../mysql/{mariadb_5.5.55.bb => mariadb_5.5.57.bb}          |  0
  4 files changed, 4 insertions(+), 17 deletions(-)

rename meta-oe/recipes-support/mysql/{mariadb-native_5.5.55.bb =>
mariadb-native_5.5.57.bb} (100%)
delete mode 100644 meta-oe/recipes-support/mysql/mariadb/gcc7.patch rename meta-oe/recipes-support/mysql/{mariadb_5.5.55.bb =>
mariadb_5.5.57.bb} (100%)

meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb renamed from meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb
rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb
meta-oe/recipes-support/mysql/mariadb.inc +0 -0
index fd9dcbd..32e3eaa 100644
@@ -4,7 +4,7 @@ SECTION = "libs"
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260a

a954499f7abaabaa882bbe"
-SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/m
ariadb-${PV}.tar.gz \

meta-oe/recipes-support/mysql/mariadb.inc +1 -0
+SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \
             file://fix-cmake-module-path.patch \
             file://remove-bad-path.patch \
             file://fix-mysqlclient-r-version.patch \
@@ -17,10 +17,10 @@ SRC_URI = "http://downloads.mariadb.com/

MariaDB/mariadb-${PV}/source/mariadb-${P

             file://fix-a-building-failure.patch \
             file://change-cc-to-cc-version.patch \
             file://0001-disable-ucontext-on-musl.patch \
meta-oe/recipes-support/mysql/mariadb.inc +0 -3
-           file://gcc7.patch \
            "
-SRC_URI[md5sum] = "54a0bbbc9b67308e7c076622d02f0fcd"
-SRC_URI[sha256sum] = "cb94e315d0fc90c62db5a6c7829c9

966f674285d99b3ba3ffa575fb4a26edc86"

meta-oe/recipes-support/mysql/mariadb.inc +3 -0
+
+SRC_URI[md5sum] = "2d4104aae0b9e5efa8878918bd329cb4"
+SRC_URI[sha256sum] = "5dbde98d7e4a5a1721b6cbed7898b

2549a88866247951cf586057975c6cea641"

    S = "${WORKDIR}/mariadb-${PV}"

diff --git a/meta-oe/recipes-support/mysql/mariadb/gcc7.patch
b/meta-oe/recipes-support/mysql/mariadb/gcc7.patch deleted file mode 100644
index 3e75b26..0000000

meta-oe/recipes-support/mysql/mariadb/gcc7.patch deleted +0 -13
@@ -1,13 +0,0 @@
-Index: mariadb-5.5.55/client/mysql.cc
-===================================================================
---- mariadb-5.5.55.orig/client/mysql.cc
-+++ mariadb-5.5.55/client/mysql.cc
-@@ -2850,7 +2850,7 @@ You can turn off this feature to get a q
-         mysql_free_result(fields);
-         break;
-       }
--      field_names[i][num_fields*2]= '\0';
-+      field_names[i][num_fields*2][0]= '\0';
-       j=0;
-       while ((sql_field=mysql_fetch_field(fields)))
-       {
meta-oe/recipes-support/mysql/mariadb_5.5.57.bb renamed from meta-oe/recipes-support/mysql/mariadb_5.5.55.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb_5.5.55.bb
rename to meta-oe/recipes-support/mysql/mariadb_5.5.57.bb

--
Regards,
Neil | Kai Kang

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

author
#3 lore raw
Quoted 3 lines · Martin Jansa

Like the previous version this one fails to build for qemuarm when security_flags.inc are enabled (maybe only in combination with gold and thumb), can you please look into it?

http://errors.yoctoproject.org/Errors/Details/152655/

I built qemuarm with following configures in local.conf and no failure.

require conf/distro/include/security_flags.inc

DISTRO_FEATURES_append = " ld-is-gold"

Any other configure did I miss? Thanks.

Regards,
Kai

Quoted 140 lines · On Fri, Aug 18, 2017 at 4:51 AM, Kang Kai <[email protected]…
    On 2017年08月17日 17:28, [email protected]
    <mailto:[email protected]> wrote:

        From: Kai Kang <[email protected]
        <mailto:[email protected]>>

        Upgrade mariadb from 5.5.55 to 5.5.57.


    Forgot [meta-oe] in title. Sorry for inconvenience.

    --Kai



        * update SRC_URI that mariadb.com <http://mariadb.com> doesn't
        provides source tarball of 5.5.57
        * remove gcc7.patch which is not needed any more

        Signed-off-by: Kai Kang <[email protected]
        <mailto:[email protected]>>
        ---
          .../{mariadb-native_5.5.55.bb
        <http://mariadb-native_5.5.55.bb> => mariadb-native_5.5.57.bb
        <http://mariadb-native_5.5.57.bb>} |  0
          meta-oe/recipes-support/mysql/mariadb.inc              |  8
        ++++----
          meta-oe/recipes-support/mysql/mariadb/gcc7.patch           |
        13 -------------
          .../mysql/{mariadb_5.5.55.bb <http://mariadb_5.5.55.bb> =>
        mariadb_5.5.57.bb <http://mariadb_5.5.57.bb>}         |  0
          4 files changed, 4 insertions(+), 17 deletions(-)
          rename
        meta-oe/recipes-support/mysql/{mariadb-native_5.5.55.bb
        <http://mariadb-native_5.5.55.bb> => mariadb-native_5.5.57.bb
        <http://mariadb-native_5.5.57.bb>} (100%)
          delete mode 100644
        meta-oe/recipes-support/mysql/mariadb/gcc7.patch
          rename meta-oe/recipes-support/mysql/{mariadb_5.5.55.bb
        <http://mariadb_5.5.55.bb> => mariadb_5.5.57.bb
        <http://mariadb_5.5.57.bb>} (100%)

        diff --git
        a/meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb
        <http://mariadb-native_5.5.55.bb>
        b/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb
        <http://mariadb-native_5.5.57.bb>
        similarity index 100%
        rename from
        meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb
        <http://mariadb-native_5.5.55.bb>
        rename to
        meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb
        <http://mariadb-native_5.5.57.bb>
        diff --git a/meta-oe/recipes-support/mysql/mariadb.inc
        b/meta-oe/recipes-support/mysql/mariadb.inc
        index fd9dcbd..32e3eaa 100644
        --- a/meta-oe/recipes-support/mysql/mariadb.inc
        +++ b/meta-oe/recipes-support/mysql/mariadb.inc
        @@ -4,7 +4,7 @@ SECTION = "libs"
          LICENSE = "GPLv2"
          LIC_FILES_CHKSUM =
        "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
          -SRC_URI =
        "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${PV}.tar.gz
        <http://downloads.mariadb.com/MariaDB/mariadb-$%7BPV%7D/source/mariadb-$%7BPV%7D.tar.gz>
        \
        +SRC_URI =
        "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz
        <https://downloads.mariadb.org/f/$%7BBP%7D/source/$%7BBP%7D.tar.gz>
        \
                     file://fix-cmake-module-path.patch \
                     file://remove-bad-path.patch \
                     file://fix-mysqlclient-r-version.patch \
        @@ -17,10 +17,10 @@ SRC_URI =
        "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P
        <http://downloads.mariadb.com/MariaDB/mariadb-$%7BPV%7D/source/mariadb-$%7BP>
                     file://fix-a-building-failure.patch \
                     file://change-cc-to-cc-version.patch \
                     file://0001-disable-ucontext-on-musl.patch \
        -           file://gcc7.patch \
                    "
        -SRC_URI[md5sum] = "54a0bbbc9b67308e7c076622d02f0fcd"
        -SRC_URI[sha256sum] =
        "cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86"
        +
        +SRC_URI[md5sum] = "2d4104aae0b9e5efa8878918bd329cb4"
        +SRC_URI[sha256sum] =
        "5dbde98d7e4a5a1721b6cbed7898b2549a88866247951cf586057975c6cea641"
            S = "${WORKDIR}/mariadb-${PV}"
          diff --git
        a/meta-oe/recipes-support/mysql/mariadb/gcc7.patch
        b/meta-oe/recipes-support/mysql/mariadb/gcc7.patch
        deleted file mode 100644
        index 3e75b26..0000000
        --- a/meta-oe/recipes-support/mysql/mariadb/gcc7.patch
        +++ /dev/null
        @@ -1,13 +0,0 @@
        -Index: mariadb-5.5.55/client/mysql.cc
        -===================================================================
        ---- mariadb-5.5.55.orig/client/mysql.cc
        -+++ mariadb-5.5.55/client/mysql.cc
        -@@ -2850,7 +2850,7 @@ You can turn off this feature to get a q
        -         mysql_free_result(fields);
        -         break;
        -       }
        --      field_names[i][num_fields*2]= '\0';
        -+      field_names[i][num_fields*2][0]= '\0';
        -       j=0;
        -       while ((sql_field=mysql_fetch_field(fields)))
        -       {
        diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.55.bb
        <http://mariadb_5.5.55.bb>
        b/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb
        <http://mariadb_5.5.57.bb>
        similarity index 100%
        rename from meta-oe/recipes-support/mysql/mariadb_5.5.55.bb
        <http://mariadb_5.5.55.bb>
        rename to meta-oe/recipes-support/mysql/mariadb_5.5.57.bb
        <http://mariadb_5.5.57.bb>



    -- 
    Regards,
    Neil | Kai Kang


    -- 
    _______________________________________________
    Openembedded-devel mailing list
    [email protected]
    <mailto:[email protected]>
    http://lists.openembedded.org/mailman/listinfo/openembedded-devel
    <http://lists.openembedded.org/mailman/listinfo/openembedded-devel>
Signature · 2 lines
Regards,
Neil | Kai Kang
#4 lore raw

Hi,

the security_flags.inc:

require conf/distro/include/security_flags.inc

and if still doesn't reproduce than last bit is thumb:

PREFERRED_ARM_INSTRUCTION_SET ?= "thumb"
ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"

Regards,

Quoted 139 lines · Kang Kai

On 2017年08月21日 07:48, Martin Jansa wrote:

Like the previous version this one fails to build for qemuarm when security_flags.inc are enabled (maybe only in combination with gold and thumb), can you please look into it?

http://errors.yoctoproject.org/Errors/Details/152655/

I built qemuarm with following configures in local.conf and no failure.

require conf/distro/include/security_flags.inc

DISTRO_FEATURES_append = " ld-is-gold"

Any other configure did I miss? Thanks.

Regards,
Kai

Quoted 100 lines · Kang Kai
Quoted 4 lines · On 2017年08月17日 17:28, [email protected] wrote:

From: Kai Kang <[email protected]>

Upgrade mariadb from 5.5.55 to 5.5.57.

Forgot [meta-oe] in title. Sorry for inconvenience.

--Kai

meta-oe/recipes-support/mysql/mariadb_5.5.57.bb

Quoted 80 lines

* update SRC_URI that mariadb.com doesn't provides source tarball of 5.5.57
* remove gcc7.patch which is not needed any more

---
  .../{mariadb-native_5.5.55.bb => mariadb-native_5.5.57.bb}  |  0
  meta-oe/recipes-support/mysql/mariadb.inc                   |  8
++++----
  meta-oe/recipes-support/mysql/mariadb/gcc7.patch            | 13
-------------
  .../mysql/{mariadb_5.5.55.bb => mariadb_5.5.57.bb}          |  0
  4 files changed, 4 insertions(+), 17 deletions(-)

rename meta-oe/recipes-support/mysql/{mariadb-native_5.5.55.bb =>
mariadb-native_5.5.57.bb} (100%)
delete mode 100644 meta-oe/recipes-support/mysql/mariadb/gcc7.patch rename meta-oe/recipes-support/mysql/{mariadb_5.5.55.bb =>
mariadb_5.5.57.bb} (100%)

meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb renamed from meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb
rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb
meta-oe/recipes-support/mysql/mariadb.inc +0 -0
index fd9dcbd..32e3eaa 100644
@@ -4,7 +4,7 @@ SECTION = "libs"
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260a

a954499f7abaabaa882bbe"
-SRC_URI = "http://downloads.mariadb.com/
MariaDB/mariadb-${PV}/source/mariadb-${PV}.tar.gz \

meta-oe/recipes-support/mysql/mariadb.inc +1 -0
+SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \
             file://fix-cmake-module-path.patch \
             file://remove-bad-path.patch \
             file://fix-mysqlclient-r-version.patch \
@@ -17,10 +17,10 @@ SRC_URI = "http://downloads.mariadb.com/

MariaDB/mariadb-${PV}/source/mariadb-${P

             file://fix-a-building-failure.patch \
             file://change-cc-to-cc-version.patch \
             file://0001-disable-ucontext-on-musl.patch \
meta-oe/recipes-support/mysql/mariadb.inc +0 -3
-           file://gcc7.patch \
            "
-SRC_URI[md5sum] = "54a0bbbc9b67308e7c076622d02f0fcd"
-SRC_URI[sha256sum] = "cb94e315d0fc90c62db5a6c7829c9

966f674285d99b3ba3ffa575fb4a26edc86"

meta-oe/recipes-support/mysql/mariadb.inc +3 -0
+
+SRC_URI[md5sum] = "2d4104aae0b9e5efa8878918bd329cb4"
+SRC_URI[sha256sum] = "5dbde98d7e4a5a1721b6cbed7898b

2549a88866247951cf586057975c6cea641"

    S = "${WORKDIR}/mariadb-${PV}"

diff --git a/meta-oe/recipes-support/mysql/mariadb/gcc7.patch
b/meta-oe/recipes-support/mysql/mariadb/gcc7.patch deleted file mode 100644
index 3e75b26..0000000

meta-oe/recipes-support/mysql/mariadb/gcc7.patch deleted +0 -13
@@ -1,13 +0,0 @@
-Index: mariadb-5.5.55/client/mysql.cc
-===================================================================
---- mariadb-5.5.55.orig/client/mysql.cc
-+++ mariadb-5.5.55/client/mysql.cc
-@@ -2850,7 +2850,7 @@ You can turn off this feature to get a q
-         mysql_free_result(fields);
-         break;
-       }
--      field_names[i][num_fields*2]= '\0';
-+      field_names[i][num_fields*2][0]= '\0';
-       j=0;
-       while ((sql_field=mysql_fetch_field(fields)))
-       {
meta-oe/recipes-support/mysql/mariadb_5.5.57.bb renamed from meta-oe/recipes-support/mysql/mariadb_5.5.55.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb_5.5.55.bb
rename to meta-oe/recipes-support/mysql/mariadb_5.5.57.bb

--
Regards,
Neil | Kai Kang

Quoted 6 lines

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

--
Regards,
Neil | Kai Kang

#5 lore raw

I've quickly tried it on the jenkins builder and without thumb it builds ok.

So if you don't want to dig what wents wrong in our toolchain when security_flags.inc is used, you can just add:

ARM_INSTRUCTION_SET_armv4 = "arm"
ARM_INSTRUCTION_SET_armv5 = "arm"

and check if it builds with some armv7a with thumb enabled, or

ARM_INSTRUCTION_SET = "arm"

if it fails for armv7a as well. And include link to this thread + error log or something like that.

Quoted 155 lines · Martin Jansa

Hi,

the security_flags.inc:

require conf/distro/include/security_flags.inc

and if still doesn't reproduce than last bit is thumb:

PREFERRED_ARM_INSTRUCTION_SET ?= "thumb"
ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"

Regards,

Quoted 139 lines · Kang Kai

On 2017年08月21日 07:48, Martin Jansa wrote:

Like the previous version this one fails to build for qemuarm when security_flags.inc are enabled (maybe only in combination with gold and thumb), can you please look into it?

http://errors.yoctoproject.org/Errors/Details/152655/

I built qemuarm with following configures in local.conf and no failure.

require conf/distro/include/security_flags.inc

DISTRO_FEATURES_append = " ld-is-gold"

Any other configure did I miss? Thanks.

Regards,
Kai

Quoted 100 lines · Kang Kai
Quoted 4 lines · On 2017年08月17日 17:28, [email protected] wrote:

From: Kai Kang <[email protected]>

Upgrade mariadb from 5.5.55 to 5.5.57.

Forgot [meta-oe] in title. Sorry for inconvenience.

--Kai

meta-oe/recipes-support/mysql/mariadb_5.5.57.bb

Quoted 80 lines

* update SRC_URI that mariadb.com doesn't provides source tarball of 5.5.57
* remove gcc7.patch which is not needed any more

---
  .../{mariadb-native_5.5.55.bb => mariadb-native_5.5.57.bb}  |  0
  meta-oe/recipes-support/mysql/mariadb.inc                   |  8
++++----
  meta-oe/recipes-support/mysql/mariadb/gcc7.patch            | 13
-------------
  .../mysql/{mariadb_5.5.55.bb => mariadb_5.5.57.bb}          |  0
  4 files changed, 4 insertions(+), 17 deletions(-)

rename meta-oe/recipes-support/mysql/{mariadb-native_5.5.55.bb =>
mariadb-native_5.5.57.bb} (100%)
delete mode 100644 meta-oe/recipes-support/mysql/mariadb/gcc7.patch rename meta-oe/recipes-support/mysql/{mariadb_5.5.55.bb =>
mariadb_5.5.57.bb} (100%)

meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb renamed from meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb
rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb
meta-oe/recipes-support/mysql/mariadb.inc +0 -0
index fd9dcbd..32e3eaa 100644
@@ -4,7 +4,7 @@ SECTION = "libs"
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260a

a954499f7abaabaa882bbe"
-SRC_URI = "http://downloads.mariadb.com/
MariaDB/mariadb-${PV}/source/mariadb-${PV}.tar.gz \

meta-oe/recipes-support/mysql/mariadb.inc +1 -0
+SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \
             file://fix-cmake-module-path.patch \
             file://remove-bad-path.patch \
             file://fix-mysqlclient-r-version.patch \
@@ -17,10 +17,10 @@ SRC_URI = "http://downloads.mariadb.com/

MariaDB/mariadb-${PV}/source/mariadb-${P

             file://fix-a-building-failure.patch \
             file://change-cc-to-cc-version.patch \
             file://0001-disable-ucontext-on-musl.patch \
meta-oe/recipes-support/mysql/mariadb.inc +0 -3
-           file://gcc7.patch \
            "
-SRC_URI[md5sum] = "54a0bbbc9b67308e7c076622d02f0fcd"
-SRC_URI[sha256sum] = "cb94e315d0fc90c62db5a6c7829c9

966f674285d99b3ba3ffa575fb4a26edc86"

meta-oe/recipes-support/mysql/mariadb.inc +3 -0
+
+SRC_URI[md5sum] = "2d4104aae0b9e5efa8878918bd329cb4"
+SRC_URI[sha256sum] = "5dbde98d7e4a5a1721b6cbed7898b

2549a88866247951cf586057975c6cea641"

    S = "${WORKDIR}/mariadb-${PV}"

diff --git a/meta-oe/recipes-support/mysql/mariadb/gcc7.patch
b/meta-oe/recipes-support/mysql/mariadb/gcc7.patch deleted file mode 100644
index 3e75b26..0000000

meta-oe/recipes-support/mysql/mariadb/gcc7.patch deleted +0 -13
@@ -1,13 +0,0 @@
-Index: mariadb-5.5.55/client/mysql.cc
-===================================================================
---- mariadb-5.5.55.orig/client/mysql.cc
-+++ mariadb-5.5.55/client/mysql.cc
-@@ -2850,7 +2850,7 @@ You can turn off this feature to get a q
-         mysql_free_result(fields);
-         break;
-       }
--      field_names[i][num_fields*2]= '\0';
-+      field_names[i][num_fields*2][0]= '\0';
-       j=0;
-       while ((sql_field=mysql_fetch_field(fields)))
-       {
meta-oe/recipes-support/mysql/mariadb_5.5.57.bb renamed from meta-oe/recipes-support/mysql/mariadb_5.5.55.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb_5.5.55.bb
rename to meta-oe/recipes-support/mysql/mariadb_5.5.57.bb

--
Regards,
Neil | Kai Kang

Quoted 6 lines

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

--
Regards,
Neil | Kai Kang

author
#6 lore raw
In reply to Martin Jansa
Quoted 10 lines · Martin Jansa

Hi,

the security_flags.inc:

require conf/distro/include/security_flags.inc

and if still doesn't reproduce than last bit is thumb:

PREFERRED_ARM_INSTRUCTION_SET ?= "thumb"
ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"

Hi Martin,

Thanks. I can reproduce the failure and I'll try to figure out the root cause.

--Kai

Quoted 180 lines

Regards,

On Mon, Aug 21, 2017 at 6:08 AM, Kang Kai <[email protected] <mailto:[email protected]>> wrote:

    On 2017年08月21日 07:48, Martin Jansa wrote:
Quoted 6 lines

Like the previous version this one fails to build for qemuarm when security_flags.inc are enabled (maybe only in combination with gold and thumb), can you please look into it?

http://errors.yoctoproject.org/Errors/Details/152655/
<http://errors.yoctoproject.org/Errors/Details/152655/>

I built qemuarm with following configures in local.conf and no failure.

require conf/distro/include/security_flags.inc

DISTRO_FEATURES_append = " ld-is-gold"

Any other configure did I miss? Thanks.

Regards,
Kai

Quoted 137 lines
    On Fri, Aug 18, 2017 at 4:51 AM, Kang Kai <[email protected]
    <mailto:[email protected]>> wrote:

        On 2017年08月17日 17:28, [email protected]
        <mailto:[email protected]> wrote:

            From: Kai Kang <[email protected]
            <mailto:[email protected]>>

            Upgrade mariadb from 5.5.55 to 5.5.57.


        Forgot [meta-oe] in title. Sorry for inconvenience.

        --Kai



            * update SRC_URI that mariadb.com <http://mariadb.com>
            doesn't provides source tarball of 5.5.57
            * remove gcc7.patch which is not needed any more

            Signed-off-by: Kai Kang <[email protected]
            <mailto:[email protected]>>
            ---
              .../{mariadb-native_5.5.55.bb
            <http://mariadb-native_5.5.55.bb> =>
            mariadb-native_5.5.57.bb
            <http://mariadb-native_5.5.57.bb>} |  0
              meta-oe/recipes-support/mysql/mariadb.inc              
               |  8 ++++----
              meta-oe/recipes-support/mysql/mariadb/gcc7.patch      
                | 13 -------------
              .../mysql/{mariadb_5.5.55.bb <http://mariadb_5.5.55.bb>
            => mariadb_5.5.57.bb <http://mariadb_5.5.57.bb>}         |  0
              4 files changed, 4 insertions(+), 17 deletions(-)
              rename
            meta-oe/recipes-support/mysql/{mariadb-native_5.5.55.bb
            <http://mariadb-native_5.5.55.bb> =>
            mariadb-native_5.5.57.bb
            <http://mariadb-native_5.5.57.bb>} (100%)
              delete mode 100644
            meta-oe/recipes-support/mysql/mariadb/gcc7.patch
              rename meta-oe/recipes-support/mysql/{mariadb_5.5.55.bb
            <http://mariadb_5.5.55.bb> => mariadb_5.5.57.bb
            <http://mariadb_5.5.57.bb>} (100%)

            diff --git
            a/meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb
            <http://mariadb-native_5.5.55.bb>
            b/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb
            <http://mariadb-native_5.5.57.bb>
            similarity index 100%
            rename from
            meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb
            <http://mariadb-native_5.5.55.bb>
            rename to
            meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb
            <http://mariadb-native_5.5.57.bb>
            diff --git a/meta-oe/recipes-support/mysql/mariadb.inc
            b/meta-oe/recipes-support/mysql/mariadb.inc
            index fd9dcbd..32e3eaa 100644
            --- a/meta-oe/recipes-support/mysql/mariadb.inc
            +++ b/meta-oe/recipes-support/mysql/mariadb.inc
            @@ -4,7 +4,7 @@ SECTION = "libs"
              LICENSE = "GPLv2"
              LIC_FILES_CHKSUM =
            "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
              -SRC_URI =
            "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${PV}.tar.gz
            <http://downloads.mariadb.com/MariaDB/mariadb-$%7BPV%7D/source/mariadb-$%7BPV%7D.tar.gz>
            \
            +SRC_URI =
            "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz
            <https://downloads.mariadb.org/f/$%7BBP%7D/source/$%7BBP%7D.tar.gz>
            \
            file://fix-cmake-module-path.patch \
            file://remove-bad-path.patch \
            file://fix-mysqlclient-r-version.patch \
            @@ -17,10 +17,10 @@ SRC_URI =
            "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P
            <http://downloads.mariadb.com/MariaDB/mariadb-$%7BPV%7D/source/mariadb-$%7BP>
            file://fix-a-building-failure.patch \
            file://change-cc-to-cc-version.patch \
            file://0001-disable-ucontext-on-musl.patch \
            - file://gcc7.patch \
                        "
            -SRC_URI[md5sum] = "54a0bbbc9b67308e7c076622d02f0fcd"
            -SRC_URI[sha256sum] =
            "cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86"
            +
            +SRC_URI[md5sum] = "2d4104aae0b9e5efa8878918bd329cb4"
            +SRC_URI[sha256sum] =
            "5dbde98d7e4a5a1721b6cbed7898b2549a88866247951cf586057975c6cea641"
                S = "${WORKDIR}/mariadb-${PV}"
              diff --git
            a/meta-oe/recipes-support/mysql/mariadb/gcc7.patch
            b/meta-oe/recipes-support/mysql/mariadb/gcc7.patch
            deleted file mode 100644
            index 3e75b26..0000000
            --- a/meta-oe/recipes-support/mysql/mariadb/gcc7.patch
            +++ /dev/null
            @@ -1,13 +0,0 @@
            -Index: mariadb-5.5.55/client/mysql.cc
            -===================================================================
            ---- mariadb-5.5.55.orig/client/mysql.cc
            -+++ mariadb-5.5.55/client/mysql.cc
            -@@ -2850,7 +2850,7 @@ You can turn off this feature to
            get a q
            -         mysql_free_result(fields);
            -         break;
            -       }
            --      field_names[i][num_fields*2]= '\0';
            -+      field_names[i][num_fields*2][0]= '\0';
            -       j=0;
            -       while ((sql_field=mysql_fetch_field(fields)))
            -       {
            diff --git
            a/meta-oe/recipes-support/mysql/mariadb_5.5.55.bb
            <http://mariadb_5.5.55.bb>
            b/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb
            <http://mariadb_5.5.57.bb>
            similarity index 100%
            rename from
            meta-oe/recipes-support/mysql/mariadb_5.5.55.bb
            <http://mariadb_5.5.55.bb>
            rename to meta-oe/recipes-support/mysql/mariadb_5.5.57.bb
            <http://mariadb_5.5.57.bb>



        -- 
        Regards,
        Neil | Kai Kang
Quoted 9 lines
        -- 
        _______________________________________________
        Openembedded-devel mailing list
        [email protected]
        <mailto:[email protected]>
        http://lists.openembedded.org/mailman/listinfo/openembedded-devel
        <http://lists.openembedded.org/mailman/listinfo/openembedded-devel>

--
Regards,
Neil | Kai Kang

Signature · 2 lines
Regards,
Neil | Kai Kang