diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-devtools/perl | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/perl')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch | 53 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb | 1 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb) | 4 |
3 files changed, 56 insertions, 2 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch new file mode 100644 index 0000000000..60d88c3d1a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Use-API-function-for-reconnect.patch @@ -0,0 +1,53 @@ +From edb6b202b7e233864aa5dd84532646c50097b0b8 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Mon, 4 Mar 2019 00:49:17 -0800 +Subject: [PATCH] Use API function for reconnect + +For configuring reconnect functionality use standard API function +MYSQL_OPT_RECONNECT instead of direct modification of internal structures +which does not work for MariaDB. Fixes compilation with MariaDB 10.2.6+. + +Upstream-Status: Backport [https://github.com/perl5-dbi/DBD-mysql/commit/0b1884f4153d3de0a91bae4d3b3cc1771ffdf4f3] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + dbdimp.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/dbdimp.c b/dbdimp.c +index 9b8b313..3bed213 100644 +--- a/dbdimp.c ++++ b/dbdimp.c +@@ -1979,6 +1979,16 @@ MYSQL *mysql_dr_connect( + + if (result) + { ++ /* ++ we turn off Mysql's auto reconnect and handle re-connecting ourselves ++ so that we can keep track of when this happens. ++ */ ++#if MYSQL_VERSION_ID >= 50013 ++ my_bool reconnect = FALSE; ++ mysql_options(result, MYSQL_OPT_RECONNECT, &reconnect); ++#else ++ result->reconnect = 0; ++#endif + #if MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION + /* connection succeeded. */ + /* imp_dbh == NULL when mysql_dr_connect() is called from mysql.xs +@@ -1992,12 +2002,6 @@ MYSQL *mysql_dr_connect( + imp_dbh->async_query_in_flight = NULL; + } + #endif +- +- /* +- we turn off Mysql's auto reconnect and handle re-connecting ourselves +- so that we can keep track of when this happens. +- */ +- result->reconnect=0; + } + else { + /* +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb index bd8ba780ae..e185f48f76 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb @@ -15,6 +15,7 @@ DEPENDS += "libdbi-perl-native libmysqlclient" LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/DBD-mysql-${PV}.tar.gz \ + file://0001-Use-API-function-for-reconnect.patch \ " SRC_URI[md5sum] = "4a00dd7f1c057931147c65dfc4901c36" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb index 24a1245fc0..3c031646b6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb @@ -16,8 +16,8 @@ RDEPENDS_${PN} = " perl-module-carp \ LIC_FILES_CHKSUM = "file://LICENSE;md5=10982c7148e0a012c0fd80534522f5c5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-${PV}.tar.gz" -SRC_URI[md5sum] = "e77fd37fcf77fc88fde029c1b75ded54" -SRC_URI[sha256sum] = "5509e532cdd0e3d91eda550578deaac29e2f008a12b64576e8c261bb92e8c2c1" +SRC_URI[md5sum] = "f2ba18b5cea1c8cb322a62be0a847f3d" +SRC_URI[sha256sum] = "3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d" S = "${WORKDIR}/DBI-${PV}" |