[oe] [meta-oe][PATCH] mariadb: 5.5.55 -> 5.5.57

Mon Aug 21 07:29:44 UTC 2017

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.

On Mon, Aug 21, 2017 at 6:46 AM, Martin Jansa <martin.jansa at gmail.com>
wrote:

> 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,
>
> On Mon, Aug 21, 2017 at 6:08 AM, Kang Kai <Kai.Kang at windriver.com> wrote:
>
>> 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
>>
>>
>>
>> On Fri, Aug 18, 2017 at 4:51 AM, Kang Kai <Kai.Kang at windriver.com> wrote:
>>
>>> On 2017年08月17日 17:28, kai.kang at windriver.com wrote:
>>>
>>>> From: Kai Kang <kai.kang at windriver.com>
>>>>
>>>> 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 doesn't provides source tarball of
>>>> 5.5.57
>>>> * remove gcc7.patch which is not needed any more
>>>>
>>>> Signed-off-by: Kai Kang <kai.kang at windriver.com>
>>>> ---
>>>>   .../{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%)
>>>>
>>>> diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb
>>>> b/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb
>>>> 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
>>>> 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=751419260a
>>>> a954499f7abaabaa882bbe"
>>>>   -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] = "cb94e315d0fc90c62db5a6c7829c9
>>>> 966f674285d99b3ba3ffa575fb4a26edc86"
>>>> +
>>>> +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
>>>> --- 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
>>>> b/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb
>>>> 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
>>> Openembedded-devel at lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>>
>>
>>
>> --
>> Regards,
>> Neil | Kai Kang
>>
>>
>