diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-dbs')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb (renamed from meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb (renamed from meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.2.bb) | 0 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc | 8 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch | 41 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb (renamed from meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.2.bb) | 0 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_15.3.bb | 4 |
6 files changed, 17 insertions, 38 deletions
diff --git a/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb b/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb index 35242bedb6..b2f1920f6b 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1;protocol=https \ file://0001-make-set-soname-on-liblmdb.patch;patchdir=../.. \ " -SRCREV = "8ad7be2510414b9506ec9f9e24f24d04d9b04a1a" +SRCREV = "ce201088de95d26fc0da36ba805bf2ddc2ba74ff" inherit ptest diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.2.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb index 578357b480..578357b480 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.2.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 57930dae39..2fb0bd7be5 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -25,7 +25,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "1c89dee0caed0f68bc2a1d203eb98a123150e6a179f6ee0f1fc0ba3f08dc71dc" +SRC_URI[sha256sum] = "ce8dac125568cc5f40da74c17212767c92d8faed81066580b526a485a591127d" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -110,6 +110,11 @@ OECMAKE_GENERATOR = "Unix Makefiles" ARM_INSTRUCTION_SET:armv4 = "arm" ARM_INSTRUCTION_SET:armv5 = "arm" +do_compile:prepend:class-target () { + # remove the buildpath + sed -i -e "s:CMAKE_SYSROOT:CMAKE_SYSROOT_PLACE_HOLDER:g" ${S}/libmariadb/mariadb_config/mariadb_config.c.in +} + do_configure:append() { # handle distros with different values of ${libexecdir} libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'` @@ -140,6 +145,7 @@ do_compile:prepend:class-target () { echo "#endif" >>${B}/include/openssl/kssl.h fi fi + install -D ${RECIPE_SYSROOT_NATIVE}/usr/bin/uca-dump ${B}/strings/uca-dump } SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch index 7c37fef493..12fbd75976 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -1,4 +1,4 @@ -From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001 +From 68100b1f2243304289b9a9a35e8fb0e1bb0cf70f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 24 Jan 2023 21:40:43 -0800 Subject: [PATCH] Add missing includes <cstdint> and <cstdio> @@ -9,17 +9,16 @@ This is needed with GCC 13 and newer [1] Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 + storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + storage/rocksdb/rocksdb/util/slice.cc | 1 + - storage/rocksdb/rocksdb/util/string_util.h | 1 + - tpool/aio_linux.cc | 1 + - 6 files changed, 6 insertions(+) + 4 files changed, 4 insertions(+) diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h -index 963c1d8eb49..73487edd96d 100644 +index 963c1d8e..73487edd 100644 --- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h +++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h @@ -5,6 +5,7 @@ @@ -31,7 +30,7 @@ index 963c1d8eb49..73487edd96d 100644 struct CompactionIterationStats { diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h -index c7f93b4cfcd..3c2ab80535a 100644 +index c7f93b4c..3c2ab805 100644 --- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h +++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h @@ -8,6 +8,7 @@ @@ -43,7 +42,7 @@ index c7f93b4cfcd..3c2ab80535a 100644 #include <vector> #include "rocksdb/status.h" diff --git a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h -index f356395f329..3215221755d 100644 +index f356395f..32152217 100644 --- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h +++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h @@ -5,6 +5,7 @@ @@ -55,7 +54,7 @@ index f356395f329..3215221755d 100644 #include <vector> diff --git a/storage/rocksdb/rocksdb/util/slice.cc b/storage/rocksdb/rocksdb/util/slice.cc -index 6db11cc947a..c26b6a21a57 100644 +index 6db11cc9..c26b6a21 100644 --- a/storage/rocksdb/rocksdb/util/slice.cc +++ b/storage/rocksdb/rocksdb/util/slice.cc @@ -8,6 +8,7 @@ @@ -66,30 +65,6 @@ index 6db11cc947a..c26b6a21a57 100644 #include "rocksdb/slice_transform.h" #include "rocksdb/slice.h" #include "util/string_util.h" -diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h -index a761be66c52..064d059f08f 100644 ---- a/storage/rocksdb/rocksdb/util/string_util.h -+++ b/storage/rocksdb/rocksdb/util/string_util.h -@@ -6,6 +6,7 @@ - - #pragma once - -+#include <cstdint> - #include <sstream> - #include <string> - #include <unordered_map> -diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc -index 10234e0e46a..a6adf1af257 100644 ---- a/tpool/aio_linux.cc -+++ b/tpool/aio_linux.cc -@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/ - - # include <thread> - # include <atomic> -+# include <cstdio> - # include <libaio.h> - # include <sys/syscall.h> - -- -2.39.1 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.2.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb index 87faabfa27..87faabfa27 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.2.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_15.3.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_15.3.bb index c4d4124f9a..e1d49895f0 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_15.3.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_15.3.bb @@ -13,6 +13,4 @@ SRC_URI += "\ SRC_URI[sha256sum] = "ffc7d4891f00ffbf5c3f4eab7fbbced8460b8c0ee63c5a5167133b9e6599d932" -CVE_CHECK_IGNORE += "\ - CVE-2017-8806 \ -" +CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Ddoesn't apply to out configuration of postgresql so we can safely ignore it." |