diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-10-16 18:17:07 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-10-16 18:17:51 +0300 |
commit | a2681d9b6ff6eb6e4456d769b8d76e77b2c4d51d (patch) | |
tree | 19f0197dea5262d046f89acb1232e6ec05a45488 /meta-openembedded/meta-oe/recipes-dbs | |
parent | d1d22e6713c601a72ff7329133cd86f30ac3d6ce (diff) | |
download | openbmc-a2681d9b6ff6eb6e4456d769b8d76e77b2c4d51d.tar.xz |
meta-openembedded: subtree update:bccd3277e4..2258c9a767
Alejandro Enedino Hernandez Samaniego (1):
gedit: Add gsettings-desktop-schemas to RDEPENDS
Alexander Vickberg (1):
wolfssl: upgrade 4.4.0 -> 4.5.0
Andreas Müller (11):
gnome-settings-daemon: Remove wrong RDEPEND
gnome-desktop3: upgrade 3.36.5 -> 3.36.6
grilo: upgrade 0.3.12 -> 0.3.13
gspell: upgrade 1.8.3 -> 1.8.4
libgdata: upgrade 0.17.12 -> 0.17.13
tracker: upgrade 2.3.4 -> 2.3.6
tracker-miners: upgrade 2.3.3 -> 2.3.5
gjs: upgrade 1.58.7 -> 1.58.8
xfce4-notifyd: upgrade 0.6.1 -> 0.6.2
live555: upgrade 20200721 -> 20200819
vlc: upgrade 3.0.11 -> 3.0.11.1
Andrey Zhizhikin (1):
python3-pybind11: extend to native and nativesdk
Armin Kuster (3):
cmocka: add recipe
musl-nscd: add package
add musl-nscd to pkg grps
Bartosz Golaszewski (2):
libgpiod: drop support for 0.3.3
libgpiod: consolidate the recipe files
Diego Rondini (1):
README: fix incorrect links
Geoff Parker (1):
multipath-tools: replace perl with sed in libdmmp/Makefile for pseudo
Gianfranco Costamagna (1):
vboxguestdrivers: upgrade 6.1.12 -> 6.1.14 Drop kernel 5.8 compatibility patch, now part of upstream codebase
Hongxu Jia (4):
python3-argcomplete: add recipe 1.12.0
python3-dateutil/python3-pykwalify: add nativesdk support
python3-pykwalify: fix missing comma
python3-docopt: add version 0.6.2
Kai Kang (2):
python3-iniconfig: add recipe
python3-pytest: 5.4.3 -> 6.1.0
Khem Raj (3):
st: Use update alternatives
numactl: Link with libatomic on rv64/rv32
ubi-utils-klibc: Remove trailing slash from S
Lee Chee Yang (4):
ace : improve reproducibility
libgphoto2: improve reproducibility
tbb: improve reproducibility
glog : improve reproducibility
Leon Anavi (57):
python3-langtable: Upgrade 0.0.52 -> 0.0.53
python3-sentry-sdk: Upgrade 0.17.5 -> 0.17.6
python3-cmd2: Upgrade 1.3.9 -> 1.3.10
python3-rfc3339-validator: Upgrade 0.1.1 -> 0.1.2
python3-h2: Upgrade 3.2.0 -> 4.0.0
python3-luma-core: Upgrade 1.16.1 -> 1.16.2
python3-isort: Upgrade 5.5.2 -> 5.5.3
python3-xlsxwriter: Upgrade 1.3.3 -> 1.3.4
python3-flask-uploads: Consolidate in a single file
python3-paho-mqtt: Upgrade 1.5.0 -> 1.5.1
python3-sentry-sdk: Upgrade 0.17.6 -> 0.17.7
python3-importlib-metadata: Upgrade 1.7.0 -> 2.0.0
python3-pint: Upgrade 0.16 -> 0.16.1
python3-zipp: Upgrade 3.1.0 -> 3.2.0
python3-xlsxwriter: Upgrade 1.3.4 -> 1.3.5
python3-greenlet: Upgrade 0.4.16 -> 0.4.17
python3-xlsxwriter: Upgrade 1.3.5 -> 1.3.6
python3-yarl: Upgrade 1.5.1 -> 1.6.0
python3-sentry-sdk: Upgrade 0.17.7 -> 0.17.8
python3-google-api-python-client: Upgrade 1.12.1 -> 1.12.2
python3-cryptography: Upgrade 3.1 -> 3.1.1
python3-cryptography-vectors: Upgrade 3.1 -> 3.1.1
python3-gevent: Upgrade 20.6.2 -> 20.9.0
python3-pycrypto: Consolidate in a single file
python3-pychromecast: Upgrade 7.3.0 -> 7.5.0
python3-beautifulsoup4: Upgrade 4.9.1 -> 4.9.2
python3-tqdm: Upgrade 4.49.0 -> 4.50.0
python3-argcomplete: Upgrade 1.12.0 -> 1.12.1
python3-luma-core: Upgrade 1.16.2 -> 1.17.1
python3-luma-oled: Upgrade 3.5.0 -> 3.6.0
python3-regex: Upgrade 2020.7.14 -> 2020.9.27
python3-djangorestframework: Upgrade 3.11.1 -> 3.12.1
python3-isort: Upgrade 5.5.3 -> 5.5.4
python3-cbor2: Upgrade 5.1.2 -> 5.2.0
python3-humanize: Upgrade 2.6.0 -> 3.0.0
python3-pystemd: Upgrade 0.7.0 -> 0.8.0
python3-sentry-sdk: Upgrade 0.17.8 -> 0.18.0
python3-nocasedict: Upgrade 1.0.0 -> 1.0.1
python3-google-api-python-client: Upgrade 1.12.2 -> 1.12.3
beautifulsoup4: Upgrade 4.9.2 -> 4.9.3
python3-humanize: Upgrade 3.0.0 -> 3.0.1
python3-zipp: Upgrade 3.2.0 -> 3.3.0
python3-cmd2: Upgrade 1.3.10 -> 1.3.11
python3-pywbemtools: Upgrade 0.7.1 -> 0.7.2
python3-prettytable: Upgrade 0.7.2 -> 1.0.0
python3-nocaselist: Upgrade 1.0.2 -> 1.0.3
python3-pandas: Upgrade 1.1.2 -> 1.1.3
python3-configparser: Upgrade 5.0.0 -> 5.0.1
python3-pywbemtools: Upgrade 0.7.2 -> 0.7.3
python3-colorlog: Upgrade 4.2.1 -> 4.4.0
python3-markdown: Upgrade 3.2.2 -> 3.3
python3-tqdm: Upgrade 4.50.0 -> 4.50.2
python3-pywbem: Upgrade 1.0.2 -> 1.1.0
python3-regex: Upgrade 2020.9.27 -> 2020.10.11
python3-multidict: Upgrade 4.7.6 -> 5.0.0
python3-prettytable: Upgrade 1.0.0 -> 1.0.1
python3-pyperclip: Upgrade 1.8.0 -> 1.8.1
Lim Siew Hoon (1):
Alliance for Open Media: new library
Martin Jansa (4):
libhugetlbfs: revert one commit from 2.23 to work around build error on arm
netkit-rsh: inherit update-alternatives
ssmtp: adjust u-a
utouch-*, ifenslave, iozone3, ttf-honkyfonts, python3-smbus: don't use trailing slash in S
Michael Vetter (3):
jasper: use correct homepage
jasper: upgrade 2.0.20 -> 2.0.21
jasper: upgrade 2.0.21 -> 2.0.22
Mingli Yu (3):
smartmontools: Remove obsolete setting regarding the Standard Output
ippool: Remove obsolete setting in service file
strongswan: Remove obsolete setting regarding the Standard Output
Naveen Saini (1):
tbb: upgrade 2020.2 -> 2020.3
Pascal Bach (1):
rocksdb: 6.6.4 -> 6.11.4
Pierre-Jean Texier (1):
cppzmq: upgrade 4.6.0 -> 4.7.0
Ricardo Salveti (1):
pcsc-lite: upgrade 1.8.26 -> 1.9.0
Richard Purdie (1):
minifi-cpp: Adapt to potential psuedo changes
Robert Yang (1):
crda: rdepends on wireless-regdb-static
Romain Naour (1):
libiec61850: add recipe for libiec61850
Ross Burton (1):
mpv: don't remove lua for aarch64 twice
Sakib Sajal (1):
libssh2: enable ptest
Sinan Kaya (1):
collectd: make rrdtool and rrdcached optional
Tim Orling (3):
python3-markupsafe: bbappend for ptest
python3-jinja2: bbappend for ptest
packagegroup-meta-python: -jinja2 -markupsafe => ptest
Todd Cunningham (1):
firewalld: upgrade 0.8.3 -> 0.9.0
Vladimir Zapolskiy (1):
cifs-utils: remove explicitly set PV variable
Winfried Dobbe (1):
firewalld: Add missing rdep on nftables-python
Yi Zhao (2):
minifi-cpp: do not download source during compile
minifi-cpp: set the default repositories location to /var/lib
Zang Ruochen (6):
byacc: upgrade 20200330 -> 20200910
memtester: upgrade 4.3.0 -> 4.4.0
redis: upgrade 6.0.7 -> 6.0.8
znc: upgrade 1.8.1 -> 1.8.2
arno-iptables-firewall: upgrade 2.1.0 -> 2.1.1
numactl: upgrade 2.0.13 -> 2.0.14
Zheng Ruoqin (1):
dnf-plugin-tui: upgrade 1.1 -> 1.2
Zig Globulin (1):
libuvc: add recipe
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I67cbdcd31a7ead9641a4bce3477ff706f33bb253
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-dbs')
4 files changed, 63 insertions, 43 deletions
diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch index 9bfb1f31d9..eb9928a0ca 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch @@ -1,4 +1,4 @@ -From ba0a0e54d9544babbd3963891f4e3200dd5583f5 Mon Sep 17 00:00:00 2001 +From cf168ae0b7bceab8432d096719b331f18428fe39 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2020 15:10:37 -0700 Subject: [PATCH] cmake: Add check for atomic support @@ -20,27 +20,31 @@ Fixes Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/6555] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - CMakeLists.txt | 6 +++ + CMakeLists.txt | 5 +++ cmake/modules/CheckAtomic.cmake | 69 +++++++++++++++++++++++++++++++++ - 2 files changed, 75 insertions(+) + 2 files changed, 74 insertions(+) create mode 100644 cmake/modules/CheckAtomic.cmake +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f9c8f3346..4d604004b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -780,7 +780,13 @@ if(WIN32) +@@ -852,7 +852,12 @@ endif() + if(WIN32) set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib) - set(LIBS ${ROCKSDB_STATIC_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) else() + # check if linking against libatomic is necessary + include(CheckAtomic) -+ set(SYSTEM_LIBS ${CMAKE_THREAD_LIBS_INIT}) + if(HAVE_CXX_ATOMIC_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) + set(SYSTEM_LIBS ${SYSTEM_LIBS} atomic) + endif() - set(LIBS ${ROCKSDB_SHARED_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) + endif() - add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES}) + add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES}) +diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake +new file mode 100644 +index 000000000..8b7dc8a37 --- /dev/null +++ b/cmake/modules/CheckAtomic.cmake @@ -0,0 +1,69 @@ @@ -113,3 +117,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> + endif() +endif() + +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch new file mode 100644 index 0000000000..57433b057a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch @@ -0,0 +1,43 @@ +From 46a4e585175cac8d76bd0b64f0fc27c9e22f04a1 Mon Sep 17 00:00:00 2001 +From: Pascal Bach <pascal.bach@nextrem.ch> +Date: Mon, 12 Oct 2020 21:22:46 +0200 +Subject: [PATCH] cmake: Use exported target for bz2 + +Without this change, CMake puts the entire path into the generated file. +This is not portable and makes it fail in environment like Yocto. + +Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7541] +--- + CMakeLists.txt | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 676192913..801586c30 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,7 +32,7 @@ + # 3. cmake .. + # 4. make -j + +-cmake_minimum_required(VERSION 3.5.1) ++cmake_minimum_required(VERSION 3.7.2) + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules/") + include(ReadVersion) +@@ -148,12 +148,7 @@ else() + if(WITH_BZ2) + find_package(BZip2 REQUIRED) + add_definitions(-DBZIP2) +- if(BZIP2_INCLUDE_DIRS) +- include_directories(${BZIP2_INCLUDE_DIRS}) +- else() +- include_directories(${BZIP2_INCLUDE_DIR}) +- endif() +- list(APPEND THIRDPARTY_LIBS ${BZIP2_LIBRARIES}) ++ list(APPEND THIRDPARTY_LIBS BZip2::BZip2) + endif() + + if(WITH_LZ4) +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-db-write_thread.cc-Initialize-state.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-db-write_thread.cc-Initialize-state.patch deleted file mode 100644 index 97ddbce597..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-db-write_thread.cc-Initialize-state.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 49dcd22dcf1aae5995c42eac0fda68516fc1cd43 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Wed, 19 Jun 2019 17:57:24 +0800 -Subject: [PATCH] db/write_thread.cc: Initialize state - -Fixed an error when compiled without -O2: -db/write_thread.cc:183:14: error: 'state' may be used uninitialized in this function [-Werror=maybe-uninitialized] - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - db/write_thread.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/db/write_thread.cc b/db/write_thread.cc -index 835992c..6f99a11 100644 ---- a/db/write_thread.cc -+++ b/db/write_thread.cc -@@ -59,7 +59,7 @@ uint8_t WriteThread::BlockingAwaitState(Writer* w, uint8_t goal_mask) { - - uint8_t WriteThread::AwaitState(Writer* w, uint8_t goal_mask, - AdaptationContext* ctx) { -- uint8_t state; -+ uint8_t state = 0; - - // 1. Busy loop using "pause" for 1 micro sec - // 2. Else SOMETIMES busy loop using "yield" for 100 micro sec (default) --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb index b9038df81d..7ebc5ab1da 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" -SRCREV = "551a110918493a19d11243f53408b97485de1411" -SRCBRANCH = "6.6.fb" -PV = "6.6.4" +SRCREV = "48bfca38f6f175435052a59791922a1a453d9609" +SRCBRANCH = "6.11.fb" +PV = "6.11.4" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ - file://0001-db-write_thread.cc-Initialize-state.patch \ file://0001-cmake-Add-check-for-atomic-support.patch \ + file://0001-cmake-Use-exported-target-for-bz2.patch \ " S = "${WORKDIR}/git" @@ -31,6 +31,7 @@ PACKAGECONFIG[gflags] = "-DWITH_GFLAGS=ON,-DWITH_GFLAGS=OFF,gflags" EXTRA_OECMAKE = "\ -DPORTABLE=ON \ -DWITH_TESTS=OFF \ + -DWITH_BENCHMARK_TOOLS=OFF \ -DWITH_TOOLS=OFF \ -DFAIL_ON_WARNINGS=OFF \ " |