deleted file mode 100644
@@ -1,42 +0,0 @@
-From 9abf6cd09c60f0be9a85c055dfdf43698f057f73 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Wed, 25 Sep 2024 13:47:37 +0800
-Subject: [PATCH] CMakeLists.txt: Make the test discovery occur on target
-
-Set DISCOVERY_MODE to PRE_TEST to delay test discovery until just
-prior to test execution on the target to fix the build failure as
-the default POST_BUILD behavior is not desirable in cross-compiling
-env.
-
-/build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/build/env_basic_test: error while loading shared libraries: libgflags.so.2.2: cannot open shared object file: No such file or directory
-CMake Error at /build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/recipe-sysroot-native/usr/share/cmake-3.30/Modules/GoogleTestAddTests.cmake:112 (message):
- Error running test executable.
-
- Path: '/build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/build/env_basic_test'
- Working directory: '/build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/build'
- Result: 127
- Output:
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 403ad1243..f34397798 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1502,7 +1502,7 @@ if(WITH_TESTS)
- )
- target_link_libraries(${exename}${ARTIFACT_SUFFIX} testutillib${ARTIFACT_SUFFIX} testharness gtest ${THIRDPARTY_LIBS} ${ROCKSDB_LIB})
- if(NOT "${exename}" MATCHES "db_sanity_test")
-- gtest_discover_tests(${exename} DISCOVERY_TIMEOUT 120)
-+ gtest_discover_tests(${exename} DISCOVERY_TIMEOUT 120 DISCOVERY_MODE PRE_TEST)
- add_dependencies(rocksdb_check ${exename}${ARTIFACT_SUFFIX})
- endif()
- endforeach(sourcefile ${TESTS})
-2.34.1
-
deleted file mode 100644
@@ -1,49 +0,0 @@
-From 31012cdfa435d9203da3c3de8127b66bf018692a 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] checkpoint.h: Add missing includes <cstdint>
-
-It uses uint64_t and it comes from <cstdint>
-This is needed with GCC 13 and newer [1]
-
-[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-* build error:
-FAILED: CMakeFiles/checkpoint_test.dir/utilities/checkpoint/checkpoint_test.cc.o
-In file included from rocksdb/9.10.0/git/utilities/checkpoint/checkpoint_test.cc:11:
-rocksdb/9.10.0/git/include/rocksdb/utilities/checkpoint.h:49:35: error: 'uint64_t' has not been declared
- 49 | uint64_t log_size_for_flush = 0,
- | ^~~~~~~~
-rocksdb/9.10.0/git/include/rocksdb/utilities/checkpoint.h:14:1: note: 'uint64_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
- 13 | #include "rocksdb/status.h"
- +++ |+#include <cstdint>
- 14 |
-
-Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/11137]
-Signed-off-by: mark.yang <mark.yang@lge.com>
----
- include/rocksdb/utilities/checkpoint.h | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/include/rocksdb/utilities/checkpoint.h
-+++ b/include/rocksdb/utilities/checkpoint.h
-@@ -7,6 +7,7 @@
-
- #pragma once
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
---- a/include/rocksdb/utilities/transaction_db_mutex.h
-+++ b/include/rocksdb/utilities/transaction_db_mutex.h
-@@ -5,6 +5,7 @@
-
- #pragma once
-
-+#include <cstdint>
- #include <memory>
-
- #include "rocksdb/status.h"
similarity index 91%
rename from meta-oe/recipes-dbs/rocksdb/rocksdb_11.1.2.bb
rename to meta-oe/recipes-dbs/rocksdb/rocksdb_11.13.2.bb
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"
-SRCREV = "3b446089141659fad25328c5ea3e7ed283df46e4"
-SRCBRANCH = "11.1.fb"
+SRCREV = "17b624b5c0d41bd42db5cf88aa867f3b26eaf1fa"
+SRCBRANCH = "11.13.fb"
-SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https;tag=v${PV} \
+SRC_URI = "git://github.com/meta/${BPN}.git;branch=${SRCBRANCH};protocol=https;tag=v${PV} \
file://0001-cmake-Add-check-for-atomic-support.patch \
file://0002-cmake-Use-exported-target-for-bz2.patch \
file://0003-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch \
@@ -18,10 +18,8 @@ SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=htt
file://0006-Implement-timer-for-arm-v6.patch \
file://0007-Fix-declaration-scope-of-LE_LOAD32-in-crc32c.patch \
file://static_library_as_option.patch \
- file://0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch \
file://run-ptest \
file://0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch \
- file://0001-checkpoint.h-Add-missing-includes-cstdint.patch \
file://0001-Findzstd.cmake-support-pkg-config-based-zstd-detecti.patch \
"
Upgrade to release 11.13.2: - Fixed a secondary instance with open_files_async = true getting stuck after TryCatchUpWithPrimary() returned PathNotFound for a table file that the primary deleted before the background opener reached it. - Fixed blob direct write with more than one concurrent flush of a column family: a later flush sealed and published the blob files of the oldest pending memtable instead of its own, so flushes failed with Corruption: VersionBuilder: Blob file #N already added and the database stopped. Change the the SRC_URI from https://github.com/facebook the new Meta organization in GitHub: https://github.com/meta Remove the following patches: 1. 0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch Because the change has been applied with commit 6d8370e: https://github.com/meta/rocksdb/commit/6d8370ec56256c9f70daed364cdba9d1edabd417 2. 0001-checkpoint.h-Add-missing-includes-cstdint.patch Because the change has been applied with commit 0a2ba2a: https://github.com/meta/rocksdb/commit/0a2ba2a16441c1edd2a3d520e7d574e7ce78dbb2 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- ...ake-the-test-discovery-occur-on-targ.patch | 42 ---------------- ...point.h-Add-missing-includes-cstdint.patch | 49 ------------------- .../{rocksdb_11.1.2.bb => rocksdb_11.13.2.bb} | 8 ++- 3 files changed, 3 insertions(+), 96 deletions(-) delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-checkpoint.h-Add-missing-includes-cstdint.patch rename meta-oe/recipes-dbs/rocksdb/{rocksdb_11.1.2.bb => rocksdb_11.13.2.bb} (91%)