subtree updates:openembedded:poky: Jan 27 2023

poky: 0ce159991d..5e249ec855:
  Alex Kiernan (2):
        rust: Upgrade 1.66.0 -> 1.66.1
        rust: Remove CARGO_VERSION

  Alexander Kanavin (7):
        selftest/virgl: use pkg-config from the host
        ethtool: upgrade 6.0 -> 6.1
        man-pages: upgrade 6.01 -> 6.02
        mesa: update 22.2.3 -> 22.3.3
        webkitgtk: submit a patch upstream
        python3-sphinxcontrib-applehelp: update 1.0.2 -> 1.0.3
        vulkan-samples: branch rename master -> main

  Benoît Mauduit (1):
        lib/oe/reproducible: Use git log without gpg signature

  Bruce Ashfield (6):
        linux-yocto/6.1: edgerouter: Replace OCTEON_USB with USB_OCTEON_HCD
        linux-yocto/6.1: qemuriscv32: Enable CONFIG_NONPORTABLE
        linux-yocto/6.1: update to v6.1.5
        linux-yocto/5.15: update to v5.15.87
        conf/qemu: bump preferred kernel version to 6.1
        poky/poky-tiny: bump preferred version to 6.1

  Changqing Li (1):
        cmake-native: use internal cmcurl library

  Chen Qi (2):
        file: export MAGIC in SDK
        rpm: do not export MAGIC in SDK

  Chuck Wolber (1):
        scripts/oe-setup-layers: Make efficiently idempotent

  Fabio Estevam (2):
        u-boot: Upgrade to 2023.01
        u-boot: Update Upstream-Status

  He Zhe (1):
        lttng-modules: update 2.13.7 -> 2.13.8

  Jan Luebbe (1):
        p11-kit: add native to BBCLASSEXTEND

  Jermain Horsman (1):
        cve-check: write the cve manifest to IMGDEPLOYDIR

  Kevin Hao (1):
        meta-yocto-bsp: Update the default kernel to 6.1

  Khem Raj (31):
        createrepo-c: Include missing rpm/rpmstring.h
        libglu: Remove deprecated register in C++17
        cpio: Do not use _Noreturn in gnulib
        groff: Drop use of `register` storage class
        vulkan-samples: Update to the tip of trunk
        unfs3: Fix implicit function declarations of fix_dir_times()
        gperf: Make the code C++17 compliant
        libxcb: Fixed c2x standard undefined behaviour
        dbus: Use Alignof when using C11 or newer standard
        m4: Define alignof_slot using _Alignof when using C11 or newer
        opkg: Define alignof using _Alignof when using C11 or newer
        cpio: Fix gnulib alignof implementation on clang
        python3-numpy: Define _ALIGN using _Alignof when using C11 or newer
        vulkan-samples: Drop using u8string_view
        musl-obstack: Update to 1.2.3
        mdadm: Define alignof using _Alignof when using C11 or newer
        lttng-tools: Switch to alternative upstream submitted patch
        libtirpc: Check if file exists before operating on it
        ruby: Use C11 _Alignof to define ALIGN_OF when possible
        libusb1: Link with latomic only if compiler has no atomic builtins
        libusb1: Strip trailing whitespaces
        elfutils: Fix build with libcurl >= 7.87
        stress-ng: Robustify test-float test
        harfbuzz: Add missing <cstdio> and <cstdlib> includes
        apt: add missing <cstdint> for uint16_t
        vulkan-samples: Include missing header cstdint for uint32_t
        ruby: Update the patch status
        systemd: Add another fix for using XSI strerror_r
        elfutils: Remove funcretval test from run-native-test.sh for now
        binutils: Upgrade to 2.40 release
        binutils: Package libsframe

  Lee Chee Yang (1):
        migration-guides: add release-notes for 4.1.2

  Luca Boccassi (1):
        systemd: add PACKAGECONFIG to select default compression format

  Luca Ceresoli (1):
        manuals: fix typo in the MLPREFIX description

  Markus Volk (3):
        gptfdisk: add follow-up patch to fix with current popt
        gtk+3: add PACKAGECONFIG for libcloudservice and tracker; fix cups backend
        gtk4: add PACKAGECONFIG for cloudproviders

  Martin Jansa (1):
        mesa: update submitted patch with backported version

  Michael Opdenacker (3):
        rust-bin.bbclass: remove unused class
        meta/classes-global: remove package_tar.bbclass
        ref-manual: initial documentation for go and go-mod classes

  Mikko Rapeli (1):
        kmod: enable openssl support by default

  Niko Mauno (1):
        Fix missing leading whitespace with ':append'

  Ovidiu Panait (1):
        webkitgtk: fix perl-native dependency

  Paulo Neves (1):
        bitbake: bitbake-getvar: Add a quiet command line argument

  Pavel Zhukov (3):
        bitbake: fetch2: kill parameters in uri_find_decoded
        bitbake: fetch2/tests: Add test for Mercurial
        bitbake: fetch2/tests: Add parameter to recipe_uri

  Pawel Zalewski (1):
        classes/fs-uuid: Fix command output decoding issue

  Peter Kjellerstedt (2):
        librsvg: Only enable the Vala bindings if GObject Introspection is enabled
        cargo-update-recipe-crates.bbclass: Mark the update_crates task as nostamp

  Peter Marko (1):
        iproute2: separate routel and add python dependency

  Quentin Schulz (1):
        packagegroup-core-boot: make init-ifupdown package a recommendation

  Randy MacLeod (1):
        vim: upgrade 9.0.0947 -> 9.0.1211

  Richard Purdie (23):
        bitbake: server/process: Improve lockfile handling at exit
        pseudo: Update to pull in linux-libc-headers race fix
        pseudo: Switch back to the master branch
        insane: Improve patch warning/error handling
        poky: Set INIT_MANAGER by a separate variable
        bitbake: server/process: Fix lockfile contents check bug
        bitbake: cooker: Fix siggen recipe cache race issue
        bitbake: cache: Only write files if we have data
        bitbake: cooker: Fix parsing race around cache handling
        bitbake: data: Add support for new BB_HASH_CODEPARSER_VALS for cache optimisation
        bitbake: data_smart: Small optimisation to _findVar()
        native: Drop special variable handling
        bitbake.conf: Add BB_HASH_CODEPARSER_VALS
        pseudo: Update to include logic fix
        bitbake.conf: Add METADATA_REVISION to BB_HASH_CODEPARSER_VALS
        native: Implement BBCLASSEXTEND PACKAGES_DYNAMIC handling
        conf/sdk/x86-64: Set march specifically
        bitbake: cache/codeparser: Switch to a new BB_CACHEDIR variable for cache location
        oeqa/selftest/devtool: Fix for linux 6.1 versions onwards
        wic/efi-bootdisk.wks: Fix for 6.1 kernel versions
        kernel/linux-kernel-base: Fix kernel build artefact determinism issues
        build-appliance-image: Update to master head revision
        build-appliance: Fix merge error

  Ross Burton (12):
        python3-pyproject-hooks: add new recipe
        python3-build: add 0.10.0
        python_pep517: use python3-build, not picobuild
        python3-picobuild: remove
        cve-update-db-native: show IP on failure
        quilt: rewrite ptest glue
        quilt: fix intermittent failure in faildiff.test
        spirv-headers/spirv-tools: set correct branch name
        quilt: use upstreamed faildiff.test fix
        ppp: backport fix for CVE-2022-4603
        bitbake: bb/utils: include SSL certificate paths in export_proxies
        buildtools-tarball: set pkg-config search path

  Thomas Roos (1):
        devtool: fix devtool finish when gitmodules file is empty

  Tim Orling (3):
        bitbake: bitbake: fix deprecated threading.Thread.setDaemon
        python3-cryptography{-vectors}: 38.0.4 -> 39.0.0
        bitbake: toaster: update fixtures

  Tom Hochstein (1):
        gstreamer1.0-plugins-good: Fix libsoup runtime dependency

  Vincent Davis Jr (1):
        mesa: allow mesa (gbm) to compile without backend

  Wang Mingyu (20):
        btrfs-tools: upgrade 6.1 -> 6.1.2
        libpcap: upgrade 1.10.2 -> 1.10.3
        libwebp: upgrade 1.2.4 -> 1.3.0
        man-db: upgrade 2.11.1 -> 2.11.2
        dpkg: upgrade 1.21.17 -> 1.21.18
        ed: upgrade 1.18 -> 1.19
        gi-docgen: upgrade 2022.2 -> 2023.1
        python3-alabaster: upgrade 0.7.12 -> 0.7.13
        python3-setuptools: upgrade 65.6.3 -> 65.7.0
        patchelf: upgrade 0.17.0 -> 0.17.2
        python3-cython: upgrade 0.29.32 -> 0.29.33
        python3-dbusmock: upgrade 0.28.6 -> 0.28.7
        python3-hatchling: upgrade 1.12.1 -> 1.12.2
        python3-hypothesis: upgrade 6.61.0 -> 6.62.0
        python3-importlib-metadata: upgrade 5.2.0 -> 6.0.0
        python3-packaging: upgrade 22.0 -> 23.0
        python3-pbr: upgrade 5.11.0 -> 5.11.1
        python3-pygments: upgrade 2.13.0 -> 2.14.0
        stress-ng: upgrade 0.15.01 -> 0.15.02
        xz: upgrade 5.4.0 -> 5.4.1

  Xiangyu Chen (4):
        numactl: skip test case when target platform doesn't have 2 CPU node
        qemuboot.bbclass: add QB_NFSROOTFS_EXTRA_OPT for nfs rootfs extra option
        runqemu: add process of option QB_NFSROOTFS_EXTRA_OPT
        qemuppc64: set the qemuppc64 nfs r/wsize mount options to 524288

  Yoann Congal (2):
        bitbake: persist_data: Handle sqlite error when cachefile path is too long
        sanity: Fix small typos

meta-openembedded: cd13881611..2ab113e8be:
  Alejandro Enedino Hernandez Samaniego (1):
        weechat: Update 3.4.1 -> 3.8

  Alex Kiernan (4):
        dnsmasq: Merge .inc into .bb
        dnsmasq: Expand configuration options
        ntpsec: Upgrade 1.2.1 -> 1.2.2
        keyutils: Upgrade 1.6.1 -> 1.6.3

  Archana Polampalli (1):
        Nodejs: Upgrade to 18.12.1

  Bartosz Golaszewski (1):
        libgpiod: fix python bindings build

  Chee Yang Lee (5):
        opencv: fix reproducible builds
        xerces-c: upgrade to 3.2.4
        zsh: Fix CVE-2021-45444
        redis: Upgrade to 7.0.8
        redis: Upgrade to 6.2.9

  Dmitry Baryshkov (1):
        edid-decode: an utility to parse EDID information

  Etienne Cordonnier (1):
        uutils-coreutils: upgrade 0.0.16 -> 0.0.17

  Fabio Estevam (1):
        lvgl-demo-fb: Add recipe

  Gianfranco Costamagna (1):
        boinc-client: Update boinc from 7.20.4 to 7.20.5

  Hermes Zhang (1):
        kernel_add_regdb: Change the task order

  Jan Luebbe (3):
        pcsc-lite: fix native build
        pcsc-lite: fix homepage URL
        opensc: fix homepage URL

  Kai Kang (2):
        mozjs: fix compile error for arm
        crda: 3.18 -> 4.15

  Khem Raj (65):
        packagegroup-meta-oe: Remove boost-url from comments
        trace-cmd: Update to upstream submitted patches
        packagegroup-meta-oe: Update to reflect latest recipes
        freeglut: Add packageconfigs for x11/wayland/gles
        xdg-desktop-portal-wlr: Add wayland to REQUIRED_DISTRO_FEATURES
        ipmitool: Remove unneeded patch
        dibbler: Fix build with c++17 and newer std
        libtevent: Package cmocka tests into ptest package
        netkit-telnet: Drop using register storage class keyword
        libxml-libxml-perl: Fix function pointer types
        fatcat: Fix build with std=c++17
        ncmpc: Upgrade to 0.47
        python3-matplotlib: Upgrade to 3.6.3
        python3-matplotlib: Fix build with c++17
        python3-greenlet: Drop using register keyword
        libmodplug: Fix build with c++17
        xmlrpc-c: Upgrade to 1.54.06
        satyr: Fix build with musl
        p8platform: Fix build with c++17 clang
        freerdp: Fix incompatible function pointer type
        libtorrent: Update to tip of trunk
        gnuchess: Fix build with c++17
        ippool: Use unsigned int type for 1-bit integer bitfield
        audiofile: Stick to c++14 std
        ssiapi: Use c++14 standard
        log4cpp: Keep using std=c++14
        gengetopt: Use std=c++14
        libmimetic: Pin to using -std=c++14
        ace: Upgrade to 6.5.19
        pipewire-media-session: Use PW_ENABLE_DEPRECATED
        rtorrent: Update to latest tip of trunk
        nspr: Fix build with clang16
        net-snmp: Fix build with clang16
        xmlstarlet: Fix build with clang16
        libol: Drop recipe
        hplip: Update to 3.22.10
        espeak: Drop using 'register' keyword for storage classifier
        uw-imap: Fix build with clang 16
        xmlsec1: Include xmlsec/parser.h for xmlSecParserSetDefaultOptions()
        exiv2: Upgrade to 0.27.6
        packagegroup-meta-oe: Remove mongodb for upsupported arches
        rtorrent: Add missing dependency on autoconf-archive
        thrift: Fix c++ and system header include order problem
        libcereal: Use -idirafter instead of -isystem
        poppler: cmake: Do not use -isystem
        uftreace: Fix a build race
        sdbus-c++: Disable ccache
        libcamera: Fix build with gcc-13
        mariadb: Fix build with gcc-13
        vulkan-cts,opengl-es-cts: Fix build with gcc-13
        rocksdb: Fix build with gcc13
        rocksdb: Upgrade to 7.9.2
        redis-plus-plus: Upgrade to 1.3.7
        redis-plus-plus: Fix build with gcc13
        rdfind: Upgrade to 1.5.0 release
        rdfind: Fix build with gcc13
        libiodbc: Fix SRC_URI to not use gitlab archives
        opensaf: Fix build with gcc13
        crossguid: Fix build with gcc13
        dbus-cxx: Fix build with gcc13
        dbus-cxx: Upgrade to 2.3.1
        msktutil: Upgrade to 1.2.1
        hiredis: Enable SSL/TLS support by default
        redis-plus-plus: Enable SSL/TLS by default
        rocksdb: Fix build with clang compiler

  Lei Maohui (2):
        biodbc: Added a new recipe.
        trace-cmd: Fix QA Issue of do_package when enable multilib:

  Leon Anavi (14):
        python3-traitlets: Upgrade 5.8.0 -> 5.8.1
        python3-prettytable: Upgrade 3.4.1 -> 3.6.0
        python3-cantools: Upgrade 38.0.0 -> 38.0.1
        python3-imageio: Upgrade 2.23.0 -> 2.24.0
        python3-astroid: Upgrade 2.12.13 -> 2.13.2
        python3-alembic: Upgrade 1.9.1 -> 1.9.2
        python3-autobahn: Upgrade 22.12.1 -> 23.1.1
        python3-eventlet: Upgrade 0.33.2 -> 0.33.3
        python3-configobj: Upgrade 5.0.6 -> 5.0.8
        python3-nocaselist: Upgrade 1.0.6 -> 1.1.0
        python3-nocasedict: Upgrade 1.0.4 -> 1.1.0
        python3-email-validator: Upgrade 1.3.0 -> 1.3.1
        python3-imageio: Upgrade 2.24.0 -> 2.25.0
        python3-cachetools: Upgrade 5.2.1 -> 5.3.0

  Markus Volk (8):
        webp-pixbuf-loader: add recipe
        freerdp: build the rdp server
        nv-codec-headers: add recipe
        gnome-chess: import recipe
        gnome-shell: update 43.1 -> 43.2
        pipewire: update 0.3.63 -> 0.3.64
        cups-filters: build with dbus support
        cups-pk-helper: add recipe

  Martin Jansa (3):
        s-nail: fix Upstream-Status format
        smartmontools: fix Upstream-Status format
        htop: fix Upstream-Status format

  Niko Mauno (2):
        Fix missing leading whitespace with ':append'
        nftables: Fix missing leading whitespace with ':append'

  Peter Bašista (1):
        Make tvheadend recipe compatible with the latest tvheadend version

  Quentin Schulz (1):
        python3-reedsolo: Add recipe

  Randy MacLeod (2):
        librelp: update to 1.11.0
        rsyslog: update to 8.2212.0

  Richard Hughes (1):
        fwupd: Upgrade to 1.8.9

  Robert Yang (1):
        tftpy: Add it for python tftp server and client

  Ross Burton (3):
        khronos-cts: fix build when python3-build-native is present
        python3-pytest-forked: update for move from picobuild to build
        mbedtls: add option to use PSA for X.509/TLS operations

  Stefan Ghinea (1):
        mbedtls: upgrade to 2.28.2 to fix CVE-2022-46392, CVE-2022-46393

  Trevor Woerner (1):
        psqlodbc: fix HOMEPAGE

  Wang Mingyu (62):
        ctags: upgrade 6.0.20230101.0 -> 6.0.20230108.0
        flatbuffers: upgrade 22.12.06 -> 23.1.4
        libadwaita: upgrade 1.2.0 -> 1.2.1
        hwdata: upgrade 0.365 -> 0.366
        libmoo-perl: upgrade 2.005004 -> 2.005005
        evolution-data-server-native: upgrade 3.46.2 -> 3.46.3
        cli11: upgrade 2.3.1 -> 2.3.2
        imapfilter: upgrade 2.7.6 -> 2.8.1
        libcgi-perl: upgrade 4.54 -> 4.55
        hidapi: upgrade 0.12.0 -> 0.13.0
        python3-lazy-object-proxy: upgrade 1.8.0 -> 1.9.0
        xfsprogs: upgrade 6.0.0 -> 6.1.0
        tbb: upgrade 2021.7.0 -> 2021.8.0
        python3-networkx: upgrade 2.8.8 -> 3.0
        python3-sqlalchemy: upgrade 1.4.45 -> 1.4.46
        python3-aiohue: upgrade 4.5.0 -> 4.6.1
        python3-cachetools: upgrade 5.2.0 -> 5.2.1
        python3-google-api-python-client: upgrade 2.70.0 -> 2.71.0
        python3-flask-migrate: upgrade 4.0.0 -> 4.0.1
        python3-coverage: upgrade 7.0.3 -> 7.0.4
        python3-googleapis-common-protos: upgrade 1.57.0 -> 1.58.0
        python3-ipython: upgrade 8.7.0 -> 8.8.0
        python3-redis: upgrade 4.4.0 -> 4.4.1
        python3-robotframework: upgrade 6.0.1 -> 6.0.2
        python3-uefi-firmware: upgrade 1.9 -> 1.10
        python3-ujson: upgrade 5.6.0 -> 5.7.0
        python3-xlsxwriter: upgrade 3.0.5 -> 3.0.6
        xfsprogs: upgrade 6.1.0 -> 6.1.1
        xfstests: upgrade 2022.12.18 -> 2023.01.01
        eog: upgrade 43.1 -> 43.2
        gvfs: upgrade 1.50.2 -> 1.50.3
        libnma: upgrade 1.10.4 -> 1.10.6
        nautilus: upgrade 43.1 -> 43.2
        nbdkit: upgrade 1.33.4 -> 1.33.7
        networkmanager: upgrade 1.40.0 -> 1.40.10
        tcpdump: upgrade 4.99.2 -> 4.99.3
        unbound: upgrade 1.17.0 -> 1.17.1
        ctags: upgrade 6.0.20230108.0 -> 6.0.20230115.0
        dnfdragora: upgrade 2.1.3 -> 2.1.4
        gensio: upgrade 2.6.1 -> 2.6.2
        hidapi: upgrade 0.13.0 -> 0.13.1
        librelp: upgrade 1.10.0 -> 1.11.0
        libtraceevent: upgrade 1.7.0 -> 1.7.1
        libtracefs: upgrade 1.6.3 -> 1.6.4
        uftrace: upgrade 0.12 -> 0.13
        xterm: upgrade 377 -> 378
        python3-absl: upgrade 1.3.0 -> 1.4.0
        python3-coverage: upgrade 7.0.4 -> 7.0.5
        python3-dateparser: upgrade 1.1.5 -> 1.1.6
        python3-decouple: upgrade 3.6 -> 3.7
        python3-dnspython: upgrade 2.2.1 -> 2.3.0
        python3-flask-wtf: upgrade 1.0.1 -> 1.1.0
        python3-future: upgrade 0.18.2 -> 0.18.3
        python3-google-api-python-client: upgrade 2.71.0 -> 2.72.0
        python3-google-auth: upgrade 2.15.0 -> 2.16.0
        python3-mock: upgrade 5.0.0 -> 5.0.1
        python3-pymodbus: upgrade 3.0.2 -> 3.1.0
        python3-pyzmq: upgrade 24.0.1 -> 25.0.0
        python3-redis: upgrade 4.4.1 -> 4.4.2
        python3-sentry-sdk: upgrade 1.12.1 -> 1.13.0
        python3-txaio: upgrade 22.2.1 -> 23.1.1
        python3-xlsxwriter: upgrade 3.0.6 -> 3.0.7

  Yi Zhao (2):
        freeradius: upgrade 3.0.21 -> 3.0.26
        strongswan: upgrade 5.9.8 -> 5.9.9

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I625cfaa0bd5052cd72a121f010db3ecd2f274caf
diff --git a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-ipmi_fru.c-Provide-missing-function-declarations.patch b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-ipmi_fru.c-Provide-missing-function-declarations.patch
deleted file mode 100644
index 704bbdb..0000000
--- a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-ipmi_fru.c-Provide-missing-function-declarations.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e5bbf96edf776821f29ab67baed22a690bf8ab10 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 2 Sep 2022 07:30:10 -0700
-Subject: [PATCH] ipmi_fru.c: Provide missing function declarations
-
-Fixes build with clang-15+
-
-Upstream-Status: Submitted [https://github.com/ipmitool/ipmitool/pull/360]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/ipmi_fru.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
-index 3d1d8a1..5c5661c 100644
---- a/lib/ipmi_fru.c
-+++ b/lib/ipmi_fru.c
-@@ -60,6 +60,13 @@ static const char *section_id[4] = {
- 	"Board Section",
- 	"Product Section"
- };
-+/* From lib/ipmi_hpmfwupg.c: */
-+uint16_t
-+ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf);
-+
-+/* From src/plugins/ipmi_intf.c: */
-+uint16_t
-+ipmi_intf_get_max_response_data_size(struct ipmi_intf * intf);
- 
- static const char * combined_voltage_desc[] = {
- 	"12 V",
--- 
-2.37.3
-
diff --git a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb
index a8d203e..0340901 100644
--- a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb
+++ b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb
@@ -24,7 +24,6 @@
 SRCREV = "19d78782d795d0cf4ceefe655f616210c9143e62"
 SRC_URI = "git://github.com/ipmitool/ipmitool;protocol=https;branch=master \
            ${IANA_ENTERPRISE_NUMBERS} \
-           file://0001-ipmi_fru.c-Provide-missing-function-declarations.patch \
            file://0001-configure-Remove-the-logic-to-download-IANA-PEN-data.patch \
            "
 IANA_ENTERPRISE_NUMBERS ?= ""
diff --git a/meta-openembedded/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.0.bb b/meta-openembedded/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.1.bb
similarity index 93%
rename from meta-openembedded/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.0.bb
rename to meta-openembedded/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.1.bb
index cff8672..f876f75 100644
--- a/meta-openembedded/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.0.bb
+++ b/meta-openembedded/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.1.bb
@@ -8,7 +8,7 @@
                     file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd"
 SECTION = "libs"
 
-SRCREV = "826b06bb2484a53fdae196e12ec507a67ec87055"
+SRCREV = "4e51588b1f4d6617df7e39a38acc0d0daa3d8a3f"
 SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \
            file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch"
 
diff --git a/meta-openembedded/meta-oe/recipes-kernel/libtracefs/libtracefs_1.6.3.bb b/meta-openembedded/meta-oe/recipes-kernel/libtracefs/libtracefs_1.6.4.bb
similarity index 93%
rename from meta-openembedded/meta-oe/recipes-kernel/libtracefs/libtracefs_1.6.3.bb
rename to meta-openembedded/meta-oe/recipes-kernel/libtracefs/libtracefs_1.6.4.bb
index fbb6b76..73620f3 100644
--- a/meta-openembedded/meta-oe/recipes-kernel/libtracefs/libtracefs_1.6.3.bb
+++ b/meta-openembedded/meta-oe/recipes-kernel/libtracefs/libtracefs_1.6.4.bb
@@ -9,7 +9,7 @@
 SECTION = "libs"
 DEPENDS = "libtraceevent bison-native flex-native"
 
-SRCREV = "3395d484eadfd8ab38311032f28e7f79c4f0e33b"
+SRCREV = "af49d832f46631597e0aabb2302bd0f56a9cad29"
 SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;branch=${BPN};protocol=https \
            file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch \
            "
diff --git a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0001-Replace-LFS64-interfaces-off64_t-and-lseek64.patch b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0001-Replace-LFS64-interfaces-off64_t-and-lseek64.patch
index 830f1d9..1e5415e 100644
--- a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0001-Replace-LFS64-interfaces-off64_t-and-lseek64.patch
+++ b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0001-Replace-LFS64-interfaces-off64_t-and-lseek64.patch
@@ -1,18 +1,18 @@
-From c6190920d405a5a6df3797153be93905d98a65f5 Mon Sep 17 00:00:00 2001
+From 9c3213a3b64e049c1aa065300b01ee751699b01f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 6 Jan 2023 16:53:06 -0800
-Subject: [PATCH] Replace LFS64 interfaces off64_t and lseek64
+Subject: [PATCH 1/2] Replace LFS64 interfaces off64_t and lseek64
 
 Musl does not define these interfaces unless -D_LARGEFILE64_SOURCE is
-defined and that too it is transitional until apps switch to using 64bit
-off_t. We pass -D_LARGEFILE64_SOURCE in makefiles already therefore
+defined and that too it is transitional until apps switch to using 64-bit
+off_t. We pass -D_FILE_OFFSET_BITS=64 in makefiles already therefore
 original lseek and off_t are already 64bit
 
 This fixes build with latest musl which has dropped LFS64 interfaces [1]
 
 [1] https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4i
 
-Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20230107010245.1290391-1-raj.khem@gmail.com/]
+Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20230109225315.1284538-1-raj.khem@gmail.com/]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  .../include/private/trace-cmd-private.h       |  12 +-
@@ -27,7 +27,7 @@
  9 files changed, 142 insertions(+), 142 deletions(-)
 
 diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h
-index 271f0541..ac2d02c3 100644
+index 05c084ce..f2cf8dc8 100644
 --- a/lib/trace-cmd/include/private/trace-cmd-private.h
 +++ b/lib/trace-cmd/include/private/trace-cmd-private.h
 @@ -106,7 +106,7 @@ const char *tracecmd_get_trace_clock(struct tracecmd_input *handle);
@@ -48,7 +48,7 @@
  int tracecmd_write_options(struct tracecmd_output *handle);
  int tracecmd_write_meta_strings(struct tracecmd_output *handle);
  int tracecmd_append_options(struct tracecmd_output *handle);
-@@ -393,7 +393,7 @@ struct tracecmd_msg_handle {
+@@ -394,7 +394,7 @@ struct tracecmd_msg_handle {
  	short			cpu_count;
  	short			version;	/* Current protocol version */
  	unsigned long		flags;
@@ -57,7 +57,7 @@
  	bool			done;
  	bool			cache;
  	int			cfd;
-@@ -542,8 +542,8 @@ int tracecmd_write_guest_time_shift(struct tracecmd_output *handle,
+@@ -543,8 +543,8 @@ int tracecmd_write_guest_time_shift(struct tracecmd_output *handle,
  struct tracecmd_compress_chunk {
  	unsigned int		size;
  	unsigned int		zsize;
@@ -68,7 +68,7 @@
  };
  struct tracecmd_compression;
  struct tracecmd_compression_proto {
-@@ -569,7 +569,7 @@ int tracecmd_compress_buffer_read(struct tracecmd_compression *handle, char *dst
+@@ -570,7 +570,7 @@ int tracecmd_compress_buffer_read(struct tracecmd_compression *handle, char *dst
  int tracecmd_compress_pread(struct tracecmd_compression *handle, char *dst, int len, off_t offset);
  int tracecmd_compress_buffer_write(struct tracecmd_compression *handle,
  				   const void *data, unsigned long long size);
@@ -682,7 +682,7 @@
  
  	close(fd);
 diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c
-index bdec75d6..37bb3ec0 100644
+index 1c0f7b77..ad740d65 100644
 --- a/lib/trace-cmd/trace-output.c
 +++ b/lib/trace-cmd/trace-output.c
 @@ -112,7 +112,7 @@ do_write_check(struct tracecmd_output *handle, const void *data, long long size)
@@ -703,7 +703,7 @@
  }
  
  static inline int do_preed(struct tracecmd_output *handle, void *dst, int len, off_t offset)
-@@ -518,12 +518,12 @@ out_write_section_header(struct tracecmd_output *handle, unsigned short header_i
+@@ -526,12 +526,12 @@ out_write_section_header(struct tracecmd_output *handle, unsigned short header_i
  	/* Section ID */
  	endian2 = convert_endian_2(handle, header_id);
  	if (do_write_check(handle, &endian2, 2))
@@ -718,7 +718,7 @@
  
  	/* Section description */
  	if (description)
-@@ -532,13 +532,13 @@ out_write_section_header(struct tracecmd_output *handle, unsigned short header_i
+@@ -540,13 +540,13 @@ out_write_section_header(struct tracecmd_output *handle, unsigned short header_i
  		desc = -1;
  	endian4 = convert_endian_4(handle, desc);
  	if (do_write_check(handle, &endian4, 4))
@@ -734,7 +734,7 @@
  	return offset;
  }
  
-@@ -559,13 +559,13 @@ __hidden int out_update_section_header(struct tracecmd_output *handle, tsize_t o
+@@ -567,13 +567,13 @@ __hidden int out_update_section_header(struct tracecmd_output *handle, tsize_t o
  	if (size < 8)
  		return -1;
  	size -= 8;
@@ -750,7 +750,7 @@
  		return -1;
  	return 0;
  }
-@@ -587,7 +587,7 @@ static int save_string_section(struct tracecmd_output *handle, bool compress)
+@@ -595,7 +595,7 @@ static int save_string_section(struct tracecmd_output *handle, bool compress)
  	if (compress)
  		flags |= TRACECMD_SEC_FL_COMPRESS;
  	offset = out_write_section_header(handle, TRACECMD_OPTION_STRINGS, "strings", flags, false);
@@ -759,7 +759,7 @@
  		return -1;
  
  	out_compression_start(handle, compress);
-@@ -637,7 +637,7 @@ static int read_header_files(struct tracecmd_output *handle, bool compress)
+@@ -645,7 +645,7 @@ static int read_header_files(struct tracecmd_output *handle, bool compress)
  		flags |= TRACECMD_SEC_FL_COMPRESS;
  	offset = out_write_section_header(handle, TRACECMD_OPTION_HEADER_INFO,
  					  "headers", flags, true);
@@ -768,7 +768,7 @@
  		return -1;
  
  	out_compression_start(handle, compress);
-@@ -965,7 +965,7 @@ static int read_ftrace_files(struct tracecmd_output *handle, bool compress)
+@@ -973,7 +973,7 @@ static int read_ftrace_files(struct tracecmd_output *handle, bool compress)
  		flags |= TRACECMD_SEC_FL_COMPRESS;
  	offset = out_write_section_header(handle, TRACECMD_OPTION_FTRACE_EVENTS,
  					  "ftrace events", flags, true);
@@ -777,7 +777,7 @@
  		return -1;
  
  	create_event_list_item(handle, &systems, &list);
-@@ -1024,7 +1024,7 @@ static int read_event_files(struct tracecmd_output *handle,
+@@ -1032,7 +1032,7 @@ static int read_event_files(struct tracecmd_output *handle,
  		flags |= TRACECMD_SEC_FL_COMPRESS;
  	offset = out_write_section_header(handle, TRACECMD_OPTION_EVENT_FORMATS,
  					  "events format", flags, true);
@@ -786,7 +786,7 @@
  		return -1;
  	/*
  	 * If any of the list is the special keyword "all" then
-@@ -1138,7 +1138,7 @@ static int read_proc_kallsyms(struct tracecmd_output *handle, bool compress)
+@@ -1146,7 +1146,7 @@ static int read_proc_kallsyms(struct tracecmd_output *handle, bool compress)
  		flags |= TRACECMD_SEC_FL_COMPRESS;
  	offset = out_write_section_header(handle, TRACECMD_OPTION_KALLSYMS,
  					  "kallsyms", flags, true);
@@ -795,7 +795,7 @@
  		return -1;
  
  	out_compression_start(handle, compress);
-@@ -1202,7 +1202,7 @@ static int read_ftrace_printk(struct tracecmd_output *handle, bool compress)
+@@ -1210,7 +1210,7 @@ static int read_ftrace_printk(struct tracecmd_output *handle, bool compress)
  	if (compress)
  		flags |= TRACECMD_SEC_FL_COMPRESS;
  	offset = out_write_section_header(handle, TRACECMD_OPTION_PRINTK, "printk", flags, true);
@@ -804,7 +804,7 @@
  		return -1;
  
  	out_compression_start(handle, compress);
-@@ -1247,8 +1247,8 @@ static int save_tracing_file_data(struct tracecmd_output *handle,
+@@ -1255,8 +1255,8 @@ static int save_tracing_file_data(struct tracecmd_output *handle,
  	unsigned long long endian8;
  	char *file = NULL;
  	struct stat st;
@@ -815,7 +815,7 @@
  	int ret = -1;
  
  	file = get_tracing_file(handle, filename);
-@@ -1842,9 +1842,9 @@ static int write_options_v6(struct tracecmd_output *handle)
+@@ -1850,9 +1850,9 @@ static int write_options_v6(struct tracecmd_output *handle)
  	return 0;
  }
  
@@ -827,7 +827,7 @@
  		return -1;
  	offset = convert_endian_8(handle, offset);
  	if (do_write_check(handle, &offset, 8))
-@@ -1867,7 +1867,7 @@ static int update_options_start(struct tracecmd_output *handle, off64_t offset)
+@@ -1875,7 +1875,7 @@ static int update_options_start(struct tracecmd_output *handle, off64_t offset)
   *
   * Returns zero on success and -1 on error.
   */
@@ -836,7 +836,7 @@
  {
  	tsize_t curr;
  	int ret;
-@@ -1887,7 +1887,7 @@ int tracecmd_prepare_options(struct tracecmd_output *handle, off64_t offset, int
+@@ -1895,7 +1895,7 @@ int tracecmd_prepare_options(struct tracecmd_output *handle, off64_t offset, int
  		break;
  	case SEEK_END:
  		offset = do_lseek(handle, offset, SEEK_END);
@@ -845,7 +845,7 @@
  			return -1;
  		break;
  	}
-@@ -2059,7 +2059,7 @@ __hidden void *trace_get_options(struct tracecmd_output *handle, size_t *len)
+@@ -2067,7 +2067,7 @@ __hidden void *trace_get_options(struct tracecmd_output *handle, size_t *len)
  	if (!buf)
  		goto out;
  
@@ -854,7 +854,7 @@
  		goto out;
  	*len = read(msg_handle.cfd, buf, offset);
  	if (*len != offset) {
-@@ -2270,7 +2270,7 @@ int tracecmd_write_cmdlines(struct tracecmd_output *handle)
+@@ -2278,7 +2278,7 @@ int tracecmd_write_cmdlines(struct tracecmd_output *handle)
  		flags |= TRACECMD_SEC_FL_COMPRESS;
  	offset = out_write_section_header(handle, TRACECMD_OPTION_CMDLINES,
  					  "command lines", flags, true);
@@ -863,7 +863,7 @@
  		return -1;
  
  	out_compression_start(handle, compress);
-@@ -2519,7 +2519,7 @@ static int update_buffer_cpu_offset_v6(struct tracecmd_output *handle,
+@@ -2527,7 +2527,7 @@ static int update_buffer_cpu_offset_v6(struct tracecmd_output *handle,
  	current = do_lseek(handle, 0, SEEK_CUR);
  
  	/* Go to the option data, where will write the offest */
@@ -872,7 +872,7 @@
  		tracecmd_warning("could not seek to %lld", b_offset);
  		return -1;
  	}
-@@ -2528,7 +2528,7 @@ static int update_buffer_cpu_offset_v6(struct tracecmd_output *handle,
+@@ -2536,7 +2536,7 @@ static int update_buffer_cpu_offset_v6(struct tracecmd_output *handle,
  		return -1;
  
  	/* Go back to end of file */
@@ -881,7 +881,7 @@
  		tracecmd_warning("could not seek to %lld", offset);
  		return -1;
  	}
-@@ -2652,7 +2652,7 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle,
+@@ -2660,7 +2660,7 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle,
  		data_files[i].data_offset &= ~(page_size - 1);
  
  		ret = do_lseek(handle, data_files[i].data_offset, SEEK_SET);
@@ -890,7 +890,7 @@
  			goto out_free;
  
  		if (!tracecmd_get_quiet(handle))
-@@ -2660,7 +2660,7 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle,
+@@ -2668,7 +2668,7 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle,
  				i, (unsigned long long)data_files[i].data_offset);
  
  		if (data[i].size) {
@@ -899,7 +899,7 @@
  				goto out_free;
  			read_size = out_copy_fd_compress(handle, data[i].fd,
  							 data[i].size, &data_files[i].write_size,
-@@ -2678,19 +2678,19 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle,
+@@ -2686,19 +2686,19 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle,
  
  		if (!HAS_SECTIONS(handle)) {
  			/* Write the real CPU data offset in the file */
@@ -922,7 +922,7 @@
  				goto out_free;
  		}
  		if (!tracecmd_get_quiet(handle)) {
-@@ -2709,7 +2709,7 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle,
+@@ -2717,7 +2717,7 @@ __hidden int out_write_cpu_data(struct tracecmd_output *handle,
  		goto out_free;
  
  	free(data_files);
@@ -931,7 +931,7 @@
  		return -1;
  
  	if (out_update_section_header(handle, offset))
-@@ -2978,7 +2978,7 @@ __hidden int out_save_options_offset(struct tracecmd_output *handle, unsigned lo
+@@ -2986,7 +2986,7 @@ __hidden int out_save_options_offset(struct tracecmd_output *handle, unsigned lo
  			return -1;
  
  		new = do_lseek(handle, 0, SEEK_CUR);
@@ -940,7 +940,7 @@
  			return -1;
  
  		en8 = convert_endian_8(handle, start);
-@@ -2986,7 +2986,7 @@ __hidden int out_save_options_offset(struct tracecmd_output *handle, unsigned lo
+@@ -2994,7 +2994,7 @@ __hidden int out_save_options_offset(struct tracecmd_output *handle, unsigned lo
  			return -1;
  
  		handle->options_start = new;
@@ -950,7 +950,7 @@
  	} else {
  		handle->options_start = start;
 diff --git a/lib/trace-cmd/trace-recorder.c b/lib/trace-cmd/trace-recorder.c
-index f387091f..a5ac8be3 100644
+index 23499f30..c172ad64 100644
 --- a/lib/trace-cmd/trace-recorder.c
 +++ b/lib/trace-cmd/trace-recorder.c
 @@ -51,7 +51,7 @@ static int append_file(int size, int dst, int src)
diff --git a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0002-Drop-using-_LARGEFILE64_SOURCE.patch b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0002-Drop-using-_LARGEFILE64_SOURCE.patch
new file mode 100644
index 0000000..7b2ea79
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0002-Drop-using-_LARGEFILE64_SOURCE.patch
@@ -0,0 +1,145 @@
+From 47005e155c291ee6a2460cbf9eee604997e87063 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 9 Jan 2023 14:48:49 -0800
+Subject: [PATCH 2/2] Drop using _LARGEFILE64_SOURCE
+
+Its no longer needed since we have dropped using LF64 interfaces
+
+Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20230109225315.1284538-2-raj.khem@gmail.com/T/#u]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/trace-cmd/trace-input.c    | 1 -
+ lib/trace-cmd/trace-output.c   | 1 -
+ lib/trace-cmd/trace-recorder.c | 1 -
+ tracecmd/trace-hist.c          | 1 -
+ tracecmd/trace-listen.c        | 1 -
+ tracecmd/trace-mem.c           | 1 -
+ tracecmd/trace-profile.c       | 1 -
+ tracecmd/trace-read.c          | 1 -
+ tracecmd/trace-restore.c       | 1 -
+ tracecmd/trace-split.c         | 1 -
+ 10 files changed, 10 deletions(-)
+
+diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
+index 9b128403..3dd13ce4 100644
+--- a/lib/trace-cmd/trace-input.c
++++ b/lib/trace-cmd/trace-input.c
+@@ -3,7 +3,6 @@
+  * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
+  *
+  */
+-#define _LARGEFILE64_SOURCE
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c
+index ad740d65..eee847e3 100644
+--- a/lib/trace-cmd/trace-output.c
++++ b/lib/trace-cmd/trace-output.c
+@@ -3,7 +3,6 @@
+  * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
+  *
+  */
+-#define _LARGEFILE64_SOURCE
+ #include <dirent.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+diff --git a/lib/trace-cmd/trace-recorder.c b/lib/trace-cmd/trace-recorder.c
+index c172ad64..70ce52e2 100644
+--- a/lib/trace-cmd/trace-recorder.c
++++ b/lib/trace-cmd/trace-recorder.c
+@@ -3,7 +3,6 @@
+  * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
+  *
+  */
+-#define _LARGEFILE64_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
+diff --git a/tracecmd/trace-hist.c b/tracecmd/trace-hist.c
+index efb790ac..62fe4f9b 100644
+--- a/tracecmd/trace-hist.c
++++ b/tracecmd/trace-hist.c
+@@ -5,7 +5,6 @@
+  * Several of the ideas in this file came from Arnaldo Carvalho de Melo's
+  * work on the perf ui.
+  */
+-#define _LARGEFILE64_SOURCE
+ #include <dirent.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+diff --git a/tracecmd/trace-listen.c b/tracecmd/trace-listen.c
+index 86d2b9e9..e95c5711 100644
+--- a/tracecmd/trace-listen.c
++++ b/tracecmd/trace-listen.c
+@@ -3,7 +3,6 @@
+  * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
+  *
+  */
+-#define _LARGEFILE64_SOURCE
+ #include <dirent.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+diff --git a/tracecmd/trace-mem.c b/tracecmd/trace-mem.c
+index 25eb0861..3e1ac9f3 100644
+--- a/tracecmd/trace-mem.c
++++ b/tracecmd/trace-mem.c
+@@ -11,7 +11,6 @@
+  * was written for the newer version. I decided to do some of it here
+  * in C.
+  */
+-#define _LARGEFILE64_SOURCE
+ #include <dirent.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+diff --git a/tracecmd/trace-profile.c b/tracecmd/trace-profile.c
+index 6a2cc3d0..d12a0e5e 100644
+--- a/tracecmd/trace-profile.c
++++ b/tracecmd/trace-profile.c
+@@ -5,7 +5,6 @@
+  */
+ 
+ /** FIXME: Convert numbers based on machine and file */
+-#define _LARGEFILE64_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/tracecmd/trace-read.c b/tracecmd/trace-read.c
+index c094ad6a..52ba818e 100644
+--- a/tracecmd/trace-read.c
++++ b/tracecmd/trace-read.c
+@@ -3,7 +3,6 @@
+  * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
+  *
+  */
+-#define _LARGEFILE64_SOURCE
+ #include <dirent.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+diff --git a/tracecmd/trace-restore.c b/tracecmd/trace-restore.c
+index 5bf29c52..e9ca3225 100644
+--- a/tracecmd/trace-restore.c
++++ b/tracecmd/trace-restore.c
+@@ -3,7 +3,6 @@
+  * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
+  *
+  */
+-#define _LARGEFILE64_SOURCE
+ #include <dirent.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+diff --git a/tracecmd/trace-split.c b/tracecmd/trace-split.c
+index 851ec94e..1daa847d 100644
+--- a/tracecmd/trace-split.c
++++ b/tracecmd/trace-split.c
+@@ -3,7 +3,6 @@
+  * Copyright (C) 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
+  *
+  */
+-#define _LARGEFILE64_SOURCE
+ #include <dirent.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-- 
+2.39.0
+
diff --git a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb
index 50d73df..11c4037 100644
--- a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb
+++ b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb
@@ -8,6 +8,7 @@
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;branch=master \
            file://0001-Replace-LFS64-interfaces-off64_t-and-lseek64.patch \
+           file://0002-Drop-using-_LARGEFILE64_SOURCE.patch \
            file://0001-Do-not-emit-useless-rpath.patch"
 SRCREV = "18233e4c32857cb7ddd4960beeec8360ed834fc5"
 
@@ -25,7 +26,7 @@
 }
 
 do_install() {
-       oe_runmake libdir_relative=${BASELIB} etcdir=${sysconfdir} pkgconfig_dir=${libdir}/pkgconfig DESTDIR=${D} install install_libs
+       oe_runmake libdir_relative=${baselib} etcdir=${sysconfdir} pkgconfig_dir=${libdir}/pkgconfig DESTDIR=${D} install install_libs
        # Because makefile uses cp instead of install we need to change owner of files
        chown -R root:root ${D}${libdir}
 }