diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-dbs/mysql | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-dbs/mysql')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.62.bb (renamed from meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb) | 0 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc | 14 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_5.5.62.bb (renamed from meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb) | 0 |
3 files changed, 7 insertions, 7 deletions
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.62.bb index 4ce960d7d..4ce960d7d 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.62.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 99e705094..8ca5b2ba4 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -18,9 +18,10 @@ SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \ file://change-cc-to-cc-version.patch \ file://0001-disable-ucontext-on-musl.patch \ " +SRC_URI[md5sum] = "6375d577e9539b839f44d857e70f82b9" +SRC_URI[sha256sum] = "56a365af71b8a9ec8bfee0801e2dec95011da8ee7507986ca329be11296411db" -SRC_URI[md5sum] = "3cec4afc06b468687ef576c90148d10d" -SRC_URI[sha256sum] = "c3269ce20b45b177239fd1e3d6d9428a94131711f12758ebf5f65222278bb110" +UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" S = "${WORKDIR}/mariadb-${PV}" @@ -161,13 +162,15 @@ do_install() { } PACKAGES = "${PN}-dbg ${PN} \ - libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \ - libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \ + libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev \ + libmysqlclient libmysqlclient-dev libmysqlclient-staticdev \ libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-setupdb ${PN}-leftovers" CONFFILES_${PN}-server += "${sysconfdir}/my.cnf ${sysconfdir}/my.cnf.d/server.cnf" CONFFILES_${PN}-client += "${sysconfdir}/my.cnf.d/mysql-clients.cnf" CONFFILES_libmysqlclient += "${sysconfdir}/my.cnf.d/client.cnf" +RPROVIDES_${PN}-dbg += "libmysqlclient-r-dbg libmysqlclient-dbg" + FILES_${PN} = " " RDEPENDS_${PN} = "${PN}-client ${PN}-server" ALLOW_EMPTY_${PN} = "1" @@ -200,8 +203,6 @@ FILES_libmysqlclient-dev = " \ ${bindir}/mysql_config" FILES_libmysqlclient-staticdev = "\ ${libdir}/*.a" -FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \ - ${datadir}/mysql-test/lib/My/SafeProcess/.debug/my_safe_process" # Avoid warnings about ha_xtradb.so.0.0.0 and ha_innodb_plugin.so.0.0.0 # which are intentionally non-PIC on 32-bit x86 (see e.g. @@ -212,7 +213,6 @@ FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*" FILES_libmysqlclient-r-dev = "\ ${libdir}/libmysqlclient_r.so" FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a" -FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*" FILES_libmysqld = "\ ${libdir}/libmysqld.so.*" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_5.5.62.bb index d7895732a..d7895732a 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_5.5.62.bb |