Date   

[meta-perl] [PATCH] libio-socket-ssl-perl: upgrade 2.074 -> 2.075

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
...-socket-ssl-perl_2.074.bb => libio-socket-ssl-perl_2.075.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-perl/recipes-perl/libio/{libio-socket-ssl-perl_2.074.bb => libio-socket-ssl-perl_2.075.bb} (94%)

diff --git a/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.074.bb b/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.075.bb
similarity index 94%
rename from meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.074.bb
rename to meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.075.bb
index 6249fd1d78..0a88d93056 100644
--- a/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.074.bb
+++ b/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.075.bb
@@ -22,7 +22,7 @@ RDEPENDS:${PN} += "\
SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-${PV}.tar.gz \
file://run-ptest \
"
-SRC_URI[sha256sum] = "36486b6be49da4d029819cf7069a7b41ed48af0c87e23be0f8e6aba23d08a832"
+SRC_URI[sha256sum] = "c30ee2220b1e181a968ebbc81861d0cadf334b001377a44105ae5a8637ddae8c"

S = "${WORKDIR}/IO-Socket-SSL-${PV}"

--
2.25.1


[meta-gnome] [PATCH] libadwaita: upgrade 1.1.4 -> 1.1.5

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../libadwaita/{libadwaita_1.1.4.bb => libadwaita_1.1.5.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-gnome/recipes-gnome/libadwaita/{libadwaita_1.1.4.bb => libadwaita_1.1.5.bb} (86%)

diff --git a/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.4.bb b/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.5.bb
similarity index 86%
rename from meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.4.bb
rename to meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.5.bb
index 44d18f596b..297cd9f0b4 100644
--- a/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.4.bb
+++ b/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.5.bb
@@ -11,7 +11,7 @@ DEPENDS = " \

inherit gnomebase gobject-introspection gtk-doc vala features_check

-SRC_URI[archive.sha256sum] = "fcc6d56669d33ac3d030098d7571d8045a02e18dc083b49a5a5a6325068e6b58"
+SRC_URI[archive.sha256sum] = "e170a658b5a83226912ecd90ba643015c8d2b8bbd6ea91ebe336dfebb584bb33"

ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
REQUIRED_DISTRO_FEATURES = "opengl"
--
2.25.1


[meta-oe] [PATCH] hwdata: upgrade 0.361 -> 0.362

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../recipes-support/hwdata/{hwdata_0.361.bb => hwdata_0.362.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/hwdata/{hwdata_0.361.bb => hwdata_0.362.bb} (91%)

diff --git a/meta-oe/recipes-support/hwdata/hwdata_0.361.bb b/meta-oe/recipes-support/hwdata/hwdata_0.362.bb
similarity index 91%
rename from meta-oe/recipes-support/hwdata/hwdata_0.361.bb
rename to meta-oe/recipes-support/hwdata/hwdata_0.362.bb
index c8daf7d5f9..e408c4db5a 100644
--- a/meta-oe/recipes-support/hwdata/hwdata_0.361.bb
+++ b/meta-oe/recipes-support/hwdata/hwdata_0.362.bb
@@ -5,7 +5,7 @@ SECTION = "System/Base"
LICENSE = "GPL-2.0-or-later | XFree86-1.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"

-SRCREV = "a934c616e2e666552586caa85af9fc583855df49"
+SRCREV = "8a3647e5da0a157cbf1bff1845b0cdaf1ce1bdb0"
SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https"
S = "${WORKDIR}/git"

--
2.25.1


[meta-gnome] [PATCH] gnome-bluetooth: upgrade 42.3 -> 42.4

wangmy
 

Changelog:
===========
This version switches the power state API added in version 42.3 to be backed
by the experimental PowerState property in bluetoothd. The API will not show
transitional states if the version of bluetoothd is too old.

The battery API now exports the battery information for all Bluetooth devices
listed in UPower, not just the ones re-exported from bluetoothd.

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../{gnome-bluetooth_42.3.bb => gnome-bluetooth_42.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-gnome/recipes-gnome/gnome-bluetooth/{gnome-bluetooth_42.3.bb => gnome-bluetooth_42.4.bb} (91%)

diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.3.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.4.bb
similarity index 91%
rename from meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.3.bb
rename to meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.4.bb
index cf73f823c8..75e1244f8f 100644
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.3.bb
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.4.bb
@@ -26,7 +26,7 @@ inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection

REQUIRED_DISTRO_FEATURES = "x11"

-SRC_URI[archive.sha256sum] = "c37a2a07f77d4816b261e6c2086a056ed9767c3881dfabc826f4f82f6e1aa302"
+SRC_URI[archive.sha256sum] = "1d6fcf1cdb6cc9923ab334a2c0bc37a2c1bba9d18de153d484eedc04f3c0bcdc"

BT_PULSE_PACKS = " \
pulseaudio-lib-bluez5-util \
--
2.25.1


[meta-filesystems] [PATCH] fuse3: upgrade 3.11.0 -> 3.12.0

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../recipes-support/fuse/{fuse3_3.11.0.bb => fuse3_3.12.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-filesystems/recipes-support/fuse/{fuse3_3.11.0.bb => fuse3_3.12.0.bb} (96%)

diff --git a/meta-filesystems/recipes-support/fuse/fuse3_3.11.0.bb b/meta-filesystems/recipes-support/fuse/fuse3_3.12.0.bb
similarity index 96%
rename from meta-filesystems/recipes-support/fuse/fuse3_3.11.0.bb
rename to meta-filesystems/recipes-support/fuse/fuse3_3.12.0.bb
index 8055fb06d3..b886effc85 100644
--- a/meta-filesystems/recipes-support/fuse/fuse3_3.11.0.bb
+++ b/meta-filesystems/recipes-support/fuse/fuse3_3.12.0.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \

SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \
"
-SRC_URI[sha256sum] = "8982c4c521daf3974dda8a5d55d575c988da13a571970f00aea149eb54fdf14c"
+SRC_URI[sha256sum] = "33b8a92d6f7a88e6a889f0009206933482f48f3eb85d88cf09ef551313ac7373"

S = "${WORKDIR}/fuse-${PV}"

--
2.25.1


[meta-oe] [PATCH] ctags: upgrade 5.9.20220828.0 -> 5.9.20220904.0

wangmy
 

Changelog:
===========
docs(man): remove unexpected newline from the rendered verilog man page

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../ctags/{ctags_5.9.20220828.0.bb => ctags_5.9.20220904.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-devtools/ctags/{ctags_5.9.20220828.0.bb => ctags_5.9.20220904.0.bb} (95%)

diff --git a/meta-oe/recipes-devtools/ctags/ctags_5.9.20220828.0.bb b/meta-oe/recipes-devtools/ctags/ctags_5.9.20220904.0.bb
similarity index 95%
rename from meta-oe/recipes-devtools/ctags/ctags_5.9.20220828.0.bb
rename to meta-oe/recipes-devtools/ctags/ctags_5.9.20220904.0.bb
index 7fd0a839ca..be50b36766 100644
--- a/meta-oe/recipes-devtools/ctags/ctags_5.9.20220828.0.bb
+++ b/meta-oe/recipes-devtools/ctags/ctags_5.9.20220904.0.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"

inherit autotools-brokensep pkgconfig manpages

-SRCREV = "dfffd3d8e18183e0e9131f2c301e18f78866ceb5"
+SRCREV = "096dc1c1337edeff41c3e6600553c3b43bdde131"
SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https"

S = "${WORKDIR}/git"
--
2.25.1


[meta-oe] [PATCH] boost-sml: upgrade 1.1.5 -> 1.1.6

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
meta-oe/recipes-support/boost-sml/boost-sml_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/boost-sml/boost-sml_git.bb b/meta-oe/recipes-support/boost-sml/boost-sml_git.bb
index e22eddb72d..c83181cfea 100644
--- a/meta-oe/recipes-support/boost-sml/boost-sml_git.bb
+++ b/meta-oe/recipes-support/boost-sml/boost-sml_git.bb
@@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=e4224ccaecb14d942c71d31bef20d78c"

DEPENDS += "boost qemu-native"

-PV = "1.1.5"
+PV = "1.1.6"

SRC_URI = "git://github.com/boost-ext/sml.git;protocol=https;branch=master"
-SRCREV = "7ed8f85fbe5b5af87bfb818e9e0347aaf7f7056d"
+SRCREV = "23e9a24e434cac9922039cbb43ca54ab70bef72c"

S = "${WORKDIR}/git"

--
2.25.1


[meta-multimedia][PATCH] sox: Enable -D_FILE_OFFSET_BITS=64 and depend on libtool

Khem Raj
 

We use 'dyn' for plugins and the logic depends on libltdl support
therefore add the missing depenendency

Fixes
| configure: error: not using libltdl; cannot load alsa dynamically
| See `config.log' for more details

Signed-off-by: Khem Raj <raj.khem@...>
---
meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
index 0791c85f74..ace8743f3a 100644
--- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
+++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
@@ -4,7 +4,7 @@ and can apply different effects and filters to the audio data."
HOMEPAGE = "http://sox.sourceforge.net"
SECTION = "audio"

-DEPENDS = "libpng ffmpeg libsndfile1"
+DEPENDS = "libpng ffmpeg libsndfile1 libtool"

PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \
magic \
@@ -36,4 +36,7 @@ SRC_URI[sha256sum] = "b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3b

inherit autotools pkgconfig

+# Enable largefile support
+CFLAGS += "-D_FILE_OFFSET_BITS=64"
+
EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}"
--
2.37.3


[PATCH] octave: upgrade 7.1.0 -> 7.2.0

Andreas Müller
 

* Fixes build with glibc 2.36 [1]
* Changelog found at [2]

[1] https://savannah.gnu.org/bugs/?62750
[2] https://octave.org/news/release/2022/07/28/octave-7.2.0-released.html

Signed-off-by: Andreas Müller <schnitzeltony@...>
---
.../octave/{octave_7.1.0.bb => octave_7.2.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-devtools/octave/{octave_7.1.0.bb => octave_7.2.0.bb} (93%)

diff --git a/meta-oe/recipes-devtools/octave/octave_7.1.0.bb b/meta-oe/recipes-devtools/octave/octave_7.2.0.bb
similarity index 93%
rename from meta-oe/recipes-devtools/octave/octave_7.1.0.bb
rename to meta-oe/recipes-devtools/octave/octave_7.2.0.bb
index c9982a7bb..eb96a624f 100644
--- a/meta-oe/recipes-devtools/octave/octave_7.1.0.bb
+++ b/meta-oe/recipes-devtools/octave/octave_7.2.0.bb
@@ -32,7 +32,7 @@ SRC_URI = " \
${GNU_MIRROR}/octave/${BPN}-${PV}.tar.gz \
file://fix-blas-library-integer-size.patch \
"
-SRC_URI[sha256sum] = "d4a9d81f3f67b4a6e07cb7a80dcb10ad5e9176fcc30762c70a81580a64b8b0b6"
+SRC_URI[sha256sum] = "b12cb652587d31c5c382b39ed73463c22a5259ecb2fa6b323a27da409222dacc"

# Note: Qt5Help is required for gui -> qttools(-native) must be build with
# clang in PACKAGECONFIG
--
2.35.3


[meta-oe][PATCH] fwupd: Fix tostring() call to not have xml_declaration param

Khem Raj
 

Signed-off-by: Khem Raj <raj.khem@...>
---
...nsupported-xml_declaration-parameter.patch | 33 +++++++++++++++++++
meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb | 1 +
2 files changed, 34 insertions(+)
create mode 100644 meta-oe/recipes-bsp/fwupd/fwupd/0001-fwupd-Drop-unsupported-xml_declaration-parameter.patch

diff --git a/meta-oe/recipes-bsp/fwupd/fwupd/0001-fwupd-Drop-unsupported-xml_declaration-parameter.patch b/meta-oe/recipes-bsp/fwupd/fwupd/0001-fwupd-Drop-unsupported-xml_declaration-parameter.patch
new file mode 100644
index 0000000000..8fd0234695
--- /dev/null
+++ b/meta-oe/recipes-bsp/fwupd/fwupd/0001-fwupd-Drop-unsupported-xml_declaration-parameter.patch
@@ -0,0 +1,33 @@
+From 88a97229350010d73cee0ff38da0dbbe0a449dd2 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@...>
+Date: Mon, 12 Sep 2022 11:20:59 -0700
+Subject: [PATCH] fwupd: Drop unsupported xml_declaration parameter
+
+This is not needed on Python3.7
+
+Fixes
+wupd-1.8.4/contrib/generate-gresource-xml.py", line 26, in <module>
+ f.write(ET.tostring(root, "utf-8", xml_declaration=True))
+TypeError: tostring() got an unexpected keyword argument 'xml_declaration'
+
+Upstream-Status: Submitted [https://github.com/fwupd/fwupd/pull/5025]
+Signed-off-by: Khem Raj <raj.khem@...>
+---
+ contrib/generate-gresource-xml.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/generate-gresource-xml.py b/contrib/generate-gresource-xml.py
+index 235a7700..4429f988 100755
+--- a/contrib/generate-gresource-xml.py
++++ b/contrib/generate-gresource-xml.py
+@@ -23,6 +23,6 @@ for fn in sorted(sys.argv[2:]):
+ n_file.set("preprocess", "xml-stripblanks")
+ n_file.set("alias", os.path.basename(fn))
+ with open(sys.argv[1], "wb") as f:
+- f.write(ET.tostring(root, "utf-8", xml_declaration=True))
++ f.write(ET.tostring(root, "utf-8"))
+
+ sys.exit(0)
+--
+2.37.3
+
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb
index 4258652744..3b5aa3483b 100644
--- a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb
+++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
DEPENDS = "glib-2.0 libxmlb json-glib sqlite3 libjcat gcab vala-native"

SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \
+ file://0001-fwupd-Drop-unsupported-xml_declaration-parameter.patch \
file://run-ptest"
SRC_URI[sha256sum] = "adfa07434cdc29ec41c40fef460e8d970963fe0c7e849dec7f3932adb161f886"

--
2.37.3


Re: [meta-oe][PATCH] sysbench: upgrade to 1.0.20

venkatakoteswararao talluri <venkattalluri5559@...>
 

Hello Khem Raj,
Can you please help to provide feedback on this?


Thanks,
Venkata Talluri

On Mon, Sep 12, 2022 at 12:20 PM venkatakoteswararao talluri via lists.openembedded.org <venkattalluri5559=gmail.com@...> wrote:


On Mon, Sep 12, 2022 at 12:19 PM venkatakoteswararao talluri <venkattalluri5559@...> wrote:
Hi All,

I'm trying to build sysbench_1.0.20.bb on QCS610 codebase but I'm getting following error so can you please help me to solve this issue.
Image:qti-multimedia-image
Target:qcs610-odk-64

Error log:

NOTE: Resolving any missing task queue dependencies
ERROR: Nothing RPROVIDES 'luajit' (but /var/lib/jenkins/workspace/QCS610_OpenQ_Linux_1.x_Internal_/qcs610-le-1-0_ap_standard_oem/apps_proc/poky/meta-qti-bsp/recipes-products/images/qti-multimedia-image.bb RDEPENDS on or otherwise requires it)
luajit was skipped: incompatible with host aarch64-oe-linux (not in COMPATIBLE_HOST)
NOTE: Runtime target 'luajit' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['luajit']
ERROR: Required build target 'qti-multimedia-image' has no buildable providers.
Missing or unbuildable dependency chain was: ['qti-multimedia-image', 'luajit']


Please find the attached sysbench_1.0.20.bb file.


Thanks,

Venkata Talluri

--
Venkata Talluri



--
Venkata Talluri


Re: [meta-oe][PATCH] sysbench: upgrade to 1.0.20

venkatakoteswararao talluri <venkattalluri5559@...>
 

On Mon, Sep 12, 2022 at 12:19 PM venkatakoteswararao talluri <venkattalluri5559@...> wrote:
Hi All,

I'm trying to build sysbench_1.0.20.bb on QCS610 codebase but I'm getting following error so can you please help me to solve this issue.
Image:qti-multimedia-image
Target:qcs610-odk-64

Error log:

NOTE: Resolving any missing task queue dependencies
ERROR: Nothing RPROVIDES 'luajit' (but /var/lib/jenkins/workspace/QCS610_OpenQ_Linux_1.x_Internal_/qcs610-le-1-0_ap_standard_oem/apps_proc/poky/meta-qti-bsp/recipes-products/images/qti-multimedia-image.bb RDEPENDS on or otherwise requires it)
luajit was skipped: incompatible with host aarch64-oe-linux (not in COMPATIBLE_HOST)
NOTE: Runtime target 'luajit' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['luajit']
ERROR: Required build target 'qti-multimedia-image' has no buildable providers.
Missing or unbuildable dependency chain was: ['qti-multimedia-image', 'luajit']


Please find the attached sysbench_1.0.20.bb file.


Thanks,

Venkata Talluri

--
Venkata Talluri


Re: [meta-oe][PATCH] sysbench: upgrade to 1.0.20

venkatakoteswararao talluri <venkattalluri5559@...>
 

Hi All,

I'm trying to build sysbench_1.0.20.bb on QCS610 codebase but I'm getting following error so can you please help me to solve this issue.
Image:qti-multimedia-image
Target:qcs610-odk-64

Error log:

NOTE: Resolving any missing task queue dependencies
ERROR: Nothing RPROVIDES 'luajit' (but /var/lib/jenkins/workspace/QCS610_OpenQ_Linux_1.x_Internal_/qcs610-le-1-0_ap_standard_oem/apps_proc/poky/meta-qti-bsp/recipes-products/images/qti-multimedia-image.bb RDEPENDS on or otherwise requires it)
luajit was skipped: incompatible with host aarch64-oe-linux (not in COMPATIBLE_HOST)
NOTE: Runtime target 'luajit' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['luajit']
ERROR: Required build target 'qti-multimedia-image' has no buildable providers.
Missing or unbuildable dependency chain was: ['qti-multimedia-image', 'luajit']


Please find the attached sysbench_1.0.20.bb file.


Thanks,

Venkata Talluri

--
Venkata Talluri


[meta-oe][PATCHv2] lvm2: use bfd even with ld-is-gold in DISTRO_FEATURES

Martin Jansa
 

Signed-off-by: Martin Jansa <Martin.Jansa@...>
---
meta-oe/recipes-support/lvm2/lvm2.inc | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 34e57ec7a5..277e76f0d2 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -57,3 +57,7 @@ EXTRA_OECONF = "--with-user= \
--with-thin-repair=${sbindir}/thin_repair \
--with-thin-restore=${sbindir}/thin_restore \
"
+
+# gold doesn't like multiple dm_bitset_parse_list definitions in libdm/.exported_symbols.DM_1_02_138 and libdm/.exported_symbols.DM_1_02_129
+# after it was uncommented in the later in 2.03.12 with https://github.com/lvmteam/lvm2/commit/60eb608d66c2056a78e81f27db3da14139d9faab
+LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd", '', d)}"
--
2.37.3


[meta-multimedia][PATCH 7/7] aom: Provide missing function prototypes

Khem Raj
 

Signed-off-by: Khem Raj <raj.khem@...>
---
...neon-Provide-prototypes-for-missing-.patch | 48 +++++++++++++++++++
.../recipes-multimedia/aom/aom_3.4.0.bb | 4 +-
2 files changed, 51 insertions(+), 1 deletion(-)
create mode 100644 meta-multimedia/recipes-multimedia/aom/aom/0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch

diff --git a/meta-multimedia/recipes-multimedia/aom/aom/0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch b/meta-multimedia/recipes-multimedia/aom/aom/0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch
new file mode 100644
index 0000000000..100507cdec
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/aom/aom/0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch
@@ -0,0 +1,48 @@
+From c33e07f78982acfb0574a84fb523f8591e55c50e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@...>
+Date: Sun, 11 Sep 2022 19:46:28 -0700
+Subject: [PATCH] subpel_variance_neon: Provide prototypes for missing
+ functions
+
+Fixes build with clang-15
+aom_dsp/arm/subpel_variance_neon.c:121:10: error: call to undeclared function 'aom_variance8x8_neon'; ISO C99 and later do not support implicit function dec
+larations [-Wimplicit-function-declaration]
+| return aom_variance8x8_neon(temp2, 8, dst, dst_stride, sse);
+| ^
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@...>
+---
+ aom_dsp/arm/subpel_variance_neon.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/aom_dsp/arm/subpel_variance_neon.c b/aom_dsp/arm/subpel_variance_neon.c
+index 4ecf891cbeb..859168ea0c5 100644
+--- a/aom_dsp/arm/subpel_variance_neon.c
++++ b/aom_dsp/arm/subpel_variance_neon.c
+@@ -20,6 +20,22 @@
+ #include "aom_dsp/aom_filter.h"
+ #include "aom_dsp/variance.h"
+
++extern unsigned int aom_variance8x8_neon(const uint8_t *a, int a_stride,
++ const uint8_t *b, int b_stride,
++ unsigned int *sse);
++
++extern unsigned int aom_variance16x16_neon(const uint8_t *a, int a_stride,
++ const uint8_t *b, int b_stride,
++ unsigned int *sse);
++
++extern unsigned int aom_variance32x32_neon(const uint8_t *a, int a_stride,
++ const uint8_t *b, int b_stride,
++ unsigned int *sse);
++
++extern unsigned int aom_variance64x64_neon(const uint8_t *a, int a_stride,
++ const uint8_t *b, int b_stride,
++ unsigned int *sse);
++
+ // Load 2 sets of 4 bytes when alignment is not guaranteed.
+ static INLINE uint8x8_t load_unaligned_u8(const uint8_t *buf, int stride) {
+ uint32_t a;
+--
+2.37.3
+
diff --git a/meta-multimedia/recipes-multimedia/aom/aom_3.4.0.bb b/meta-multimedia/recipes-multimedia/aom/aom_3.4.0.bb
index 36db45e265..9cd6f7a9e9 100644
--- a/meta-multimedia/recipes-multimedia/aom/aom_3.4.0.bb
+++ b/meta-multimedia/recipes-multimedia/aom/aom_3.4.0.bb
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6ea91368c1bbdf877159435572b931f5 \
file://PATENTS;md5=e69ad12202bd20da3c76a5d3648cfa83 \
"

-SRC_URI = "git://aomedia.googlesource.com/aom;protocol=https;branch=main"
+SRC_URI = "git://aomedia.googlesource.com/aom;protocol=https;branch=main \
+ file://0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch \
+ "

SRCREV = "fd0c9275d36930a6eea6d3c35972e7cf9c512944"

--
2.37.3


[meta-oe][PATCH 6/7] minifi-cpp: Fix build on musl

Khem Raj
 

Signed-off-by: Khem Raj <raj.khem@...>
---
meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
index 3b57ceace6..3d40bf8578 100644
--- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
+++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
@@ -81,8 +81,8 @@ do_install[cleandirs] += "${WORKDIR}/minifi-install"
PSEUDO_CONSIDER_PATHS .= ",${WORKDIR}/minifi-install"

do_configure:prepend:libc-musl() {
- sed -i -e 's/-DHAVE_GLIBC_STRERROR_R=?/-DHAVE_GLIBC_STRERROR_R=0/' ${S}/CMakeLists.txt
- sed -i -e 's/-DHAVE_POSIX_STRERROR_R=?/-DHAVE_POSIX_STRERROR_R=1/' ${S}/CMakeLists.txt
+ sed -i -e 's/-DHAVE_GLIBC_STRERROR_R=1/-DHAVE_GLIBC_STRERROR_R=0/' ${S}/CMakeLists.txt
+ sed -i -e 's/-DHAVE_POSIX_STRERROR_R=0/-DHAVE_POSIX_STRERROR_R=1/' ${S}/CMakeLists.txt
}

CFLAGS:append:libc-glibc = " -D_GNU_SOURCE"
--
2.37.3


[meta-initramfs][meta-oe][PATCH 5/7] kexec-tools-klibc: Fix type mismatch in calls to dtb_set_initrd on mips

Khem Raj
 

Fixes
kexec-elf-mips.c:163:42: error: incompatible pointer to integer conversion passing 'char *' to p
arameter of type 'off_t' (aka 'long long') [-Wint-conversion]
| dtb_set_initrd(&dtb_buf, &dtb_length, initrd_buf, initrd_buf + initrd_size);
| ^~~~~~~~~~

Signed-off-by: Khem Raj <raj.khem@...>
---
.../140-mips_disable_devicetree_support.patch | 53 +++++++++----------
1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/140-mips_disable_devicetree_support.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/140-mips_disable_devicetree_support.patch
index bd728ccb49..6e347c048e 100644
--- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/140-mips_disable_devicetree_support.patch
+++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/140-mips_disable_devicetree_support.patch
@@ -22,8 +22,6 @@ Signed-off-by: Andrea Adami <andrea.adami@...>
kexec/arch/mips/kexec-mips.h | 1 +
4 files changed, 39 insertions(+), 28 deletions(-)

-diff --git a/kexec/arch/mips/include/arch/options.h b/kexec/arch/mips/include/arch/options.h
-index 416e224..18d2811 100644
--- a/kexec/arch/mips/include/arch/options.h
+++ b/kexec/arch/mips/include/arch/options.h
@@ -5,6 +5,7 @@
@@ -44,11 +42,9 @@ index 416e224..18d2811 100644


#define KEXEC_ARCH_OPT_STR KEXEC_OPT_STR ""
-diff --git a/kexec/arch/mips/kexec-elf-mips.c b/kexec/arch/mips/kexec-elf-mips.c
-index 849a7ba..5c0e535 100644
--- a/kexec/arch/mips/kexec-elf-mips.c
+++ b/kexec/arch/mips/kexec-elf-mips.c
-@@ -141,35 +141,37 @@ int elf_mips_load(int argc, char **argv, const char *buf, off_t len,
+@@ -141,45 +141,49 @@ int elf_mips_load(int argc, char **argv,
else
cmdline_addr = 0;

@@ -63,9 +59,22 @@ index 849a7ba..5c0e535 100644
- } else {
- create_flatten_tree(&dtb_buf, &dtb_length, cmdline_buf + strlen(CMDLINE_PREFIX));
- }
-
+-
- if (arch_options.initrd_file) {
- initrd_buf = slurp_file(arch_options.initrd_file, &initrd_size);
+
+- /* Create initrd entries in dtb - although at this time
+- * they would not point to the correct location */
+- dtb_set_initrd(&dtb_buf, &dtb_length, initrd_buf, initrd_buf + initrd_size);
+-
+- initrd_base = add_buffer(info, initrd_buf, initrd_size,
+- initrd_size, sizeof(void *),
+- _ALIGN_UP(kernel_addr + kernel_size + dtb_length,
+- pagesize), 0x0fffffff, 1);
+-
+- /* Now that the buffer for initrd is prepared, update the dtb
+- * with an appropriate location */
+- dtb_set_initrd(&dtb_buf, &dtb_length, initrd_base, initrd_base + initrd_size);
+ if (!arch_options.no_dtb) {
+ /* MIPS systems that have been converted to use device tree
+ * passed through UHI will use commandline in the DTB and
@@ -78,39 +87,29 @@ index 849a7ba..5c0e535 100644
+ } else {
+ create_flatten_tree(&dtb_buf, &dtb_length, cmdline_buf + strlen(CMDLINE_PREFIX));
+ }
-
-- /* Create initrd entries in dtb - although at this time
-- * they would not point to the correct location */
-- dtb_set_initrd(&dtb_buf, &dtb_length, initrd_buf, initrd_buf + initrd_size);
++
+ if (arch_options.initrd_file) {
+ initrd_buf = slurp_file(arch_options.initrd_file, &initrd_size);
-
-- initrd_base = add_buffer(info, initrd_buf, initrd_size,
-- initrd_size, sizeof(void *),
-- _ALIGN_UP(kernel_addr + kernel_size + dtb_length,
-- pagesize), 0x0fffffff, 1);
++
+ /* Create initrd entries in dtb - although at this time
+ * they would not point to the correct location */
-+ dtb_set_initrd(&dtb_buf, &dtb_length, initrd_buf, initrd_buf + initrd_size);
-
-- /* Now that the buffer for initrd is prepared, update the dtb
-- * with an appropriate location */
-- dtb_set_initrd(&dtb_buf, &dtb_length, initrd_base, initrd_base + initrd_size);
-- }
++ dtb_set_initrd(&dtb_buf, &dtb_length, (off_t)initrd_buf, (off_t)initrd_buf + initrd_size);
++
+ initrd_base = add_buffer(info, initrd_buf, initrd_size,
+ initrd_size, sizeof(void *),
+ _ALIGN_UP(kernel_addr + kernel_size + dtb_length,
+ pagesize), 0x0fffffff, 1);
-
++
+ /* Now that the buffer for initrd is prepared, update the dtb
+ * with an appropriate location */
+ dtb_set_initrd(&dtb_buf, &dtb_length, initrd_base, initrd_base + initrd_size);
+ }
-+ }
+ }

+-
/* This is a legacy method for commandline passing used
* currently by Octeon CPUs only */
-@@ -177,9 +179,11 @@ int elf_mips_load(int argc, char **argv, const char *buf, off_t len,
+ add_buffer(info, cmdline_buf, sizeof(cmdline_buf),
sizeof(cmdline_buf), sizeof(void *),
cmdline_addr, 0x0fffffff, 1);

@@ -125,8 +124,6 @@ index 849a7ba..5c0e535 100644

return 0;
}
-diff --git a/kexec/arch/mips/kexec-mips.c b/kexec/arch/mips/kexec-mips.c
-index 415c2ed..e557f8b 100644
--- a/kexec/arch/mips/kexec-mips.c
+++ b/kexec/arch/mips/kexec-mips.c
@@ -89,6 +89,7 @@ void arch_usage(void)
@@ -137,7 +134,7 @@ index 415c2ed..e557f8b 100644
);
}

-@@ -121,6 +122,9 @@ int arch_process_options(int argc, char **argv)
+@@ -121,6 +122,9 @@ int arch_process_options(int argc, char
case OPT_RAMDISK:
arch_options.initrd_file = optarg;
break;
@@ -147,8 +144,6 @@ index 415c2ed..e557f8b 100644
default:
break;
}
-diff --git a/kexec/arch/mips/kexec-mips.h b/kexec/arch/mips/kexec-mips.h
-index 222c815..90b21c3 100644
--- a/kexec/arch/mips/kexec-mips.h
+++ b/kexec/arch/mips/kexec-mips.h
@@ -22,6 +22,7 @@ struct arch_options_t {
--
2.37.3


[meta-oe][PATCH 4/7] luajit: Use builtin for __clear_cache on clang

Khem Raj
 

Fixed build on mips

Signed-off-by: Khem Raj <raj.khem@...>
---
.../0001-Use-builtin-for-clear_cache.patch | 29 +++++++++++++++++++
meta-oe/recipes-devtools/luajit/luajit_git.bb | 1 +
2 files changed, 30 insertions(+)
create mode 100644 meta-oe/recipes-devtools/luajit/luajit/0001-Use-builtin-for-clear_cache.patch

diff --git a/meta-oe/recipes-devtools/luajit/luajit/0001-Use-builtin-for-clear_cache.patch b/meta-oe/recipes-devtools/luajit/luajit/0001-Use-builtin-for-clear_cache.patch
new file mode 100644
index 0000000000..2c41180d91
--- /dev/null
+++ b/meta-oe/recipes-devtools/luajit/luajit/0001-Use-builtin-for-clear_cache.patch
@@ -0,0 +1,29 @@
+From ca8f7d968a212f2da64492faac4f80384a5ba395 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@...>
+Date: Sun, 11 Sep 2022 13:23:19 -0700
+Subject: [PATCH] Use builtin for clear_cache
+
+This makes it compile on mips/clang and also portable across platforms
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@...>
+---
+ src/lj_mcode.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lj_mcode.c b/src/lj_mcode.c
+index 163aada4..471897da 100644
+--- a/src/lj_mcode.c
++++ b/src/lj_mcode.c
+@@ -46,7 +46,7 @@ void lj_mcode_sync(void *start, void *end)
+ #elif LJ_TARGET_PPC
+ lj_vm_cachesync(start, end);
+ #elif defined(__GNUC__) || defined(__clang__)
+- __clear_cache(start, end);
++ __builtin___clear_cache(start, end);
+ #else
+ #error "Missing builtin to flush instruction cache"
+ #endif
+--
+2.37.3
+
diff --git a/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb
index 3f3939eeb4..dd1cd51698 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_git.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
@@ -6,6 +6,7 @@ HOMEPAGE = "http://luajit.org"
SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
file://clang.patch \
+ file://0001-Use-builtin-for-clear_cache.patch \
"

# Set PV to a version tag and date (YYMMDD) associated with SRCREV if it is later.
--
2.37.3


[meta-oe][PATCH 3/7] fwupd: Upgrade to 1.8.4

Khem Raj
 

Remove packageconfig for thunderbolt, its not a plugin anymore

Signed-off-by: Khem Raj <raj.khem@...>
---
.../recipes-bsp/fwupd/{fwupd_1.8.1.bb => fwupd_1.8.4.bb} | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
rename meta-oe/recipes-bsp/fwupd/{fwupd_1.8.1.bb => fwupd_1.8.4.bb} (95%)

diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.1.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb
similarity index 95%
rename from meta-oe/recipes-bsp/fwupd/fwupd_1.8.1.bb
rename to meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb
index 7576b846fb..4258652744 100644
--- a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.1.bb
+++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb
@@ -6,7 +6,7 @@ DEPENDS = "glib-2.0 libxmlb json-glib sqlite3 libjcat gcab vala-native"

SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \
file://run-ptest"
-SRC_URI[sha256sum] = "5756466442eb9134fb40cdc8a46f9e01003247c8eac82fa5d8b16f6420375b79"
+SRC_URI[sha256sum] = "adfa07434cdc29ec41c40fef460e8d970963fe0c7e849dec7f3932adb161f886"

UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"

@@ -47,7 +47,6 @@ PACKAGECONFIG ??= "curl gnutls gudev gusb \
plugin_synaptics_mst \
plugin_synaptics_rmi \
plugin_scsi \
- plugin_thunderbolt \
plugin_uf2 \
plugin_upower \
sqlite"
@@ -99,7 +98,6 @@ PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=true,-Dplugin_redfish=false"
PACKAGECONFIG[plugin_scsi] = "-Dplugin_scsi=true,-Dplugin_scsi=false"
PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=true,-Dplugin_synaptics_mst=false"
PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=true,-Dplugin_synaptics_rmi=false"
-PACKAGECONFIG[plugin_thunderbolt] = "-Dplugin_thunderbolt=true,-Dplugin_thunderbolt=false"
PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=true,-Dplugin_tpm=false,tpm2-tss"
# Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported
PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=true -Dplugin_uefi_capsule_splash=false,-Dplugin_uefi_capsule=false,efivar fwupd-efi"
@@ -108,7 +106,7 @@ PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=true,-Dplugin_uf2=false"
PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=true,-Dplugin_upower=false"

# Always disable these plugins on non-x86 platforms as they don't compile or are useless
-DISABLE_NON_X86 = "plugin_amt plugin_intel_spi plugin_msr plugin_thunderbolt"
+DISABLE_NON_X86 = "plugin_amt plugin_intel_spi plugin_msr"
DISABLE_NON_X86:x86 = ""
DISABLE_NON_X86:x86-64 = ""
PACKAGECONFIG:remove = "${DISABLE_NON_X86}"
--
2.37.3


[meta-oe][PATCH 2/7] rocksdb: Upgrade to 7.5.3 release

Khem Raj
 

Drop upstreamed patches and forward port existing ones

Signed-off-by: Khem Raj <raj.khem@...>
---
...1-cmake-Add-check-for-atomic-support.patch | 4 +-
...01-cmake-Use-exported-target-for-bz2.patch | 11 +----
...0001-folly-Use-SYS_futex-for-syscall.patch | 42 ------------------
...Limit-the-mm_malloc.h-hack-to-glibc-.patch | 23 ----------
...ment-toku_time_now-for-rv32-rv64-in-.patch | 44 -------------------
meta-oe/recipes-dbs/rocksdb/files/arm.patch | 2 +-
meta-oe/recipes-dbs/rocksdb/files/mips.patch | 9 ++--
meta-oe/recipes-dbs/rocksdb/files/ppc64.patch | 6 +--
.../{rocksdb_6.20.3.bb => rocksdb_7.5.3.bb} | 7 +--
9 files changed, 13 insertions(+), 135 deletions(-)
delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch
delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-jemalloc_helper-Limit-the-mm_malloc.h-hack-to-glibc-.patch
delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-range_tree-Implement-toku_time_now-for-rv32-rv64-in-.patch
rename meta-oe/recipes-dbs/rocksdb/{rocksdb_6.20.3.bb => rocksdb_7.5.3.bb} (88%)

diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch
index 8bdd27ff25..2906100dee 100644
--- a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch
@@ -27,7 +27,7 @@ Signed-off-by: Khem Raj <raj.khem@...>

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -935,7 +935,12 @@ endif()
+@@ -1000,7 +1000,12 @@ option(ROCKSDB_BUILD_SHARED "Build share
if(WIN32)
set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
else()
@@ -39,7 +39,7 @@ Signed-off-by: Khem Raj <raj.khem@...>
+ endif()
endif()

- add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC})
+ set(ROCKSDB_PLUGIN_EXTERNS "")
--- /dev/null
+++ b/cmake/modules/CheckAtomic.cmake
@@ -0,0 +1,69 @@
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch
index d3054759a7..139312a298 100644
--- a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch
@@ -13,16 +13,7 @@ Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7541]

--- 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)
-@@ -152,12 +152,7 @@ else()
+@@ -153,12 +153,7 @@ else()
if(WITH_BZ2)
find_package(BZip2 REQUIRED)
add_definitions(-DBZIP2)
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch
deleted file mode 100644
index 9c70d4f6a6..0000000000
--- a/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ddcc8a9f7e0f0bfee96f2f0a0c10f21f9fa9b05d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@...>
-Date: Sun, 15 Nov 2020 15:02:28 -0800
-Subject: [PATCH] folly: Use SYS_futex for syscall
-
-glibc defines SYS_futex and on newer 32bit CPUs like RISCV-32, arc there
-is no 32bit time_t therefore define SYS_futex in terms of SYS_futex_time64
-
-Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7676]
-Signed-off-by: Khem Raj <raj.khem@...>
----
- third-party/folly/folly/detail/Futex.cpp | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
---- a/third-party/folly/folly/detail/Futex.cpp
-+++ b/third-party/folly/folly/detail/Futex.cpp
-@@ -48,9 +48,15 @@ namespace {
- #define FUTEX_CLOCK_REALTIME 256
- #endif
-
-+/// Newer 32bit CPUs eg. RISCV-32 are defaulting to 64bit time_t from get go and
-+/// therefore do not define __NR_futex
-+#if !defined(SYS_futex) && defined(SYS_futex_time64)
-+# define SYS_futex SYS_futex_time64
-+#endif
-+
- int nativeFutexWake(const void* addr, int count, uint32_t wakeMask) {
- long rv = syscall(
-- __NR_futex,
-+ SYS_futex,
- addr, /* addr1 */
- FUTEX_WAKE_BITSET | FUTEX_PRIVATE_FLAG, /* op */
- count, /* val */
-@@ -112,7 +118,7 @@ FutexResult nativeFutexWaitImpl(
- // Unlike FUTEX_WAIT, FUTEX_WAIT_BITSET requires an absolute timeout
- // value - http://locklessinc.com/articles/futex_cheat_sheet/
- long rv = syscall(
-- __NR_futex,
-+ SYS_futex,
- addr, /* addr1 */
- op, /* op */
- expected, /* val */
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-jemalloc_helper-Limit-the-mm_malloc.h-hack-to-glibc-.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-jemalloc_helper-Limit-the-mm_malloc.h-hack-to-glibc-.patch
deleted file mode 100644
index dbb0dda221..0000000000
--- a/meta-oe/recipes-dbs/rocksdb/files/0001-jemalloc_helper-Limit-the-mm_malloc.h-hack-to-glibc-.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 1a69d4cc3f97e348dba9714c7ec60da1a8650664 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@...>
-Date: Tue, 15 Jun 2021 22:05:36 -0700
-Subject: [PATCH] jemalloc_helper: Limit the mm_malloc.h hack to glibc on linux
-
-Musl does not need this hack
-
-Signed-off-by: Khem Raj <raj.khem@...>
----
- port/jemalloc_helper.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/port/jemalloc_helper.h
-+++ b/port/jemalloc_helper.h
-@@ -5,7 +5,7 @@
-
- #pragma once
-
--#if defined(__clang__)
-+#if defined(__clang__) && defined(__GLIBC__)
- // glibc's `posix_memalign()` declaration specifies `throw()` while clang's
- // declaration does not. There is a hack in clang to make its re-declaration
- // compatible with glibc's if they are declared consecutively. That hack breaks
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-range_tree-Implement-toku_time_now-for-rv32-rv64-in-.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-range_tree-Implement-toku_time_now-for-rv32-rv64-in-.patch
deleted file mode 100644
index 86c1bffea6..0000000000
--- a/meta-oe/recipes-dbs/rocksdb/files/0001-range_tree-Implement-toku_time_now-for-rv32-rv64-in-.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 89c032a9b4011385c0b504ea61e5df0db71f0ff5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@...>
-Date: Wed, 16 Jun 2021 19:06:02 -0700
-Subject: [PATCH] range_tree: Implement toku_time_now for rv32/rv64 in asm
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@...>
----
- .../range_tree/lib/portability/toku_time.h | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
-index 4425a4a2e..4ac964f85 100644
---- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
-+++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
-@@ -133,6 +133,25 @@ static inline tokutime_t toku_time_now(void) {
- return result;
- #elif defined(__powerpc__)
- return __ppc_get_timebase();
-+#elif defined(__riscv) // RISC-V
-+#if __riscv_xlen == 32
-+ uint32_t lo, hi0, hi1;
-+ __asm __volatile__(
-+ "rdcycleh %0\n"
-+ "rdcycle %1\n"
-+ "rdcycleh %2\n"
-+ "sub %0, %0, %2\n"
-+ "seqz %0, %0\n"
-+ "sub %0, zero, %0\n"
-+ "and %1, %1, %0\n"
-+ : "=r"(hi0), "=r"(lo), "=r"(hi1));
-+ return ((uint64_t)hi1 << 32) | lo;
-+#else
-+ uint64_t result;
-+ __asm __volatile__("rdcycle %0" : "=r"(result));
-+ return result;
-+#endif
-+
- #else
- #error No timer implementation for this platform
- #endif
---
-2.32.0
-
diff --git a/meta-oe/recipes-dbs/rocksdb/files/arm.patch b/meta-oe/recipes-dbs/rocksdb/files/arm.patch
index d428a6624a..573767797d 100644
--- a/meta-oe/recipes-dbs/rocksdb/files/arm.patch
+++ b/meta-oe/recipes-dbs/rocksdb/files/arm.patch
@@ -3,7 +3,7 @@ implement timer for arm >= v6
Signed-off-by: Khem Raj <raj.khem@...>
--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
-@@ -161,6 +161,20 @@ static inline tokutime_t toku_time_now(v
+@@ -164,6 +164,20 @@ static inline tokutime_t toku_time_now(v
struct timeval tv;
gettimeofday(&tv, nullptr);
return (uint64_t)tv.tv_sec * 1000000 + tv.tv_usec;
diff --git a/meta-oe/recipes-dbs/rocksdb/files/mips.patch b/meta-oe/recipes-dbs/rocksdb/files/mips.patch
index db2305d296..0104d54347 100644
--- a/meta-oe/recipes-dbs/rocksdb/files/mips.patch
+++ b/meta-oe/recipes-dbs/rocksdb/files/mips.patch
@@ -3,11 +3,10 @@ implement timer implementation for mips platform
Signed-off-by: Khem Raj <raj.khem@...>
--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
-@@ -155,7 +155,12 @@ static inline tokutime_t toku_time_now(v
- __asm __volatile__("rdcycle %0" : "=r"(result));
- return result;
- #endif
--
+@@ -158,6 +158,12 @@ static inline tokutime_t toku_time_now(v
+ uint64_t cycles;
+ asm volatile("rdcycle %0" : "=r"(cycles));
+ return cycles;
+#elif defined(__mips__)
+ // mips apparently only allows rdtsc for superusers, so we fall
+ // back to gettimeofday. It's possible clock_gettime would be better.
diff --git a/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch b/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch
index bc40f1b1e7..45deef338c 100644
--- a/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch
+++ b/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch
@@ -23,6 +23,6 @@ Signed-off-by: Khem Raj <raj.khem@...>
+ uint64_t result;
+ asm volatile("mfspr %0, 268" : "=r"(result));
+ return result;
- #elif defined(__riscv) // RISC-V
- #if __riscv_xlen == 32
- uint32_t lo, hi0, hi1;
+ #elif defined(__s390x__)
+ uint64_t result;
+ asm volatile("stckf %0" : "=Q"(result) : : "cc");
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb
similarity index 88%
rename from meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb
rename to meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb
index 2ad2d38a53..d4f0346ee1 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb
@@ -6,15 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"

-SRCREV = "8608d75d85f8e1b3b64b73a4fb6d19baec61ba5c"
-SRCBRANCH = "6.20.fb"
+SRCREV = "540d5aae516265170564ec27b3e67a54a11b7045"
+SRCBRANCH = "7.5.fb"

SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \
file://0001-cmake-Add-check-for-atomic-support.patch \
file://0001-cmake-Use-exported-target-for-bz2.patch \
- file://0001-folly-Use-SYS_futex-for-syscall.patch \
- file://0001-jemalloc_helper-Limit-the-mm_malloc.h-hack-to-glibc-.patch \
- file://0001-range_tree-Implement-toku_time_now-for-rv32-rv64-in-.patch \
file://ppc64.patch \
file://mips.patch \
file://arm.patch \
--
2.37.3