From: Debian MySQL Maintainers Date: Thu, 17 Mar 2022 23:44:37 +0000 (+0000) Subject: fix-reproducible-builds-rocksdb X-Git-Tag: archive/raspbian/1%10.6.8-1+rpi1~10 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2f447d28822b64b5d2f443797118b0241cb4f1a4;p=mariadb-10.6.git fix-reproducible-builds-rocksdb Origin: upstream, https://github.com/facebook/rocksdb/commit/0a9a05ae12943b1529ef1eabbca5ce5a71c986bf # Merged in RocksDB 6.19.3, but not updated into MariaDB 10.6 Bug: https://github.com/facebook/rocksdb/issues/7035 Author: Otto Kekäläinen Subject: Make RocksDB build reproducible The RocksDB binary included a string with the build timestamp: > rocksdb_build_git_date:@2021-05-23·16:04:38@ As this changes from build to build, it makes the builds unreproducible. Simply removing it solves the issue. This temporary fix can be removed when a proper fix already done in upstream lands in MariaDB when the RocksDB submodule is updated to a newer release. Gbp-Pq: Name fix-reproducible-builds-rocksdb.patch --- diff --git a/storage/rocksdb/rocksdb/util/build_version.cc.in b/storage/rocksdb/rocksdb/util/build_version.cc.in index 85695801..56a12357 100644 --- a/storage/rocksdb/rocksdb/util/build_version.cc.in +++ b/storage/rocksdb/rocksdb/util/build_version.cc.in @@ -1,5 +1,5 @@ // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. #include "build_version.h" -const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:@@GIT_SHA@@"; -const char* rocksdb_build_git_date = "rocksdb_build_git_date:@@GIT_DATE_TIME@@"; -const char* rocksdb_build_compile_date = __DATE__; +const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:REDACTED"; +const char* rocksdb_build_git_date = "rocksdb_build_git_date:REDACTED"; +const char* rocksdb_build_compile_date = "REDACTED";