[PATCH 01/17] mesa: fold mesa-gl variant into the main recipe using mcextend class

[PATCH 01/17] mesa: fold mesa-gl variant into the main recipe using mcextend class

[Alexander Kanavin]

This reduces friction in version updates and allows fully automated ones.

There was a concern that using mcextend this way may clash with proper
multiconfig setups; I have tweaked the multiconfig selftest to include
mesa packages in both multiconfig images, and ran the test with
preferred provider set to mesa, and then to mesa-gl - all passed.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-graphics/mesa/mesa-gl_21.3.4.bb |  16 -
 meta/recipes-graphics/mesa/mesa.inc          | 316 -----------------
 meta/recipes-graphics/mesa/mesa_21.3.4.bb    | 337 ++++++++++++++++++-
 3 files changed, 336 insertions(+), 333 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_21.3.4.bb
 delete mode 100644 meta/recipes-graphics/mesa/mesa.inc

diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.3.4.bb b/meta/recipes-graphics/mesa/mesa-gl_21.3.4.bb
deleted file mode 100644
index 142bb743b1..0000000000
--- a/meta/recipes-graphics/mesa/mesa-gl_21.3.4.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require mesa.inc
-
-SUMMARY += " (OpenGL only, no EGL/GLES)"
-
-PROVIDES = "virtual/libgl virtual/mesa"
-
-S = "${WORKDIR}/mesa-${PV}"
-
-# At least one DRI rendering engine is required to build mesa.
-# When no X11 is available, use osmesa for the rendering engine.
-PACKAGECONFIG ??= "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}"
-PACKAGECONFIG:class-target = "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}"
-
-# 21.0.0 version fails to build when any driver is enabled in DRIDRIVERS
-# ./mesa-21.0.0/meson.build:519:4: ERROR: Problem encountered: building dri drivers require at least one windowing system
-DRIDRIVERS ?= ""
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
deleted file mode 100644
index 71cc3b4617..0000000000
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ /dev/null
@@ -1,316 +0,0 @@
-SUMMARY = "A free implementation of the OpenGL API"
-DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \
-a system for rendering interactive 3D graphics.  \
-A variety of device drivers allows Mesa to be used in many different environments \
-ranging from software emulation to complete hardware acceleration for modern GPUs. \
-Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \
-environment."
-
-HOMEPAGE = "http://mesa3d.org"
-BUGTRACKER = "https://bugs.freedesktop.org"
-SECTION = "x11"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://docs/license.rst;md5=17a4ea65de7a9ab42437f3131e616a7f"
-
-PE = "2"
-
-SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
-           file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
-           file://0002-meson.build-make-TLS-ELF-optional.patch \
-           file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
-           file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
-           file://0001-util-format-Check-for-NEON-before-using-it.patch \
-           file://0001-v3dv-account-for-64bit-time_t-on-32bit-arches.patch \
-           "
-
-SRC_URI[sha256sum] = "77104fd4a93bce69da3b0982f8ee88ba7c4fb98cfc491a669894339cdcd4a67d"
-
-UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
-
-#because we cannot rely on the fact that all apps will use pkgconfig,
-#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
-do_install:append() {
-    if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
-        sed -i -e 's/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif defined(__unix__) \&\& defined(EGL_NO_X11) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
-    fi
-}
-
-DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native python3-mako-native gettext-native"
-EXTRANATIVEPATH += "chrpath-native"
-PROVIDES = " \
-    ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \
-    ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 virtual/libgles2 virtual/libgles3', '', d)} \
-    ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \
-    ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \
-    virtual/mesa \
-    "
-
-inherit meson pkgconfig python3native gettext features_check
-
-BBCLASSEXTEND = "native nativesdk"
-
-ANY_OF_DISTRO_FEATURES:class-target = "opengl vulkan"
-
-PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}"
-
-export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config"
-export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}"
-export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE}"
-export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"
-
-MESA_LLVM_RELEASE ?= "${LLVMVERSION}"
-
-# set the MESA_BUILD_TYPE to either 'release' (default) or 'debug'
-# by default the upstream mesa sources build a debug release
-# here we assume the user will want a release build by default
-MESA_BUILD_TYPE ?= "release"
-def check_buildtype(d):
-    _buildtype = d.getVar('MESA_BUILD_TYPE')
-    if _buildtype not in ['release', 'debug']:
-        bb.fatal("unknown build type (%s), please set MESA_BUILD_TYPE to either 'release' or 'debug'" % _buildtype)
-    if _buildtype == 'debug':
-        return 'debugoptimized'
-    return 'plain'
-MESON_BUILDTYPE = "${@check_buildtype(d)}"
-
-EXTRA_OEMESON = " \
-    -Dshared-glapi=enabled \
-    -Dgallium-opencl=disabled \
-    -Dglx-read-only-text=true \
-    -Dplatforms='${@",".join("${PLATFORMS}".split())}' \
-"
-
-def strip_comma(s):
-    return s.strip(',')
-
-PACKAGECONFIG:class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri gallium virgl', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \
-                   elf-tls \
-		   "
-PACKAGECONFIG:class-native ?= "gbm gallium egl opengl elf-tls x11"
-PACKAGECONFIG:class-nativesdk ?= "gbm gallium egl opengl elf-tls x11"
-
-PACKAGECONFIG:remove:libc-musl = "elf-tls"
-
-# "gbm" requires "dri", "opengl"
-PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled"
-
-X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr"
-# "x11" requires "opengl"
-PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}"
-PACKAGECONFIG[elf-tls] = "-Delf-tls=true, -Delf-tls=false"
-PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc"
-PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
-
-# "dri" requires "opengl"
-PACKAGECONFIG[dri] = "-Ddri-drivers=${@strip_comma('${DRIDRIVERS}')}, -Ddri-drivers='', xorgproto libdrm"
-PACKAGECONFIG[dri3] = "-Ddri3=enabled, -Ddri3=disabled, xorgproto libxshmfence"
-
-# Vulkan drivers need dri3 enabled
-# amd could be enabled as well but requires gallium-llvm with llvm >= 3.9
-VULKAN_DRIVERS = ""
-VULKAN_DRIVERS:append:x86:class-target = ",intel"
-VULKAN_DRIVERS:append:x86-64:class-target = ",intel"
-VULKAN_DRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}"
-VULKAN_DRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'broadcom', ',broadcom', '', d)}"
-PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')}, -Dvulkan-drivers='',"
-
-PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false"
-
-# "gles" requires "opengl"
-PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2=disabled"
-
-# "egl" requires "dri", "opengl"
-PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled"
-
-PACKAGECONFIG[broadcom] = ""
-PACKAGECONFIG[etnaviv] = ""
-PACKAGECONFIG[freedreno] = ""
-PACKAGECONFIG[kmsro] = ""
-PACKAGECONFIG[vc4] = ""
-PACKAGECONFIG[v3d] = ""
-
-GALLIUMDRIVERS = "swrast"
-# gallium swrast was found to crash Xorg on startup in x32 qemu
-GALLIUMDRIVERS:x86-x32 = ""
-GALLIUMDRIVERS:append:x86:class-target = ",i915,iris,crocus"
-GALLIUMDRIVERS:append:x86-64:class-target = ",i915,iris,crocus"
-
-GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}"
-GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}"
-GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'kmsro', ',kmsro', '', d)}"
-GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'vc4', ',vc4', '', d)}"
-GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'v3d', ',v3d', '', d)}"
-
-# radeonsi requires LLVM
-GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}"
-GALLIUMDRIVERS_LLVM = "r300,nouveau${GALLIUMDRIVERS_RADEONSI}"
-GALLIUMDRIVERS_LLVM:append:x86:class-target = ",svga"
-GALLIUMDRIVERS_LLVM:append:x86-64:class-target = ",svga"
-
-PACKAGECONFIG[r600] = ""
-PACKAGECONFIG[virgl] = ""
-
-GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
-GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', '', d)}"
-GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}"
-
-PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers='', libdrm"
-PACKAGECONFIG[gallium-llvm] = "-Dllvm=enabled -Dshared-llvm=enabled, -Dllvm=disabled, llvm${MESA_LLVM_RELEASE} llvm-native \
-                               elfutils"
-PACKAGECONFIG[xa]  = "-Dgallium-xa=enabled, -Dgallium-xa=disabled"
-PACKAGECONFIG[va] = "-Dgallium-va=enabled,-Dgallium-va=disabled,libva-initial"
-
-PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=enabled,-Dgallium-vdpau=disabled,libvdpau"
-
-PACKAGECONFIG[lima] = ""
-GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}"
-
-PACKAGECONFIG[panfrost] = ""
-GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panfrost', '', d)}"
-
-PACKAGECONFIG[osmesa] = "-Dosmesa=true,-Dosmesa=false"
-
-PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
-
-PACKAGECONFIG[lmsensors] = "-Dlmsensors=enabled,-Dlmsensors=disabled,lmsensors"
-
-# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
-FULL_OPTIMIZATION:append = " -fno-omit-frame-pointer"
-
-CFLAGS:append:armv5 = " -DMISSING_64BIT_ATOMICS"
-CFLAGS:append:armv6 = " -DMISSING_64BIT_ATOMICS"
-
-# Remove the mesa dependency on mesa-dev, as mesa is empty
-RDEPENDS:${PN}-dev = ""
-
-# Khronos documentation says that include/GLES2/gl2ext.h can be used for
-# OpenGL ES 3 specification as well as for OpenGL ES 2.
-# There can be applications including GLES2/gl2ext.h instead of GLES3/gl3ext.h
-# meaning we should probably bring in GLES2/gl2ext.h if someone asks for
-# development package of libgles3.
-RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev"
-
-PACKAGES =+ "libegl-mesa libegl-mesa-dev \
-             libosmesa libosmesa-dev \
-             libgl-mesa libgl-mesa-dev \
-             libglapi libglapi-dev \
-             libgbm libgbm-dev \
-             libgles1-mesa libgles1-mesa-dev \
-             libgles2-mesa libgles2-mesa-dev \
-             libgles3-mesa libgles3-mesa-dev \
-             libxatracker libxatracker-dev \
-             mesa-megadriver mesa-vulkan-drivers \
-             mesa-vdpau-drivers \
-            "
-
-do_install:append () {
-    # Drivers never need libtool .la files
-    rm -f ${D}${libdir}/dri/*.la
-    rm -f ${D}${libdir}/egl/*.la
-    rm -f ${D}${libdir}/gallium-pipe/*.la
-    rm -f ${D}${libdir}/gbm/*.la
-
-    # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used 
-    chrpath --delete ${D}${libdir}/dri/*_dri.so || true
-
-    # libwayland-egl has been moved to wayland 1.15+
-    rm -f ${D}${libdir}/libwayland-egl*
-    rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
-}
-
-# For the packages that make up the OpenGL interfaces, inject variables so that
-# they don't get Debian-renamed (which would remove the -mesa suffix), and
-# RPROVIDEs/RCONFLICTs on the generic libgl name.
-python __anonymous() {
-    pkgconfig = (d.getVar('PACKAGECONFIG') or "").split()
-    suffix = ""
-    if "-native" in d.getVar("PN"):
-        suffix = "-native"
-    for p in (("egl", "libegl", "libegl1"),
-              ("dri", "libgl", "libgl1"),
-              ("gles", "libgles1", "libglesv1-cm1"),
-              ("gles", "libgles2", "libglesv2-2"),
-              ("gles", "libgles3",)):
-        if not p[0] in pkgconfig:
-            continue
-        mlprefix = d.getVar("MLPREFIX")
-        fullp = mlprefix + p[1] + "-mesa" + suffix
-        mlprefix = d.getVar("MLPREFIX")
-        pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:])
-        d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1")
-        d.appendVar("RREPLACES:" + fullp, pkgs)
-        d.appendVar("RPROVIDES:" + fullp, pkgs)
-        d.appendVar("RCONFLICTS:" + fullp, pkgs)
-
-        d.appendVar("RRECOMMENDS:" + fullp, " ${MLPREFIX}mesa-megadriver" + suffix)
-
-        # For -dev, the first element is both the Debian and original name
-        fullp = mlprefix + p[1] + "-mesa-dev" + suffix
-        pkgs = " " + mlprefix + p[1] + "-dev" + suffix
-        d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1")
-        d.appendVar("RREPLACES:" + fullp, pkgs)
-        d.appendVar("RPROVIDES:" + fullp, pkgs)
-        d.appendVar("RCONFLICTS:" + fullp, pkgs)
-}
-
-python mesa_populate_packages() {
-    pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
-    for pkg in pkgs:
-        d.setVar("RPROVIDES:%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
-        d.setVar("RCONFLICTS:%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
-        d.setVar("RREPLACES:%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
-
-    import re
-    dri_drivers_root = oe.path.join(d.getVar('PKGD'), d.getVar('libdir'), "dri")
-    if os.path.isdir(dri_drivers_root):
-        dri_pkgs = sorted(os.listdir(dri_drivers_root))
-        lib_name = d.expand("${MLPREFIX}mesa-megadriver")
-        for p in dri_pkgs:
-            m = re.match(r'^(.*)_dri\.so$', p)
-            if m:
-                pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1))
-                d.appendVar("RPROVIDES:%s" % lib_name, pkg_name)
-                d.appendVar("RCONFLICTS:%s" % lib_name, pkg_name)
-                d.appendVar("RREPLACES:%s" % lib_name, pkg_name)
-
-    pipe_drivers_root = os.path.join(d.getVar('libdir'), "gallium-pipe")
-    do_split_packages(d, pipe_drivers_root, r'^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
-}
-
-PACKAGESPLITFUNCS:prepend = "mesa_populate_packages "
-
-PACKAGES_DYNAMIC += "^mesa-driver-.*"
-PACKAGES_DYNAMIC:class-native = "^mesa-driver-.*-native"
-
-FILES:mesa-megadriver = "${libdir}/dri/* ${datadir}/drirc.d/00-mesa-defaults.conf"
-FILES:mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan"
-FILES:${PN}-vdpau-drivers = "${libdir}/vdpau/*.so.*"
-FILES:libegl-mesa = "${libdir}/libEGL.so.*"
-FILES:libgbm = "${libdir}/libgbm.so.*"
-FILES:libgles1-mesa = "${libdir}/libGLESv1*.so.*"
-FILES:libgles2-mesa = "${libdir}/libGLESv2.so.*"
-FILES:libgl-mesa = "${libdir}/libGL.so.*"
-FILES:libglapi = "${libdir}/libglapi.so.*"
-FILES:libosmesa = "${libdir}/libOSMesa.so.*"
-FILES:libxatracker = "${libdir}/libxatracker.so.*"
-
-FILES:${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan ${libdir}/vdpau/*.so"
-FILES:libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
-FILES:libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
-FILES:libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
-FILES:libglapi-dev = "${libdir}/libglapi.*"
-FILES:libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
-FILES:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
-FILES:libgles3-mesa-dev = "${includedir}/GLES3"
-FILES:libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
-FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
-                          ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \
-                          ${libdir}/pkgconfig/xatracker.pc"
-
-# Fix upgrade path from mesa to mesa-megadriver
-RREPLACES:mesa-megadriver = "mesa"
-RCONFLICTS:mesa-megadriver = "mesa"
-RPROVIDES:mesa-megadriver = "mesa"
diff --git a/meta/recipes-graphics/mesa/mesa_21.3.4.bb b/meta/recipes-graphics/mesa/mesa_21.3.4.bb
index 4cb7e80eb5..bfb434aab7 100644
--- a/meta/recipes-graphics/mesa/mesa_21.3.4.bb
+++ b/meta/recipes-graphics/mesa/mesa_21.3.4.bb
@@ -1,5 +1,340 @@
-require ${BPN}.inc
+SUMMARY = "A free implementation of the OpenGL API"
+DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \
+a system for rendering interactive 3D graphics.  \
+A variety of device drivers allows Mesa to be used in many different environments \
+ranging from software emulation to complete hardware acceleration for modern GPUs. \
+Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \
+environment."
+
+HOMEPAGE = "http://mesa3d.org"
+BUGTRACKER = "https://bugs.freedesktop.org"
+SECTION = "x11"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://docs/license.rst;md5=17a4ea65de7a9ab42437f3131e616a7f"
+
+PE = "2"
+
+SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
+           file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
+           file://0002-meson.build-make-TLS-ELF-optional.patch \
+           file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
+           file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
+           file://0001-util-format-Check-for-NEON-before-using-it.patch \
+           file://0001-v3dv-account-for-64bit-time_t-on-32bit-arches.patch \
+           "
+
+SRC_URI[sha256sum] = "77104fd4a93bce69da3b0982f8ee88ba7c4fb98cfc491a669894339cdcd4a67d"
+
+UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
+
+#because we cannot rely on the fact that all apps will use pkgconfig,
+#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
+do_install:append() {
+    if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
+        sed -i -e 's/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif defined(__unix__) \&\& defined(EGL_NO_X11) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
+    fi
+}
+
+DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native python3-mako-native gettext-native"
+EXTRANATIVEPATH += "chrpath-native"
+PROVIDES = " \
+    ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 virtual/libgles2 virtual/libgles3', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \
+    virtual/mesa \
+    "
+
+inherit meson pkgconfig python3native gettext features_check
+
+BBCLASSEXTEND = "native nativesdk"
+
+ANY_OF_DISTRO_FEATURES:class-target = "opengl vulkan"
+
+PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}"
+
+export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config"
+export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}"
+export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE}"
+export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"
+
+MESA_LLVM_RELEASE ?= "${LLVMVERSION}"
+
+# set the MESA_BUILD_TYPE to either 'release' (default) or 'debug'
+# by default the upstream mesa sources build a debug release
+# here we assume the user will want a release build by default
+MESA_BUILD_TYPE ?= "release"
+def check_buildtype(d):
+    _buildtype = d.getVar('MESA_BUILD_TYPE')
+    if _buildtype not in ['release', 'debug']:
+        bb.fatal("unknown build type (%s), please set MESA_BUILD_TYPE to either 'release' or 'debug'" % _buildtype)
+    if _buildtype == 'debug':
+        return 'debugoptimized'
+    return 'plain'
+MESON_BUILDTYPE = "${@check_buildtype(d)}"
+
+EXTRA_OEMESON = " \
+    -Dshared-glapi=enabled \
+    -Dgallium-opencl=disabled \
+    -Dglx-read-only-text=true \
+    -Dplatforms='${@",".join("${PLATFORMS}".split())}' \
+"
+
+def strip_comma(s):
+    return s.strip(',')
+
+PACKAGECONFIG:class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri gallium virgl', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \
+                   elf-tls \
+		   "
+PACKAGECONFIG:class-native ?= "gbm gallium egl opengl elf-tls x11"
+PACKAGECONFIG:class-nativesdk ?= "gbm gallium egl opengl elf-tls x11"
+
+PACKAGECONFIG:remove:libc-musl = "elf-tls"
+
+# "gbm" requires "dri", "opengl"
+PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled"
+
+X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr"
+# "x11" requires "opengl"
+PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}"
+PACKAGECONFIG[elf-tls] = "-Delf-tls=true, -Delf-tls=false"
+PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc"
+PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
+
+# "dri" requires "opengl"
+PACKAGECONFIG[dri] = "-Ddri-drivers=${@strip_comma('${DRIDRIVERS}')}, -Ddri-drivers='', xorgproto libdrm"
+PACKAGECONFIG[dri3] = "-Ddri3=enabled, -Ddri3=disabled, xorgproto libxshmfence"
+
+# Vulkan drivers need dri3 enabled
+# amd could be enabled as well but requires gallium-llvm with llvm >= 3.9
+VULKAN_DRIVERS = ""
+VULKAN_DRIVERS:append:x86:class-target = ",intel"
+VULKAN_DRIVERS:append:x86-64:class-target = ",intel"
+VULKAN_DRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}"
+VULKAN_DRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'broadcom', ',broadcom', '', d)}"
+PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')}, -Dvulkan-drivers='',"
+
+PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false"
+
+# "gles" requires "opengl"
+PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2=disabled"
+
+# "egl" requires "dri", "opengl"
+PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled"
+
+PACKAGECONFIG[broadcom] = ""
+PACKAGECONFIG[etnaviv] = ""
+PACKAGECONFIG[freedreno] = ""
+PACKAGECONFIG[kmsro] = ""
+PACKAGECONFIG[vc4] = ""
+PACKAGECONFIG[v3d] = ""
+
+GALLIUMDRIVERS = "swrast"
+# gallium swrast was found to crash Xorg on startup in x32 qemu
+GALLIUMDRIVERS:x86-x32 = ""
+GALLIUMDRIVERS:append:x86:class-target = ",i915,iris,crocus"
+GALLIUMDRIVERS:append:x86-64:class-target = ",i915,iris,crocus"
+
+GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}"
+GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}"
+GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'kmsro', ',kmsro', '', d)}"
+GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'vc4', ',vc4', '', d)}"
+GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'v3d', ',v3d', '', d)}"
+
+# radeonsi requires LLVM
+GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}"
+GALLIUMDRIVERS_LLVM = "r300,nouveau${GALLIUMDRIVERS_RADEONSI}"
+GALLIUMDRIVERS_LLVM:append:x86:class-target = ",svga"
+GALLIUMDRIVERS_LLVM:append:x86-64:class-target = ",svga"
+
+PACKAGECONFIG[r600] = ""
+PACKAGECONFIG[virgl] = ""
+
+GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
+GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', '', d)}"
+GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}"
+
+PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers='', libdrm"
+PACKAGECONFIG[gallium-llvm] = "-Dllvm=enabled -Dshared-llvm=enabled, -Dllvm=disabled, llvm${MESA_LLVM_RELEASE} llvm-native \
+                               elfutils"
+PACKAGECONFIG[xa]  = "-Dgallium-xa=enabled, -Dgallium-xa=disabled"
+PACKAGECONFIG[va] = "-Dgallium-va=enabled,-Dgallium-va=disabled,libva-initial"
+
+PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=enabled,-Dgallium-vdpau=disabled,libvdpau"
+
+PACKAGECONFIG[lima] = ""
+GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}"
+
+PACKAGECONFIG[panfrost] = ""
+GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panfrost', '', d)}"
+
+PACKAGECONFIG[osmesa] = "-Dosmesa=true,-Dosmesa=false"
+
+PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
+
+PACKAGECONFIG[lmsensors] = "-Dlmsensors=enabled,-Dlmsensors=disabled,lmsensors"
+
+# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
+FULL_OPTIMIZATION:append = " -fno-omit-frame-pointer"
+
+CFLAGS:append:armv5 = " -DMISSING_64BIT_ATOMICS"
+CFLAGS:append:armv6 = " -DMISSING_64BIT_ATOMICS"
+
+# Remove the mesa dependency on mesa-dev, as mesa is empty
+RDEPENDS:${PN}-dev = ""
+
+# Khronos documentation says that include/GLES2/gl2ext.h can be used for
+# OpenGL ES 3 specification as well as for OpenGL ES 2.
+# There can be applications including GLES2/gl2ext.h instead of GLES3/gl3ext.h
+# meaning we should probably bring in GLES2/gl2ext.h if someone asks for
+# development package of libgles3.
+RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev"
+
+PACKAGES =+ "libegl-mesa libegl-mesa-dev \
+             libosmesa libosmesa-dev \
+             libgl-mesa libgl-mesa-dev \
+             libglapi libglapi-dev \
+             libgbm libgbm-dev \
+             libgles1-mesa libgles1-mesa-dev \
+             libgles2-mesa libgles2-mesa-dev \
+             libgles3-mesa libgles3-mesa-dev \
+             libxatracker libxatracker-dev \
+             mesa-megadriver mesa-vulkan-drivers \
+             mesa-vdpau-drivers \
+            "
+
+do_install:append () {
+    # Drivers never need libtool .la files
+    rm -f ${D}${libdir}/dri/*.la
+    rm -f ${D}${libdir}/egl/*.la
+    rm -f ${D}${libdir}/gallium-pipe/*.la
+    rm -f ${D}${libdir}/gbm/*.la
+
+    # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used 
+    chrpath --delete ${D}${libdir}/dri/*_dri.so || true
+
+    # libwayland-egl has been moved to wayland 1.15+
+    rm -f ${D}${libdir}/libwayland-egl*
+    rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
+}
+
+# For the packages that make up the OpenGL interfaces, inject variables so that
+# they don't get Debian-renamed (which would remove the -mesa suffix), and
+# RPROVIDEs/RCONFLICTs on the generic libgl name.
+python __anonymous() {
+    pkgconfig = (d.getVar('PACKAGECONFIG') or "").split()
+    suffix = ""
+    if "-native" in d.getVar("PN"):
+        suffix = "-native"
+    for p in (("egl", "libegl", "libegl1"),
+              ("dri", "libgl", "libgl1"),
+              ("gles", "libgles1", "libglesv1-cm1"),
+              ("gles", "libgles2", "libglesv2-2"),
+              ("gles", "libgles3",)):
+        if not p[0] in pkgconfig:
+            continue
+        mlprefix = d.getVar("MLPREFIX")
+        fullp = mlprefix + p[1] + "-mesa" + suffix
+        mlprefix = d.getVar("MLPREFIX")
+        pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:])
+        d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1")
+        d.appendVar("RREPLACES:" + fullp, pkgs)
+        d.appendVar("RPROVIDES:" + fullp, pkgs)
+        d.appendVar("RCONFLICTS:" + fullp, pkgs)
+
+        d.appendVar("RRECOMMENDS:" + fullp, " ${MLPREFIX}mesa-megadriver" + suffix)
+
+        # For -dev, the first element is both the Debian and original name
+        fullp = mlprefix + p[1] + "-mesa-dev" + suffix
+        pkgs = " " + mlprefix + p[1] + "-dev" + suffix
+        d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1")
+        d.appendVar("RREPLACES:" + fullp, pkgs)
+        d.appendVar("RPROVIDES:" + fullp, pkgs)
+        d.appendVar("RCONFLICTS:" + fullp, pkgs)
+}
+
+python mesa_populate_packages() {
+    pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
+    for pkg in pkgs:
+        d.setVar("RPROVIDES:%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
+        d.setVar("RCONFLICTS:%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
+        d.setVar("RREPLACES:%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
+
+    import re
+    dri_drivers_root = oe.path.join(d.getVar('PKGD'), d.getVar('libdir'), "dri")
+    if os.path.isdir(dri_drivers_root):
+        dri_pkgs = sorted(os.listdir(dri_drivers_root))
+        lib_name = d.expand("${MLPREFIX}mesa-megadriver")
+        for p in dri_pkgs:
+            m = re.match(r'^(.*)_dri\.so$', p)
+            if m:
+                pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1))
+                d.appendVar("RPROVIDES:%s" % lib_name, pkg_name)
+                d.appendVar("RCONFLICTS:%s" % lib_name, pkg_name)
+                d.appendVar("RREPLACES:%s" % lib_name, pkg_name)
+
+    pipe_drivers_root = os.path.join(d.getVar('libdir'), "gallium-pipe")
+    do_split_packages(d, pipe_drivers_root, r'^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
+}
+
+PACKAGESPLITFUNCS:prepend = "mesa_populate_packages "
+
+PACKAGES_DYNAMIC += "^mesa-driver-.*"
+PACKAGES_DYNAMIC:class-native = "^mesa-driver-.*-native"
+
+FILES:mesa-megadriver = "${libdir}/dri/* ${datadir}/drirc.d/00-mesa-defaults.conf"
+FILES:mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan"
+FILES:${PN}-vdpau-drivers = "${libdir}/vdpau/*.so.*"
+FILES:libegl-mesa = "${libdir}/libEGL.so.*"
+FILES:libgbm = "${libdir}/libgbm.so.*"
+FILES:libgles1-mesa = "${libdir}/libGLESv1*.so.*"
+FILES:libgles2-mesa = "${libdir}/libGLESv2.so.*"
+FILES:libgl-mesa = "${libdir}/libGL.so.*"
+FILES:libglapi = "${libdir}/libglapi.so.*"
+FILES:libosmesa = "${libdir}/libOSMesa.so.*"
+FILES:libxatracker = "${libdir}/libxatracker.so.*"
+
+FILES:${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan ${libdir}/vdpau/*.so"
+FILES:libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
+FILES:libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
+FILES:libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
+FILES:libglapi-dev = "${libdir}/libglapi.*"
+FILES:libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
+FILES:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
+FILES:libgles3-mesa-dev = "${includedir}/GLES3"
+FILES:libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
+FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
+                          ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \
+                          ${libdir}/pkgconfig/xatracker.pc"
+
+# Fix upgrade path from mesa to mesa-megadriver
+RREPLACES:mesa-megadriver = "mesa"
+RCONFLICTS:mesa-megadriver = "mesa"
+RPROVIDES:mesa-megadriver = "mesa"
+
+# basic mesa recipe
 DRIDRIVERS ??= ""
 DRIDRIVERS:append:x86:class-target = ",r100,r200,nouveau,i965"
 DRIDRIVERS:append:x86-64:class-target = ",r100,r200,nouveau,i965"
 
+# mesa-gl variant
+inherit mcextend
+
+BBCLASSEXTEND += "mcextend:gl"
+
+S:virtclass-mcextend-gl = "${WORKDIR}/mesa-${PV}"
+
+SUMMARY:append:virtclass-mcextend-gl = " (OpenGL only, no EGL/GLES)"
+
+PROVIDES:virtclass-mcextend-gl = "virtual/libgl virtual/mesa"
+
+# At least one DRI rendering engine is required to build mesa.
+# When no X11 is available, use osmesa for the rendering engine.
+PACKAGECONFIG:virtclass-mcextend-gl = "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}"
+
+# 21.0.0 version fails to build when any driver is enabled in DRIDRIVERS
+# ./mesa-21.0.0/meson.build:519:4: ERROR: Problem encountered: building dri drivers require at least one windowing system
+DRIDRIVERS:virtclass-mcextend-gl = ""
-- 
2.20.1

[PATCH 02/17] bind: upgrade 9.16.24 -> 9.16.25

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

License-Update: copyright years

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../0001-avoid-start-failure-with-bind-user.patch             | 0
 ...0001-named-lwresd-V-and-start-log-hide-build-options.patch | 0
 ...bind-ensure-searching-for-json-headers-searches-sysr.patch | 0
 .../bind/{bind-9.16.24 => bind-9.16.25}/bind9                 | 0
 .../bind/{bind-9.16.24 => bind-9.16.25}/conf.patch            | 0
 .../bind/{bind-9.16.24 => bind-9.16.25}/generate-rndc-key.sh  | 0
 .../init.d-add-support-for-read-only-rootfs.patch             | 0
 .../make-etc-initd-bind-stop-work.patch                       | 0
 .../bind/{bind-9.16.24 => bind-9.16.25}/named.service         | 0
 .../bind/{bind_9.16.24.bb => bind_9.16.25.bb}                 | 4 ++--
 10 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/bind/{bind-9.16.24 => bind-9.16.25}/0001-avoid-start-failure-with-bind-user.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.16.24 => bind-9.16.25}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.16.24 => bind-9.16.25}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.16.24 => bind-9.16.25}/bind9 (100%)
 rename meta/recipes-connectivity/bind/{bind-9.16.24 => bind-9.16.25}/conf.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.16.24 => bind-9.16.25}/generate-rndc-key.sh (100%)
 rename meta/recipes-connectivity/bind/{bind-9.16.24 => bind-9.16.25}/init.d-add-support-for-read-only-rootfs.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.16.24 => bind-9.16.25}/make-etc-initd-bind-stop-work.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.16.24 => bind-9.16.25}/named.service (100%)
 rename meta/recipes-connectivity/bind/{bind_9.16.24.bb => bind_9.16.25.bb} (96%)

diff --git a/meta/recipes-connectivity/bind/bind-9.16.24/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind-9.16.25/0001-avoid-start-failure-with-bind-user.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.16.24/0001-avoid-start-failure-with-bind-user.patch
rename to meta/recipes-connectivity/bind/bind-9.16.25/0001-avoid-start-failure-with-bind-user.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.24/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.16.25/0001-named-lwresd-V-and-start-log-hide-build-options.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.16.24/0001-named-lwresd-V-and-start-log-hide-build-options.patch
rename to meta/recipes-connectivity/bind/bind-9.16.25/0001-named-lwresd-V-and-start-log-hide-build-options.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.24/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind-9.16.25/bind-ensure-searching-for-json-headers-searches-sysr.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.16.24/bind-ensure-searching-for-json-headers-searches-sysr.patch
rename to meta/recipes-connectivity/bind/bind-9.16.25/bind-ensure-searching-for-json-headers-searches-sysr.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.24/bind9 b/meta/recipes-connectivity/bind/bind-9.16.25/bind9
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.16.24/bind9
rename to meta/recipes-connectivity/bind/bind-9.16.25/bind9
diff --git a/meta/recipes-connectivity/bind/bind-9.16.24/conf.patch b/meta/recipes-connectivity/bind/bind-9.16.25/conf.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.16.24/conf.patch
rename to meta/recipes-connectivity/bind/bind-9.16.25/conf.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.24/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind-9.16.25/generate-rndc-key.sh
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.16.24/generate-rndc-key.sh
rename to meta/recipes-connectivity/bind/bind-9.16.25/generate-rndc-key.sh
diff --git a/meta/recipes-connectivity/bind/bind-9.16.24/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind-9.16.25/init.d-add-support-for-read-only-rootfs.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.16.24/init.d-add-support-for-read-only-rootfs.patch
rename to meta/recipes-connectivity/bind/bind-9.16.25/init.d-add-support-for-read-only-rootfs.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.24/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind-9.16.25/make-etc-initd-bind-stop-work.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.16.24/make-etc-initd-bind-stop-work.patch
rename to meta/recipes-connectivity/bind/bind-9.16.25/make-etc-initd-bind-stop-work.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.24/named.service b/meta/recipes-connectivity/bind/bind-9.16.25/named.service
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.16.24/named.service
rename to meta/recipes-connectivity/bind/bind-9.16.25/named.service
diff --git a/meta/recipes-connectivity/bind/bind_9.16.24.bb b/meta/recipes-connectivity/bind/bind_9.16.25.bb
similarity index 96%
rename from meta/recipes-connectivity/bind/bind_9.16.24.bb
rename to meta/recipes-connectivity/bind/bind_9.16.25.bb
index ef5fd42ef8..27a1683a5c 100644
--- a/meta/recipes-connectivity/bind/bind_9.16.24.bb
+++ b/meta/recipes-connectivity/bind/bind_9.16.25.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "BIND 9 provides a full-featured Domain Name Server system"
 SECTION = "console/network"
 
 LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ef10b4de6371115dcecdc38ca2af4561"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e7b3c52170a348459a4ff3f5ce95e37"
 
 DEPENDS = "openssl libcap zlib libuv"
 
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
            file://0001-avoid-start-failure-with-bind-user.patch \
            "
 
-SRC_URI[sha256sum] = "5582f3734bd6232284f93f14206b8a46d1f819dea4797ae157066f6963b08507"
+SRC_URI[sha256sum] = "9fa328850f82843ef8b7bf1ff5322cb68b110273a33f375ba41f35270f5e1ff3"
 
 UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
 # stay at 9.16 follow the ESV versions divisible by 4
-- 
2.20.1

[PATCH 03/17] ifupdown: upgrade 0.8.36 -> 0.8.37

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../ifupdown/{ifupdown_0.8.36.bb => ifupdown_0.8.37.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/ifupdown/{ifupdown_0.8.36.bb => ifupdown_0.8.37.bb} (97%)

diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.37.bb
similarity index 97%
rename from meta/recipes-core/ifupdown/ifupdown_0.8.36.bb
rename to meta/recipes-core/ifupdown/ifupdown_0.8.37.bb
index 48a7b8fb13..1b980abe06 100644
--- a/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb
+++ b/meta/recipes-core/ifupdown/ifupdown_0.8.37.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https;branch=mast
            file://0001-ifupdown-skip-wrong-test-case.patch \
            ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \
            "
-SRCREV = "c73226073e2b13970ca613b20a13b9c0253bf9da"
+SRCREV = "2b4138f36ce3ba37186aa01b502273e0c39ab518"
 
 S = "${WORKDIR}/git"
 
-- 
2.20.1

[PATCH 04/17] ethtool: upgrade 5.15 -> 5.16

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../ethtool/ethtool/avoid_parallel_tests.patch              | 6 +++---
 .../ethtool/{ethtool_5.15.bb => ethtool_5.16.bb}            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-extended/ethtool/{ethtool_5.15.bb => ethtool_5.16.bb} (93%)

diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
index 0ec3537198..034dc92444 100644
--- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
+++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
@@ -1,4 +1,4 @@
-From cd444e576d446b7ccb51a26a02c0e75d6ee2abf2 Mon Sep 17 00:00:00 2001
+From d98b1e29b89962954690e6a8ddfdd80276407ce7 Mon Sep 17 00:00:00 2001
 From: Tudor Florea <tudor.florea@enea.com>
 Date: Wed, 28 May 2014 18:59:54 +0200
 Subject: [PATCH] ethtool: use serial-tests config needed by ptest.
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 6c9453c..7c0f829 100644
+index 8fc93c8..94ee28d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
- AC_INIT(ethtool, 5.15, netdev@vger.kernel.org)
+ AC_INIT(ethtool, 5.16, netdev@vger.kernel.org)
  AC_PREREQ(2.52)
  AC_CONFIG_SRCDIR([ethtool.c])
 -AM_INIT_AUTOMAKE([gnu subdir-objects])
diff --git a/meta/recipes-extended/ethtool/ethtool_5.15.bb b/meta/recipes-extended/ethtool/ethtool_5.16.bb
similarity index 93%
rename from meta/recipes-extended/ethtool/ethtool_5.15.bb
rename to meta/recipes-extended/ethtool/ethtool_5.16.bb
index 4192dec300..861fe3bb7c 100644
--- a/meta/recipes-extended/ethtool/ethtool_5.15.bb
+++ b/meta/recipes-extended/ethtool/ethtool_5.16.bb
@@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
            file://avoid_parallel_tests.patch \
            "
 
-SRC_URI[sha256sum] = "a6a1638192209269ca74a29d73903f28531ebdf0794f3e0bdfdbdee2dc75d98b"
+SRC_URI[sha256sum] = "4160fa127d75d5a6ebd5e871118486ac730dea2f28b2f1ad40fd1ed3d0d369e0"
 
 UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/"
 
-- 
2.20.1

[PATCH 05/17] webkitgtk: upgrade 2.34.3 -> 2.34.4

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../webkit/{webkitgtk_2.34.3.bb => webkitgtk_2.34.4.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-sato/webkit/{webkitgtk_2.34.3.bb => webkitgtk_2.34.4.bb} (98%)

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.34.4.bb
similarity index 98%
rename from meta/recipes-sato/webkit/webkitgtk_2.34.3.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.34.4.bb
index 4b3d89ad82..cfae4eafef 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.34.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.34.4.bb
@@ -21,7 +21,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://reproducibility.patch \
            "
 
-SRC_URI[sha256sum] = "0d2f37aa32e21a36e4dd5a5ce7ae5ce27435c29d6803b962b8c90cb0cc49c52d"
+SRC_URI[sha256sum] = "975f5019199ba7699191835cf75e01a18b94e3bcd0107da7389d4ddcb1aba406"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
 
-- 
2.20.1

[PATCH 06/17] debianutils: upgrade 5.5 -> 5.7

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../debianutils/{debianutils_5.5.bb => debianutils_5.7.bb}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/debianutils/{debianutils_5.5.bb => debianutils_5.7.bb} (97%)

diff --git a/meta/recipes-support/debianutils/debianutils_5.5.bb b/meta/recipes-support/debianutils/debianutils_5.7.bb
similarity index 97%
rename from meta/recipes-support/debianutils/debianutils_5.5.bb
rename to meta/recipes-support/debianutils/debianutils_5.7.bb
index 6eea86f6d3..cc61b4394f 100644
--- a/meta/recipes-support/debianutils/debianutils_5.5.bb
+++ b/meta/recipes-support/debianutils/debianutils_5.7.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=9b912cd0cc654134c0ef3424a0705b94
 SRC_URI = "git://salsa.debian.org/debian/debianutils.git;protocol=https;branch=master \
            "
 
-SRCREV = "4c420893485ad07d771c327ef899819d4846408f"
+SRCREV = "de14223e5bffe15e374a441302c528ffc1cbed57"
 
 inherit autotools update-alternatives
 
-- 
2.20.1

[PATCH 07/17] diffoscope: upgrade 200 -> 201

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../diffoscope/{diffoscope_200.bb => diffoscope_201.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/diffoscope/{diffoscope_200.bb => diffoscope_201.bb} (92%)

diff --git a/meta/recipes-support/diffoscope/diffoscope_200.bb b/meta/recipes-support/diffoscope/diffoscope_201.bb
similarity index 92%
rename from meta/recipes-support/diffoscope/diffoscope_200.bb
rename to meta/recipes-support/diffoscope/diffoscope_201.bb
index 4239b34d9d..b3c25e1bda 100644
--- a/meta/recipes-support/diffoscope/diffoscope_200.bb
+++ b/meta/recipes-support/diffoscope/diffoscope_201.bb
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope"
 
 inherit pypi setuptools3
 
-SRC_URI[sha256sum] = "2fadac87b41cd5238fad7a624bab47ff5cd4c1f70c523e4e9cf6706c9d1a5e53"
+SRC_URI[sha256sum] = "07bd0b2972e7c4926db7f65bcf23fd106ad42169dbdaef3dc63278af82c5e38f"
 
 RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm"
 
-- 
2.20.1

[PATCH 08/17] libbsd: upgrade 0.11.3 -> 0.11.5

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

License-Update: additional files

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../libbsd/{libbsd_0.11.3.bb => libbsd_0.11.5.bb}             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libbsd/{libbsd_0.11.3.bb => libbsd_0.11.5.bb} (90%)

diff --git a/meta/recipes-support/libbsd/libbsd_0.11.3.bb b/meta/recipes-support/libbsd/libbsd_0.11.5.bb
similarity index 90%
rename from meta/recipes-support/libbsd/libbsd_0.11.3.bb
rename to meta/recipes-support/libbsd/libbsd_0.11.5.bb
index 8daea9f762..bb8766a070 100644
--- a/meta/recipes-support/libbsd/libbsd_0.11.3.bb
+++ b/meta/recipes-support/libbsd/libbsd_0.11.5.bb
@@ -29,12 +29,12 @@ HOMEPAGE = "https://libbsd.freedesktop.org/wiki/"
 # License: public-domain-Colin-Plumb
 LICENSE = "BSD-3-Clause & BSD-4-Clause & ISC & PD"
 LICENSE:${PN} = "BSD-3-Clause & ISC & PD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=adf6172075bcc5837e33a8a688eb7e22"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0b31944ca2c1075410a30f0c17379d3b"
 SECTION = "libs"
 
 SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "ff95cf8184151dacae4247832f8d4ea8800fa127dbd15033ecfe839f285b42a1"
+SRC_URI[sha256sum] = "1a9c952525635c1bb6770cb22e969b938d8e6a9d7912362b98ee8370599b0efd"
 
 inherit autotools pkgconfig
 
-- 
2.20.1

[PATCH 09/17] libical: upgrade 3.0.12 -> 3.0.13

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../libical/{libical_3.0.12.bb => libical_3.0.13.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/libical/{libical_3.0.12.bb => libical_3.0.13.bb} (96%)

diff --git a/meta/recipes-support/libical/libical_3.0.12.bb b/meta/recipes-support/libical/libical_3.0.13.bb
similarity index 96%
rename from meta/recipes-support/libical/libical_3.0.12.bb
rename to meta/recipes-support/libical/libical_3.0.13.bb
index 832d244672..cfd62ea672 100644
--- a/meta/recipes-support/libical/libical_3.0.12.bb
+++ b/meta/recipes-support/libical/libical_3.0.13.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \
 SECTION = "libs"
 
 SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz"
-SRC_URI[sha256sum] = "35095a4cc1a061a3de0f332c2dc728226cf127fa0baa818e9f8856cee6d35830"
+SRC_URI[sha256sum] = "02543b08897f3b75c76c360a335900ccfb027d2f5120176c777340e67e763ad4"
 UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases"
 
 inherit cmake pkgconfig gobject-introspection vala
-- 
2.20.1

[PATCH 10/17] wpa-supplicant: update 2.9 -> 2.10

[Alexander Kanavin]

License-Update: copyright years

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...re-management-frame-from-unexpected-.patch |  82 ----------
 ...allow-event-subscriptions-with-URLs-.patch | 151 ------------------
 ...-systemd-install-Alias-with-WantedBy.patch |  52 ------
 ...nt-message-generation-using-a-long-U.patch |  62 -------
 ...HTTP-initiation-failures-for-events-.patch |  50 ------
 .../wpa-supplicant/CVE-2021-0326.patch        |  45 ------
 .../wpa-supplicant/CVE-2021-27803.patch       |  58 -------
 .../wpa-supplicant/CVE-2021-30004.patch       | 123 --------------
 ...pplicant_2.9.bb => wpa-supplicant_2.10.bb} |  21 +--
 9 files changed, 6 insertions(+), 638 deletions(-)
 delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
 delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
 delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-replace-systemd-install-Alias-with-WantedBy.patch
 delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
 delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
 delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-0326.patch
 delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-27803.patch
 delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-30004.patch
 rename meta/recipes-connectivity/wpa-supplicant/{wpa-supplicant_2.9.bb => wpa-supplicant_2.10.bb} (79%)

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
deleted file mode 100644
index 7b0713cf6d..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-hostapd before 2.10 and wpa_supplicant before 2.10 allow an incorrect indication
-of disconnection in certain situations because source address validation is
-mishandled. This is a denial of service that should have been prevented by PMF
-(aka management frame protection). The attacker must send a crafted 802.11 frame
-from a location that is within the 802.11 communications range.
-
-CVE: CVE-2019-16275
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Thu, 29 Aug 2019 11:52:04 +0300
-Subject: [PATCH] AP: Silently ignore management frame from unexpected source
- address
-
-Do not process any received Management frames with unexpected/invalid SA
-so that we do not add any state for unexpected STA addresses or end up
-sending out frames to unexpected destination. This prevents unexpected
-sequences where an unprotected frame might end up causing the AP to send
-out a response to another device and that other device processing the
-unexpected response.
-
-In particular, this prevents some potential denial of service cases
-where the unexpected response frame from the AP might result in a
-connected station dropping its association.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/ap/drv_callbacks.c | 13 +++++++++++++
- src/ap/ieee802_11.c    | 12 ++++++++++++
- 2 files changed, 25 insertions(+)
-
-diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
-index 31587685fe3b..34ca379edc3d 100644
---- a/src/ap/drv_callbacks.c
-+++ b/src/ap/drv_callbacks.c
-@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
- 			   "hostapd_notif_assoc: Skip event with no address");
- 		return -1;
- 	}
-+
-+	if (is_multicast_ether_addr(addr) ||
-+	    is_zero_ether_addr(addr) ||
-+	    os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) {
-+		/* Do not process any frames with unexpected/invalid SA so that
-+		 * we do not add any state for unexpected STA addresses or end
-+		 * up sending out frames to unexpected destination. */
-+		wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR
-+			   " in received indication - ignore this indication silently",
-+			   __func__, MAC2STR(addr));
-+		return 0;
-+	}
-+
- 	random_add_randomness(addr, ETH_ALEN);
- 
- 	hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
-diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
-index c85a28db44b7..e7065372e158 100644
---- a/src/ap/ieee802_11.c
-+++ b/src/ap/ieee802_11.c
-@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
- 	fc = le_to_host16(mgmt->frame_control);
- 	stype = WLAN_FC_GET_STYPE(fc);
- 
-+	if (is_multicast_ether_addr(mgmt->sa) ||
-+	    is_zero_ether_addr(mgmt->sa) ||
-+	    os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) {
-+		/* Do not process any frames with unexpected/invalid SA so that
-+		 * we do not add any state for unexpected STA addresses or end
-+		 * up sending out frames to unexpected destination. */
-+		wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR
-+			   " in received frame - ignore this frame silently",
-+			   MAC2STR(mgmt->sa));
-+		return 0;
-+	}
-+
- 	if (stype == WLAN_FC_STYPE_BEACON) {
- 		handle_beacon(hapd, mgmt, len, fi);
- 		return 1;
--- 
-2.20.1
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
deleted file mode 100644
index 53ad5d028a..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 5b78c8f961f25f4dc22d6f2b77ddd06d712cec63 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni@codeaurora.org>
-Date: Wed, 3 Jun 2020 23:17:35 +0300
-Subject: [PATCH 1/3] WPS UPnP: Do not allow event subscriptions with URLs to
- other networks
-
-The UPnP Device Architecture 2.0 specification errata ("UDA errata
-16-04-2020.docx") addresses a problem with notifications being allowed
-to go out to other domains by disallowing such cases. Do such filtering
-for the notification callback URLs to avoid undesired connections to
-external networks based on subscriptions that any device in the local
-network could request when WPS support for external registrars is
-enabled (the upnp_iface parameter in hostapd configuration).
-
-Upstream-Status: Backport
-CVE: CVE-2020-12695 patch #1
-Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
-Signed-off-by: Armin Kuster <akuster@mvista.com>
-
----
- src/wps/wps_er.c     |  2 +-
- src/wps/wps_upnp.c   | 38 ++++++++++++++++++++++++++++++++++++--
- src/wps/wps_upnp_i.h |  3 ++-
- 3 files changed, 39 insertions(+), 4 deletions(-)
-
-Index: wpa_supplicant-2.9/src/wps/wps_er.c
-===================================================================
---- wpa_supplicant-2.9.orig/src/wps/wps_er.c
-+++ wpa_supplicant-2.9/src/wps/wps_er.c
-@@ -1298,7 +1298,7 @@ wps_er_init(struct wps_context *wps, con
-			   "with %s", filter);
-	}
-	if (get_netif_info(er->ifname, &er->ip_addr, &er->ip_addr_text,
--			   er->mac_addr)) {
-+			   NULL, er->mac_addr)) {
-		wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
-			   "for %s. Does it have IP address?", er->ifname);
-		wps_er_deinit(er, NULL, NULL);
-Index: wpa_supplicant-2.9/src/wps/wps_upnp.c
-===================================================================
---- wpa_supplicant-2.9.orig/src/wps/wps_upnp.c
-+++ wpa_supplicant-2.9/src/wps/wps_upnp.c
-@@ -303,6 +303,14 @@ static void subscr_addr_free_all(struct
- }
-
-
-+static int local_network_addr(struct upnp_wps_device_sm *sm,
-+			      struct sockaddr_in *addr)
-+{
-+	return (addr->sin_addr.s_addr & sm->netmask.s_addr) ==
-+		(sm->ip_addr & sm->netmask.s_addr);
-+}
-+
-+
- /* subscr_addr_add_url -- add address(es) for one url to subscription */
- static void subscr_addr_add_url(struct subscription *s, const char *url,
-				size_t url_len)
-@@ -381,6 +389,7 @@ static void subscr_addr_add_url(struct s
-
-	for (rp = result; rp; rp = rp->ai_next) {
-		struct subscr_addr *a;
-+		struct sockaddr_in *addr = (struct sockaddr_in *) rp->ai_addr;
-
-		/* Limit no. of address to avoid denial of service attack */
-		if (dl_list_len(&s->addr_list) >= MAX_ADDR_PER_SUBSCRIPTION) {
-@@ -389,6 +398,13 @@ static void subscr_addr_add_url(struct s
-			break;
-		}
-
-+		if (!local_network_addr(s->sm, addr)) {
-+			wpa_printf(MSG_INFO,
-+				   "WPS UPnP: Ignore a delivery URL that points to another network %s",
-+				   inet_ntoa(addr->sin_addr));
-+			continue;
-+		}
-+
-		a = os_zalloc(sizeof(*a) + alloc_len);
-		if (a == NULL)
-			break;
-@@ -889,11 +905,12 @@ static int eth_get(const char *device, u
-  * @net_if: Selected network interface name
-  * @ip_addr: Buffer for returning IP address in network byte order
-  * @ip_addr_text: Buffer for returning a pointer to allocated IP address text
-+ * @netmask: Buffer for returning netmask or %NULL if not needed
-  * @mac: Buffer for returning MAC address
-  * Returns: 0 on success, -1 on failure
-  */
- int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
--		   u8 mac[ETH_ALEN])
-+		   struct in_addr *netmask, u8 mac[ETH_ALEN])
- {
-	struct ifreq req;
-	int sock = -1;
-@@ -919,6 +936,19 @@ int get_netif_info(const char *net_if, u
-	in_addr.s_addr = *ip_addr;
-	os_snprintf(*ip_addr_text, 16, "%s", inet_ntoa(in_addr));
-
-+	if (netmask) {
-+		os_memset(&req, 0, sizeof(req));
-+		os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name));
-+		if (ioctl(sock, SIOCGIFNETMASK, &req) < 0) {
-+			wpa_printf(MSG_ERROR,
-+				   "WPS UPnP: SIOCGIFNETMASK failed: %d (%s)",
-+				   errno, strerror(errno));
-+			goto fail;
-+		}
-+		addr = (struct sockaddr_in *) &req.ifr_netmask;
-+		netmask->s_addr = addr->sin_addr.s_addr;
-+	}
-+
- #ifdef __linux__
-	os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name));
-	if (ioctl(sock, SIOCGIFHWADDR, &req) < 0) {
-@@ -1025,11 +1055,15 @@ static int upnp_wps_device_start(struct
-
-	/* Determine which IP and mac address we're using */
-	if (get_netif_info(net_if, &sm->ip_addr, &sm->ip_addr_text,
--			   sm->mac_addr)) {
-+			   &sm->netmask, sm->mac_addr)) {
-		wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
-			   "for %s. Does it have IP address?", net_if);
-		goto fail;
-	}
-+	wpa_printf(MSG_DEBUG, "WPS UPnP: Local IP address %s netmask %s hwaddr "
-+		   MACSTR,
-+		   sm->ip_addr_text, inet_ntoa(sm->netmask),
-+		   MAC2STR(sm->mac_addr));
-
-	/* Listen for incoming TCP connections so that others
-	 * can fetch our "xml files" from us.
-Index: wpa_supplicant-2.9/src/wps/wps_upnp_i.h
-===================================================================
---- wpa_supplicant-2.9.orig/src/wps/wps_upnp_i.h
-+++ wpa_supplicant-2.9/src/wps/wps_upnp_i.h
-@@ -128,6 +128,7 @@ struct upnp_wps_device_sm {
-	u8 mac_addr[ETH_ALEN]; /* mac addr of network i.f. we use */
-	char *ip_addr_text; /* IP address of network i.f. we use */
-	unsigned ip_addr; /* IP address of network i.f. we use (host order) */
-+	struct in_addr netmask;
-	int multicast_sd; /* send multicast messages over this socket */
-	int ssdp_sd; /* receive discovery UPD packets on socket */
-	int ssdp_sd_registered; /* nonzero if we must unregister */
-@@ -158,7 +159,7 @@ struct subscription * subscription_find(
-					const u8 uuid[UUID_LEN]);
- void subscr_addr_delete(struct subscr_addr *a);
- int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
--		   u8 mac[ETH_ALEN]);
-+		   struct in_addr *netmask, u8 mac[ETH_ALEN]);
-
- /* wps_upnp_ssdp.c */
- void msearchreply_state_machine_stop(struct advertisement_state_machine *a);
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-replace-systemd-install-Alias-with-WantedBy.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-replace-systemd-install-Alias-with-WantedBy.patch
deleted file mode 100644
index a476cf040e..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-replace-systemd-install-Alias-with-WantedBy.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 94c401733a5a3d294cc412671166e6adfb409f53 Mon Sep 17 00:00:00 2001
-From: Joshua DeWeese <jdeweese@hennypenny.com>
-Date: Wed, 30 Jan 2019 16:19:47 -0500
-Subject: [PATCH] replace systemd install Alias with WantedBy
-
-According to the systemd documentation "WantedBy=foo.service in a
-service bar.service is mostly equivalent to
-Alias=foo.service.wants/bar.service in the same file." However,
-this is not really the intended purpose of install Aliases.
-
-Upstream-Status: Submitted [hostap@lists.infradead.org]
-
-Signed-off-by: Joshua DeWeese <jdeweese@hennypenny.com>
----
- wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in | 2 +-
- wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in   | 2 +-
- wpa_supplicant/systemd/wpa_supplicant.service.arg.in         | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in
-index 03ac507..da69a87 100644
---- a/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in
-+++ b/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in
-@@ -12,4 +12,4 @@ Type=simple
- ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-nl80211-%I.conf -Dnl80211 -i%I
- 
- [Install]
--Alias=multi-user.target.wants/wpa_supplicant-nl80211@%i.service
-+WantedBy=multi-user.target
-diff --git a/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in
-index c8a744d..ca3054b 100644
---- a/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in
-+++ b/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in
-@@ -12,4 +12,4 @@ Type=simple
- ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-wired-%I.conf -Dwired -i%I
- 
- [Install]
--Alias=multi-user.target.wants/wpa_supplicant-wired@%i.service
-+WantedBy=multi-user.target
-diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in
-index 7788b38..55d2b9c 100644
---- a/wpa_supplicant/systemd/wpa_supplicant.service.arg.in
-+++ b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in
-@@ -12,4 +12,4 @@ Type=simple
- ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I
- 
- [Install]
--Alias=multi-user.target.wants/wpa_supplicant@%i.service
-+WantedBy=multi-user.target
--- 
-2.7.4
-
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
deleted file mode 100644
index 59640859dd..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From f7d268864a2660b7239b9a8ff5ad37faeeb751ba Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni@codeaurora.org>
-Date: Wed, 3 Jun 2020 22:41:02 +0300
-Subject: [PATCH 2/3] WPS UPnP: Fix event message generation using a long URL
- path
-
-More than about 700 character URL ended up overflowing the wpabuf used
-for building the event notification and this resulted in the wpabuf
-buffer overflow checks terminating the hostapd process. Fix this by
-allocating the buffer to be large enough to contain the full URL path.
-However, since that around 700 character limit has been the practical
-limit for more than ten years, start explicitly enforcing that as the
-limit or the callback URLs since any longer ones had not worked before
-and there is no need to enable them now either.
-
-Upstream-Status: Backport
-CVE: CVE-2020-12695 patch #2
-Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
-Signed-off-by: Armin Kuster <akuster@mvista.com>
-
----
- src/wps/wps_upnp.c       | 9 +++++++--
- src/wps/wps_upnp_event.c | 3 ++-
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
-index 7d4b7439940e..ab685d52ecab 100644
---- a/src/wps/wps_upnp.c
-+++ b/src/wps/wps_upnp.c
-@@ -328,9 +328,14 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
-	int rerr;
-	size_t host_len, path_len;
-
--	/* url MUST begin with http: */
--	if (url_len < 7 || os_strncasecmp(url, "http://", 7))
-+	/* URL MUST begin with HTTP scheme. In addition, limit the length of
-+	 * the URL to 700 characters which is around the limit that was
-+	 * implicitly enforced for more than 10 years due to a bug in
-+	 * generating the event messages. */
-+	if (url_len < 7 || os_strncasecmp(url, "http://", 7) || url_len > 700) {
-+		wpa_printf(MSG_DEBUG, "WPS UPnP: Reject an unacceptable URL");
-		goto fail;
-+	}
-	url += 7;
-	url_len -= 7;
-
-diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
-index d7e6edcc6503..08a23612f338 100644
---- a/src/wps/wps_upnp_event.c
-+++ b/src/wps/wps_upnp_event.c
-@@ -147,7 +147,8 @@ static struct wpabuf * event_build_message(struct wps_event_ *e)
-	struct wpabuf *buf;
-	char *b;
-
--	buf = wpabuf_alloc(1000 + wpabuf_len(e->data));
-+	buf = wpabuf_alloc(1000 + os_strlen(e->addr->path) +
-+			   wpabuf_len(e->data));
-	if (buf == NULL)
-		return NULL;
-	wpabuf_printf(buf, "NOTIFY %s HTTP/1.1\r\n", e->addr->path);
---
-2.20.1
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
deleted file mode 100644
index 8a014ef28a..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 85aac526af8612c21b3117dadc8ef5944985b476 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni@codeaurora.org>
-Date: Thu, 4 Jun 2020 21:24:04 +0300
-Subject: [PATCH 3/3] WPS UPnP: Handle HTTP initiation failures for events more
- properly
-
-While it is appropriate to try to retransmit the event to another
-callback URL on a failure to initiate the HTTP client connection, there
-is no point in trying the exact same operation multiple times in a row.
-Replve the event_retry() calls with event_addr_failure() for these cases
-to avoid busy loops trying to repeat the same failing operation.
-
-These potential busy loops would go through eloop callbacks, so the
-process is not completely stuck on handling them, but unnecessary CPU
-would be used to process the continues retries that will keep failing
-for the same reason.
-
-Upstream-Status: Backport
-CVE: CVE-2020-12695 patch #2
-Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
-Signed-off-by: Armin Kuster <akuster@mvista.com>
-
----
- src/wps/wps_upnp_event.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
-index 08a23612f338..c0d9e41d9a38 100644
---- a/src/wps/wps_upnp_event.c
-+++ b/src/wps/wps_upnp_event.c
-@@ -294,7 +294,7 @@ static int event_send_start(struct subscription *s)
-
-	buf = event_build_message(e);
-	if (buf == NULL) {
--		event_retry(e, 0);
-+		event_addr_failure(e);
-		return -1;
-	}
-
-@@ -302,7 +302,7 @@ static int event_send_start(struct subscription *s)
-					 event_http_cb, e);
-	if (e->http_event == NULL) {
-		wpabuf_free(buf);
--		event_retry(e, 0);
-+		event_addr_failure(e);
-		return -1;
-	}
-
---
-2.20.1
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-0326.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-0326.patch
deleted file mode 100644
index 8c90fa3421..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-0326.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 947272febe24a8f0ea828b5b2f35f13c3821901e Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni@codeaurora.org>
-Date: Mon, 9 Nov 2020 11:43:12 +0200
-Subject: [PATCH] P2P: Fix copying of secondary device types for P2P group
- client
-
-Parsing and copying of WPS secondary device types list was verifying
-that the contents is not too long for the internal maximum in the case
-of WPS messages, but similar validation was missing from the case of P2P
-group information which encodes this information in a different
-attribute. This could result in writing beyond the memory area assigned
-for these entries and corrupting memory within an instance of struct
-p2p_device. This could result in invalid operations and unexpected
-behavior when trying to free pointers from that corrupted memory.
-
-Upstream-Status: Backport
-CVE: CVE-2021-0326
-
-Reference to upstream patch:
-[https://w1.fi/cgit/hostap/commit/?id=947272febe24a8f0ea828b5b2f35f13c3821901e]
-
-Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27269
-Fixes: e57ae6e19edf ("P2P: Keep track of secondary device types for peers")
-Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
-Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com>
----
- src/p2p/p2p.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
-index a08ba02..079270f 100644
---- a/src/p2p/p2p.c
-+++ b/src/p2p/p2p.c
-@@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct p2p_device *dev,
- 	dev->info.config_methods = cli->config_methods;
- 	os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8);
- 	dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types;
-+	if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN)
-+		dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN;
- 	os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types,
- 		  dev->info.wps_sec_dev_type_list_len);
- }
--- 
-2.17.1
-
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-27803.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-27803.patch
deleted file mode 100644
index 004b1dbd19..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-27803.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 8460e3230988ef2ec13ce6b69b687e941f6cdb32 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni@codeaurora.org>
-Date: Tue, 8 Dec 2020 23:52:50 +0200
-Subject: [PATCH] P2P: Fix a corner case in peer addition based on PD Request
-
-p2p_add_device() may remove the oldest entry if there is no room in the
-peer table for a new peer. This would result in any pointer to that
-removed entry becoming stale. A corner case with an invalid PD Request
-frame could result in such a case ending up using (read+write) freed
-memory. This could only by triggered when the peer table has reached its
-maximum size and the PD Request frame is received from the P2P Device
-Address of the oldest remaining entry and the frame has incorrect P2P
-Device Address in the payload.
-
-Fix this by fetching the dev pointer again after having called
-p2p_add_device() so that the stale pointer cannot be used.
-
-Fixes: 17bef1e97a50 ("P2P: Add peer entry based on Provision Discovery Request")
-Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
-
-Upstream-Status: Backport
-CVE: CVE-2021-27803
-
-Reference to upstream patch:
-[https://w1.fi/cgit/hostap/commit/?id=8460e3230988ef2ec13ce6b69b687e941f6cdb32]
-
-Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com>
----
- src/p2p/p2p_pd.c | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c
-index 3994ec0..05fd593 100644
---- a/src/p2p/p2p_pd.c
-+++ b/src/p2p/p2p_pd.c
-@@ -595,14 +595,12 @@ void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa,
- 			goto out;
- 		}
- 
-+		dev = p2p_get_device(p2p, sa);
- 		if (!dev) {
--			dev = p2p_get_device(p2p, sa);
--			if (!dev) {
--				p2p_dbg(p2p,
--					"Provision Discovery device not found "
--					MACSTR, MAC2STR(sa));
--				goto out;
--			}
-+			p2p_dbg(p2p,
-+				"Provision Discovery device not found "
-+				MACSTR, MAC2STR(sa));
-+			goto out;
- 		}
- 	} else if (msg.wfd_subelems) {
- 		wpabuf_free(dev->info.wfd_subelems);
--- 
-2.17.1
-
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-30004.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-30004.patch
deleted file mode 100644
index e2540fc26b..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-30004.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sat, 13 Mar 2021 18:19:31 +0200
-Subject: [PATCH] ASN.1: Validate DigestAlgorithmIdentifier parameters
-
-The supported hash algorithms do not use AlgorithmIdentifier parameters.
-However, there are implementations that include NULL parameters in
-addition to ones that omit the parameters. Previous implementation did
-not check the parameters value at all which supported both these cases,
-but did not reject any other unexpected information.
-
-Use strict validation of digest algorithm parameters and reject any
-unexpected value when validating a signature. This is needed to prevent
-potential forging attacks.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
-
-Upstream-Status: Backport
-CVE: CVE-2021-30004
-
-Reference to upstream patch:
-[https://w1.fi/cgit/hostap/commit/?id=a0541334a6394f8237a4393b7372693cd7e96f15]
-
-Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com>
----
- src/tls/pkcs1.c  | 21 +++++++++++++++++++++
- src/tls/x509v3.c | 20 ++++++++++++++++++++
- 2 files changed, 41 insertions(+)
-
-diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c
-index 141ac50..e09db07 100644
---- a/src/tls/pkcs1.c
-+++ b/src/tls/pkcs1.c
-@@ -240,6 +240,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
- 		os_free(decrypted);
- 		return -1;
- 	}
-+	wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo",
-+		    hdr.payload, hdr.length);
- 
- 	pos = hdr.payload;
- 	end = pos + hdr.length;
-@@ -261,6 +263,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
- 		os_free(decrypted);
- 		return -1;
- 	}
-+	wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier",
-+		    hdr.payload, hdr.length);
- 	da_end = hdr.payload + hdr.length;
- 
- 	if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) {
-@@ -269,6 +273,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
- 		os_free(decrypted);
- 		return -1;
- 	}
-+	wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters",
-+		    next, da_end - next);
-+
-+	/*
-+	 * RFC 5754: The correct encoding for the SHA2 algorithms would be to
-+	 * omit the parameters, but there are implementation that encode these
-+	 * as a NULL element. Allow these two cases and reject anything else.
-+	 */
-+	if (da_end > next &&
-+	    (asn1_get_next(next, da_end - next, &hdr) < 0 ||
-+	     !asn1_is_null(&hdr) ||
-+	     hdr.payload + hdr.length != da_end)) {
-+		wpa_printf(MSG_DEBUG,
-+			   "PKCS #1: Unexpected digest algorithm parameters");
-+		os_free(decrypted);
-+		return -1;
-+	}
- 
- 	if (!asn1_oid_equal(&oid, hash_alg)) {
- 		char txt[100], txt2[100];
-diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c
-index 1bd5aa0..bf2289f 100644
---- a/src/tls/x509v3.c
-+++ b/src/tls/x509v3.c
-@@ -1834,6 +1834,7 @@ int x509_check_signature(struct x509_certificate *issuer,
- 		os_free(data);
- 		return -1;
- 	}
-+	wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length);
- 
- 	pos = hdr.payload;
- 	end = pos + hdr.length;
-@@ -1855,6 +1856,8 @@ int x509_check_signature(struct x509_certificate *issuer,
- 		os_free(data);
- 		return -1;
- 	}
-+	wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier",
-+		    hdr.payload, hdr.length);
- 	da_end = hdr.payload + hdr.length;
- 
- 	if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) {
-@@ -1862,6 +1865,23 @@ int x509_check_signature(struct x509_certificate *issuer,
- 		os_free(data);
- 		return -1;
- 	}
-+	wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters",
-+		    next, da_end - next);
-+
-+	/*
-+	 * RFC 5754: The correct encoding for the SHA2 algorithms would be to
-+	 * omit the parameters, but there are implementation that encode these
-+	 * as a NULL element. Allow these two cases and reject anything else.
-+	 */
-+	if (da_end > next &&
-+	    (asn1_get_next(next, da_end - next, &hdr) < 0 ||
-+	     !asn1_is_null(&hdr) ||
-+	     hdr.payload + hdr.length != da_end)) {
-+		wpa_printf(MSG_DEBUG,
-+			   "X509: Unexpected digest algorithm parameters");
-+		os_free(data);
-+		return -1;
-+	}
- 
- 	if (x509_sha1_oid(&oid)) {
- 		if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) {
--- 
-2.17.1
-
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb
similarity index 79%
rename from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
rename to meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb
index 25cd8ef82c..6e80ac7de3 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb
@@ -4,9 +4,9 @@ DESCRIPTION = "wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and
 BUGTRACKER = "http://w1.fi/security/"
 SECTION = "network"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=279b4f5abb9c153c285221855ddb78cc \
-                    file://README;beginline=1;endline=56;md5=e7d3dbb01f75f0b9799e192731d1e1ff \
-                    file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=0a8b56d3543498b742b9c0e94cc2d18b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5ebcb90236d1ad640558c3d3cd3035df \
+                    file://README;beginline=1;endline=56;md5=e3d2f6c2948991e37c1ca4960de84747 \
+                    file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=76306a95306fee9a976b0ac1be70f705"
 DEPENDS = "dbus libnl"
 RRECOMMENDS:${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
 
@@ -19,23 +19,14 @@ inherit pkgconfig systemd
 SYSTEMD_SERVICE:${PN} = "wpa_supplicant.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
-SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz  \
+SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \
            file://defconfig \
            file://wpa-supplicant.sh \
            file://wpa_supplicant.conf \
            file://wpa_supplicant.conf-sane \
            file://99_wpa_supplicant \
-           file://0001-replace-systemd-install-Alias-with-WantedBy.patch \
-           file://0001-AP-Silently-ignore-management-frame-from-unexpected-.patch \
-           file://0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch \
-           file://0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch \
-           file://0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch \
-           file://CVE-2021-0326.patch \
-           file://CVE-2021-27803.patch \
-           file://CVE-2021-30004.patch \
-          "
-SRC_URI[md5sum] = "2d2958c782576dc9901092fbfecb4190"
-SRC_URI[sha256sum] = "fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17"
+           "
+SRC_URI[sha256sum] = "20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f"
 
 CVE_PRODUCT = "wpa_supplicant"
 
-- 
2.20.1

[PATCH 11/17] zstd: update 1.5.0 -> 1.5.2

[Alexander Kanavin]

Drop patches merged upstream.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...rt-all-wildcard-file-list-expansions.patch |  81 --------
 .../zstd/zstd/0001-MinGW-Build-Fixes.patch    | 193 ------------------
 .../zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb}     |   7 +-
 3 files changed, 2 insertions(+), 279 deletions(-)
 delete mode 100644 meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
 delete mode 100644 meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
 rename meta/recipes-extended/zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb} (86%)

diff --git a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch b/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
deleted file mode 100644
index 3d23648f5b..0000000000
--- a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 77c7963c7a0f1c455f20520d5c7b1ec9b17a44fb Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 23 Dec 2020 19:14:32 +0100
-Subject: [PATCH] Makefile: sort all wildcard file list expansions
-
-Otherwise the order is non-deterministic and breaks
-reproducible builds.
-
-Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2895]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- programs/Makefile   | 10 +++++-----
- tests/Makefile      |  4 ++--
- tests/fuzz/Makefile |  2 +-
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/programs/Makefile b/programs/Makefile
-index 599fb02f..2c416467 100644
---- a/programs/Makefile
-+++ b/programs/Makefile
-@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy
- 
- vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS) $(ZSTDLIB_DECOMPRESS) $(ZDICT_DIR) $(ZSTDLEGACY_DIR)
- 
--ZSTDLIB_COMMON_C := $(wildcard $(ZSTDLIB_COMMON)/*.c)
--ZSTDLIB_COMPRESS_C := $(wildcard $(ZSTDLIB_COMPRESS)/*.c)
--ZSTDLIB_DECOMPRESS_C := $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c)
-+ZSTDLIB_COMMON_C := $(sort $(wildcard $(ZSTDLIB_COMMON)/*.c))
-+ZSTDLIB_COMPRESS_C := $(sort $(wildcard $(ZSTDLIB_COMPRESS)/*.c))
-+ZSTDLIB_DECOMPRESS_C := $(sort $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c))
- ZSTDLIB_CORE_SRC := $(ZSTDLIB_DECOMPRESS_C) $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)
--ZDICT_SRC := $(wildcard $(ZDICT_DIR)/*.c)
-+ZDICT_SRC := $(sort $(wildcard $(ZDICT_DIR)/*.c))
- 
- ZSTD_LEGACY_SUPPORT ?= 5
- ZSTDLEGACY_SRC :=
-@@ -93,7 +93,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC) $(ZSTDLEGACY_SRC) $(ZDICT_SRC))
- ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC))
- ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o)
- 
--ZSTD_CLI_SRC := $(wildcard *.c)
-+ZSTD_CLI_SRC := $(sort $(wildcard *.c))
- ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o)
- 
- ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC)
-diff --git a/tests/Makefile b/tests/Makefile
-index 85553007..b71cdba8 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -49,7 +49,7 @@ ZSTDDECOMP_FILES := $(ZSTDDIR)/decompress/*.c
- ZSTD_FILES  := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES) $(ZSTDCOMP_FILES)
- ZDICT_FILES := $(ZSTDDIR)/dictBuilder/*.c
- 
--ZSTD_F1 := $(wildcard $(ZSTD_FILES))
-+ZSTD_F1 := $(sort $(wildcard $(ZSTD_FILES)))
- ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1))
- ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1))
- ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2))
-@@ -202,7 +202,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c bigdict.c
- invalidDictionaries : $(ZSTD_OBJECTS) invalidDictionaries.c
- 
- legacy : CPPFLAGS += -I$(ZSTDDIR)/legacy -DZSTD_LEGACY_SUPPORT=4
--legacy : $(ZSTD_FILES) $(wildcard $(ZSTDDIR)/legacy/*.c) legacy.c
-+legacy : $(ZSTD_FILES) $(sort $(wildcard $(ZSTDDIR)/legacy/*.c)) legacy.c
- 
- decodecorpus : LDLIBS += -lm
- decodecorpus : $(filter-out zstdc_zstd_compress.o, $(ZSTD_OBJECTS)) $(ZDICT_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c decodecorpus.c
-diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile
-index ccb574b7..b1cb2935 100644
---- a/tests/fuzz/Makefile
-+++ b/tests/fuzz/Makefile
-@@ -62,7 +62,7 @@ FUZZ_SRC       := \
- 	$(ZSTDCOMP_SRC) \
- 	$(ZSTDDICT_SRC) \
- 	$(ZSTDLEGACY_SRC)
--FUZZ_SRC := $(wildcard $(FUZZ_SRC))
-+FUZZ_SRC := $(sort $(wildcard $(FUZZ_SRC)))
- 
- FUZZ_D_OBJ1 := $(subst $(ZSTDDIR)/common/,d_lib_common_,$(FUZZ_SRC))
- FUZZ_D_OBJ2 := $(subst $(ZSTDDIR)/compress/,d_lib_compress_,$(FUZZ_D_OBJ1))
diff --git a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch b/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
deleted file mode 100644
index a0e00dca03..0000000000
--- a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From ab9a34c92eec815ef214470c927ddbe2e950e7e5 Mon Sep 17 00:00:00 2001
-From: Joshua Watt <JPEWhacker@gmail.com>
-Date: Wed, 26 May 2021 09:15:40 -0500
-Subject: [PATCH] MinGW Build Fixes
-
-Fixes building on MinGW by
- 1) Exporting the OS variable so that it is visible to sub-make
-    invocations
- 2) Fixing the extension handling so that make correctly identifies when
-    targets need to be rebuilt. Without the correct handling, make would
-    rebuild the executable targets when running `make install` because
-    it couldn't find them with the correct extension.
-
-Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2685]
-Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
----
- Makefile          |  1 +
- programs/Makefile | 74 +++++++++++++++++++++++------------------------
- 2 files changed, 38 insertions(+), 37 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index c1908f0a..f9ce9504 100644
---- a/Makefile
-+++ b/Makefile
-@@ -29,6 +29,7 @@ VOID = /dev/null
- # fail on other tested distros (ubuntu, debian) even
- # without manually specifying the TARGET_SYSTEM.
- TARGET_SYSTEM ?= $(OS)
-+export OS
- 
- ifneq (,$(filter Windows%,$(TARGET_SYSTEM)))
-   EXT =.exe
-diff --git a/programs/Makefile b/programs/Makefile
-index 599fb02f..79b45c83 100644
---- a/programs/Makefile
-+++ b/programs/Makefile
-@@ -209,37 +209,37 @@ SET_CACHE_DIRECTORY = \
- 
- 
- .PHONY: all
--all: zstd
-+all: zstd$(EXT)
- 
- .PHONY: allVariants
--allVariants: zstd zstd-compress zstd-decompress zstd-small zstd-nolegacy zstd-dictBuilder
-+allVariants: zstd$(EXT) zstd-compress$(EXT) zstd-decompress$(EXT) zstd-small$(EXT) zstd-nolegacy$(EXT) zstd-dictBuilder$(EXT)
- 
- .PHONY: zstd  # must always be run
--zstd : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
--zstd : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD)
--zstd : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD)
--zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
-+zstd$(EXT) : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
-+zstd$(EXT) : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD)
-+zstd$(EXT) : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD)
-+zstd$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
- ifneq (,$(filter Windows%,$(OS)))
--zstd : $(RES_FILE)
-+zstd$(EXT) : $(RES_FILE)
- endif
- 
- ifndef BUILD_DIR
- # generate BUILD_DIR from flags
- 
--zstd:
-+zstd$(EXT):
- 	$(SET_CACHE_DIRECTORY)
- 
- else
- # BUILD_DIR is defined
- 
- ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_ALL_OBJ))
--$(BUILD_DIR)/zstd : $(ZSTD_OBJ)
-+$(BUILD_DIR)/zstd$(EXT) : $(ZSTD_OBJ)
- 	@echo "$(THREAD_MSG)"
- 	@echo "$(ZLIB_MSG)"
- 	@echo "$(LZMA_MSG)"
- 	@echo "$(LZ4_MSG)"
- 	@echo LINK $@
--	$(CC) $(FLAGS) $^ $(LDLIBS) -o $@$(EXT)
-+	$(CC) $(FLAGS) $^ $(LDLIBS) -o $@
- 
- ifeq ($(HAVE_HASH),1)
- SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) | cut -f 1 -d " ")
-@@ -249,7 +249,7 @@ else
- BIN_ISDIFFERENT = 1
- endif
- 
--zstd : $(BUILD_DIR)/zstd
-+zstd$(EXT) : $(BUILD_DIR)/zstd$(EXT)
- 	if [ $(BIN_ISDIFFERENT) -eq 1 ]; then \
- 		cp -f $< $@; \
- 		echo zstd build completed; \
-@@ -263,46 +263,46 @@ endif  # BUILD_DIR
- .PHONY: zstd-release
- zstd-release: DEBUGFLAGS := -DBACKTRACE_ENABLE=0
- zstd-release: DEBUGFLAGS_LD :=
--zstd-release: zstd
-+zstd-release: zstd$(EXT)
- 
--zstd32 : CPPFLAGS += $(THREAD_CPP)
--zstd32 : LDFLAGS  += $(THREAD_LD)
--zstd32 : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
-+zstd32$(EXT) : CPPFLAGS += $(THREAD_CPP)
-+zstd32$(EXT) : LDFLAGS  += $(THREAD_LD)
-+zstd32$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
- ifneq (,$(filter Windows%,$(OS)))
--zstd32 : $(RES32_FILE)
-+zstd32$(EXT) : $(RES32_FILE)
- endif
--zstd32 : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC)
--	$(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
-+zstd32$(EXT) : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC)
-+	$(CC) -m32 $(FLAGS) $^ -o $@
- 
- ## zstd-nolegacy: same scope as zstd, with just support of legacy formats removed
--zstd-nolegacy : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD) $(DEBUGFLAGS_LD)
--zstd-nolegacy : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ)
--	$(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS)
-+zstd-nolegacy$(EXT) : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD) $(DEBUGFLAGS_LD)
-+zstd-nolegacy$(EXT) : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ)
-+	$(CC) $(FLAGS) $^ -o $@ $(LDFLAGS)
- 
- .PHONY: zstd-nomt
- zstd-nomt : THREAD_CPP :=
- zstd-nomt : THREAD_LD  :=
- zstd-nomt : THREAD_MSG := - multi-threading disabled
--zstd-nomt : zstd
-+zstd-nomt : zstd$(EXT)
- 
- .PHONY: zstd-nogz
- zstd-nogz : ZLIBCPP :=
- zstd-nogz : ZLIBLD  :=
- zstd-nogz : ZLIB_MSG := - gzip support is disabled
--zstd-nogz : zstd
-+zstd-nogz : zstd$(EXT)
- 
- .PHONY: zstd-noxz
- zstd-noxz : LZMACPP :=
- zstd-noxz : LZMALD  :=
- zstd-noxz : LZMA_MSG := - xz/lzma support is disabled
--zstd-noxz : zstd
-+zstd-noxz : zstd$(EXT)
- 
- ## zstd-dll: zstd executable linked to dynamic library libzstd (must have same version)
- .PHONY: zstd-dll
- zstd-dll : LDFLAGS+= -L$(ZSTDDIR)
- zstd-dll : LDLIBS += -lzstd
- zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c
--zstd-dll : zstd
-+zstd-dll : zstd$(EXT)
- 
- 
- ## zstd-pgo: zstd executable optimized with PGO.
-@@ -321,23 +321,23 @@ zstd-pgo :
- 	$(MAKE) zstd MOREFLAGS=-fprofile-use
- 
- ## zstd-small: minimal target, supporting only zstd compression and decompression. no bench. no legacy. no other format.
--zstd-small: CFLAGS = -Os -s
--zstd-frugal zstd-small: $(ZSTDLIB_CORE_SRC) zstdcli.c util.c timefn.c fileio.c
--	$(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ -o $@$(EXT)
-+zstd-small$(EXT): CFLAGS = -Os -s
-+zstd-frugal$(EXT) zstd-small$(EXT): $(ZSTDLIB_CORE_SRC) zstdcli.c util.c timefn.c fileio.c
-+	$(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ -o $@
- 
--zstd-decompress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) zstdcli.c util.c timefn.c fileio.c
--	$(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS -DZSTD_NOTRACE $^ -o $@$(EXT)
-+zstd-decompress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) zstdcli.c util.c timefn.c fileio.c
-+	$(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS -DZSTD_NOTRACE $^ -o $@
- 
--zstd-compress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c util.c timefn.c fileio.c
--	$(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS -DZSTD_NOTRACE $^ -o $@$(EXT)
-+zstd-compress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c util.c timefn.c fileio.c
-+	$(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS -DZSTD_NOTRACE $^ -o $@
- 
- ## zstd-dictBuilder: executable supporting dictionary creation and compression (only)
--zstd-dictBuilder: CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS -DZSTD_NOTRACE
--zstd-dictBuilder: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c
--	$(CC) $(FLAGS) $^ -o $@$(EXT)
-+zstd-dictBuilder$(EXT): CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS -DZSTD_NOTRACE
-+zstd-dictBuilder$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c
-+	$(CC) $(FLAGS) $^ -o $@
- 
--zstdmt: zstd
--	ln -sf zstd zstdmt
-+zstdmt$(EXT): zstd$(EXT)
-+	ln -sf zstd$(EXT) zstdmt$(EXT)
- 
- .PHONY: generate_res
- generate_res: $(RES64_FILE) $(RES32_FILE)
--- 
-2.31.1
-
diff --git a/meta/recipes-extended/zstd/zstd_1.5.0.bb b/meta/recipes-extended/zstd/zstd_1.5.2.bb
similarity index 86%
rename from meta/recipes-extended/zstd/zstd_1.5.0.bb
rename to meta/recipes-extended/zstd/zstd_1.5.2.bb
index 51305d0562..71f439ef57 100644
--- a/meta/recipes-extended/zstd/zstd_1.5.0.bb
+++ b/meta/recipes-extended/zstd/zstd_1.5.2.bb
@@ -9,12 +9,9 @@ LICENSE = "BSD-3-Clause & GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \
                     file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"
 
-SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https \
-           file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \
-           file://0001-MinGW-Build-Fixes.patch \
-           "
+SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https"
 
-SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6"
+SRCREV = "e47e674cd09583ff0503f0f6defd6d23d8b718d3"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 CVE_PRODUCT = "zstandard"
-- 
2.20.1

[PATCH 12/17] rust: update 1.58.0 -> 1.58.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-cross-canadian_1.58.0.bb => cargo-cross-canadian_1.58.1.bb} | 0
 .../recipes-devtools/cargo/{cargo_1.58.0.bb => cargo_1.58.1.bb} | 0
 .../rust/{libstd-rs_1.58.0.bb => libstd-rs_1.58.1.bb}           | 0
 ...t-cross-canadian_1.58.0.bb => rust-cross-canadian_1.58.1.bb} | 0
 .../rust/{rust-cross_1.58.0.bb => rust-cross_1.58.1.bb}         | 0
 .../rust/{rust-llvm_1.58.0.bb => rust-llvm_1.58.1.bb}           | 1 +
 meta/recipes-devtools/rust/rust-source.inc                      | 2 +-
 ...s-canadian_1.58.0.bb => rust-tools-cross-canadian_1.58.1.bb} | 0
 meta/recipes-devtools/rust/{rust_1.58.0.bb => rust_1.58.1.bb}   | 0
 9 files changed, 2 insertions(+), 1 deletion(-)
 rename meta/recipes-devtools/cargo/{cargo-cross-canadian_1.58.0.bb => cargo-cross-canadian_1.58.1.bb} (100%)
 rename meta/recipes-devtools/cargo/{cargo_1.58.0.bb => cargo_1.58.1.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.58.0.bb => libstd-rs_1.58.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.58.0.bb => rust-cross-canadian_1.58.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-cross_1.58.0.bb => rust-cross_1.58.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.58.0.bb => rust-llvm_1.58.1.bb} (99%)
 rename meta/recipes-devtools/rust/{rust-tools-cross-canadian_1.58.0.bb => rust-tools-cross-canadian_1.58.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust_1.58.0.bb => rust_1.58.1.bb} (100%)

diff --git a/meta/recipes-devtools/cargo/cargo-cross-canadian_1.58.0.bb b/meta/recipes-devtools/cargo/cargo-cross-canadian_1.58.1.bb
similarity index 100%
rename from meta/recipes-devtools/cargo/cargo-cross-canadian_1.58.0.bb
rename to meta/recipes-devtools/cargo/cargo-cross-canadian_1.58.1.bb
diff --git a/meta/recipes-devtools/cargo/cargo_1.58.0.bb b/meta/recipes-devtools/cargo/cargo_1.58.1.bb
similarity index 100%
rename from meta/recipes-devtools/cargo/cargo_1.58.0.bb
rename to meta/recipes-devtools/cargo/cargo_1.58.1.bb
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.58.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.58.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.58.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.58.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.58.0.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.58.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.58.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.58.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross_1.58.0.bb b/meta/recipes-devtools/rust/rust-cross_1.58.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross_1.58.0.bb
rename to meta/recipes-devtools/rust/rust-cross_1.58.1.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.58.0.bb b/meta/recipes-devtools/rust/rust-llvm_1.58.1.bb
similarity index 99%
rename from meta/recipes-devtools/rust/rust-llvm_1.58.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.58.1.bb
index 222c20ad3c..5b94e22f7b 100644
--- a/meta/recipes-devtools/rust/rust-llvm_1.58.0.bb
+++ b/meta/recipes-devtools/rust/rust-llvm_1.58.1.bb
@@ -3,3 +3,4 @@
 LLVM_RELEASE = "13.0.0"
 require rust-source.inc
 require rust-llvm.inc
+
diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc
index 63ba02b299..92b1535130 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -1,5 +1,5 @@
 SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
-SRC_URI[rust.sha256sum] = "37dce222b82a438e550ccd5e45ca9bad1c57aa7acc7adfec6a897c4ff94b6485"
+SRC_URI[rust.sha256sum] = "2b3643a48e7087053b0268971ec4154350342508922a8acb0707aaf94deb4469"
 
 RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
 
diff --git a/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.58.0.bb b/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.58.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-tools-cross-canadian_1.58.0.bb
rename to meta/recipes-devtools/rust/rust-tools-cross-canadian_1.58.1.bb
diff --git a/meta/recipes-devtools/rust/rust_1.58.0.bb b/meta/recipes-devtools/rust/rust_1.58.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.58.0.bb
rename to meta/recipes-devtools/rust/rust_1.58.1.bb
-- 
2.20.1

[PATCH 13/17] gdb: update 11.1 -> 11.2

[Alexander Kanavin]

Simplyfy .inc structure: merge gdb.inc into gdb_11.2.bb, rename
gdb-${PV}.inc to gdb.inc. This will allow easier automatic updates.

Drop upstreamed patch.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/gdb/gdb-11.1.inc        |  19 --
 ...ian_11.1.bb => gdb-cross-canadian_11.2.bb} |   2 +-
 .../{gdb-cross_11.1.bb => gdb-cross_11.2.bb}  |   2 +-
 meta/recipes-devtools/gdb/gdb.inc             |  27 +-
 ...erver-register-set-selection-dynamic.patch | 317 ------------------
 .../gdb/{gdb_11.1.bb => gdb_11.2.bb}          |  13 +-
 6 files changed, 31 insertions(+), 349 deletions(-)
 delete mode 100644 meta/recipes-devtools/gdb/gdb-11.1.inc
 rename meta/recipes-devtools/gdb/{gdb-cross-canadian_11.1.bb => gdb-cross-canadian_11.2.bb} (71%)
 rename meta/recipes-devtools/gdb/{gdb-cross_11.1.bb => gdb-cross_11.2.bb} (50%)
 delete mode 100644 meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch
 rename meta/recipes-devtools/gdb/{gdb_11.1.bb => gdb_11.2.bb} (80%)

diff --git a/meta/recipes-devtools/gdb/gdb-11.1.inc b/meta/recipes-devtools/gdb/gdb-11.1.inc
deleted file mode 100644
index 5364a880e3..0000000000
--- a/meta/recipes-devtools/gdb/gdb-11.1.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
-		    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
-		    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
-		    file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
-
-SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \
-           file://0001-make-man-install-relative-to-DESTDIR.patch \
-           file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \
-           file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \
-           file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \
-           file://0006-use-asm-sgidefs.h.patch \
-           file://0007-Change-order-of-CFLAGS.patch \
-           file://0008-resolve-restrict-keyword-conflict.patch \
-           file://0009-Fix-invalid-sigprocmask-call.patch \
-           file://0010-gdbserver-ctrl-c-handling.patch \
-           file://0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch \
-           "
-SRC_URI[sha256sum] = "cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_11.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_11.2.bb
similarity index 71%
rename from meta/recipes-devtools/gdb/gdb-cross-canadian_11.1.bb
rename to meta/recipes-devtools/gdb/gdb-cross-canadian_11.2.bb
index 301035940c..4ab2b7156d 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_11.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_11.2.bb
@@ -1,3 +1,3 @@
 require gdb-common.inc
 require gdb-cross-canadian.inc
-require gdb-${PV}.inc
+require gdb.inc
diff --git a/meta/recipes-devtools/gdb/gdb-cross_11.1.bb b/meta/recipes-devtools/gdb/gdb-cross_11.2.bb
similarity index 50%
rename from meta/recipes-devtools/gdb/gdb-cross_11.1.bb
rename to meta/recipes-devtools/gdb/gdb-cross_11.2.bb
index 50cf159fdb..3b654a2f0d 100644
--- a/meta/recipes-devtools/gdb/gdb-cross_11.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross_11.2.bb
@@ -1,2 +1,2 @@
 require gdb-cross.inc
-require gdb-${PV}.inc
+require gdb.inc
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index 2c95ed3ca0..cf801b192b 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -1,11 +1,18 @@
-require gdb-common.inc
-
-inherit gettext pkgconfig
-
-#LDFLAGS:append = " -s"
-#export CFLAGS:append=" -L${STAGING_LIBDIR}"
-
-# cross-canadian must not see this
-PACKAGES =+ "gdbserver"
-FILES:gdbserver = "${bindir}/gdbserver"
+LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+		    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
+		    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
+		    file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
 
+SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \
+           file://0001-make-man-install-relative-to-DESTDIR.patch \
+           file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \
+           file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \
+           file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \
+           file://0006-use-asm-sgidefs.h.patch \
+           file://0007-Change-order-of-CFLAGS.patch \
+           file://0008-resolve-restrict-keyword-conflict.patch \
+           file://0009-Fix-invalid-sigprocmask-call.patch \
+           file://0010-gdbserver-ctrl-c-handling.patch \
+           "
+SRC_URI[sha256sum] = "1497c36a71881b8671a9a84a0ee40faab788ca30d7ba19d8463c3cc787152e32"
diff --git a/meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch b/meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch
deleted file mode 100644
index 6fc1859391..0000000000
--- a/meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-From eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Mon Sep 17 00:00:00 2001
-From: Luis Machado <luis.machado@linaro.org>
-Date: Fri, 29 Oct 2021 14:54:36 -0300
-Subject: [PATCH] [AArch64] Make gdbserver register set selection dynamic
-
-The current register set selection mechanism for AArch64 is static, based
-on a pre-populated array of register sets.
-
-This means that we might potentially probe register sets that are not
-available. This is OK if the kernel errors out during ptrace, but probing the
-tag_ctl register, for example, does not result in a ptrace error if the kernel
-supports the tagged address ABI but not MTE (PR 28355).
-
-Making the register set selection dynamic, based on feature checks, solves
-this and simplifies the code a bit. It allows us to list all of the register
-sets only once, and pick and choose based on HWCAP/HWCAP2 or other properties.
-
-gdb/ChangeLog:
-
-2021-11-03  Luis Machado  <luis.machado@linaro.org>
-
-	PR gdb/28355
-
-	* arch/aarch64.h (struct aarch64_features): New struct.
-
-gdbserver/ChangeLog:
-
-2021-11-03  Luis Machado  <luis.machado@linaro.org>
-
-	PR gdb/28355
-
-	* linux-aarch64-low.cc (is_sve_tdesc): Remove.
-	(aarch64_target::low_arch_setup): Rework to adjust the register sets.
-	(aarch64_regsets): Update to list all register sets.
-	(aarch64_regsets_info, regs_info_aarch64): Replace NULL with nullptr.
-	(aarch64_sve_regsets, aarch64_sve_regsets_info)
-	(regs_info_aarch64_sve): Remove.
-	(aarch64_adjust_register_sets): New.
-	(aarch64_target::get_regs_info): Remove references to removed structs.
-	(initialize_low_arch): Likewise.
-
-[ChangeLog entry stripped so that patch applies cleanly]
-Upstream-Status: Accepted
----
-
-diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h
-index 0eb702c5b5e..95edb664b55 100644
---- a/gdb/arch/aarch64.h
-+++ b/gdb/arch/aarch64.h
-@@ -22,6 +22,15 @@
- 
- #include "gdbsupport/tdesc.h"
- 
-+/* Holds information on what architectural features are available.  This is
-+   used to select register sets.  */
-+struct aarch64_features
-+{
-+  bool sve = false;
-+  bool pauth = false;
-+  bool mte = false;
-+};
-+
- /* Create the aarch64 target description.  A non zero VQ value indicates both
-    the presence of SVE and the Vector Quotient - the number of 128bit chunks in
-    an SVE Z register.  HAS_PAUTH_P indicates the presence of the PAUTH
-diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc
-index daccfef746e..9a8cb4169a7 100644
---- a/gdbserver/linux-aarch64-low.cc
-+++ b/gdbserver/linux-aarch64-low.cc
-@@ -196,16 +196,6 @@ is_64bit_tdesc (void)
-   return register_size (regcache->tdesc, 0) == 8;
- }
- 
--/* Return true if the regcache contains the number of SVE registers.  */
--
--static bool
--is_sve_tdesc (void)
--{
--  struct regcache *regcache = get_thread_regcache (current_thread, 0);
--
--  return tdesc_contains_feature (regcache->tdesc, "org.gnu.gdb.aarch64.sve");
--}
--
- static void
- aarch64_fill_gregset (struct regcache *regcache, void *buf)
- {
-@@ -680,40 +670,6 @@ aarch64_target::low_new_fork (process_info *parent,
-   *child->priv->arch_private = *parent->priv->arch_private;
- }
- 
--/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h.  */
--#define AARCH64_HWCAP_PACA (1 << 30)
--
--/* Implementation of linux target ops method "low_arch_setup".  */
--
--void
--aarch64_target::low_arch_setup ()
--{
--  unsigned int machine;
--  int is_elf64;
--  int tid;
--
--  tid = lwpid_of (current_thread);
--
--  is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
--
--  if (is_elf64)
--    {
--      uint64_t vq = aarch64_sve_get_vq (tid);
--      unsigned long hwcap = linux_get_hwcap (8);
--      unsigned long hwcap2 = linux_get_hwcap2 (8);
--      bool pauth_p = hwcap & AARCH64_HWCAP_PACA;
--      /* MTE is AArch64-only.  */
--      bool mte_p = hwcap2 & HWCAP2_MTE;
--
--      current_process ()->tdesc
--	= aarch64_linux_read_description (vq, pauth_p, mte_p);
--    }
--  else
--    current_process ()->tdesc = aarch32_linux_read_description ();
--
--  aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread));
--}
--
- /* Wrapper for aarch64_sve_regs_copy_to_reg_buf.  */
- 
- static void
-@@ -730,21 +686,36 @@ aarch64_sve_regs_copy_from_regcache (struct regcache *regcache, void *buf)
-   return aarch64_sve_regs_copy_from_reg_buf (regcache, buf);
- }
- 
-+/* Array containing all the possible register sets for AArch64/Linux.  During
-+   architecture setup, these will be checked against the HWCAP/HWCAP2 bits for
-+   validity and enabled/disabled accordingly.
-+
-+   Their sizes are set to 0 here, but they will be adjusted later depending
-+   on whether each register set is available or not.  */
- static struct regset_info aarch64_regsets[] =
- {
-+  /* GPR registers.  */
-   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS,
--    sizeof (struct user_pt_regs), GENERAL_REGS,
-+    0, GENERAL_REGS,
-     aarch64_fill_gregset, aarch64_store_gregset },
-+  /* Floating Point (FPU) registers.  */
-   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_FPREGSET,
--    sizeof (struct user_fpsimd_state), FP_REGS,
-+    0, FP_REGS,
-     aarch64_fill_fpregset, aarch64_store_fpregset
-   },
-+  /* Scalable Vector Extension (SVE) registers.  */
-+  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE,
-+    0, EXTENDED_REGS,
-+    aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache
-+  },
-+  /* PAC registers.  */
-   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK,
--    AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS,
--    NULL, aarch64_store_pauthregset },
-+    0, OPTIONAL_REGS,
-+    nullptr, aarch64_store_pauthregset },
-+  /* Tagged address control / MTE registers.  */
-   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL,
--    AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset,
--    aarch64_store_mteregset },
-+    0, OPTIONAL_REGS,
-+    aarch64_fill_mteregset, aarch64_store_mteregset },
-   NULL_REGSET
- };
- 
-@@ -752,47 +723,95 @@ static struct regsets_info aarch64_regsets_info =
-   {
-     aarch64_regsets, /* regsets */
-     0, /* num_regsets */
--    NULL, /* disabled_regsets */
-+    nullptr, /* disabled_regsets */
-   };
- 
- static struct regs_info regs_info_aarch64 =
-   {
--    NULL, /* regset_bitmap */
--    NULL, /* usrregs */
-+    nullptr, /* regset_bitmap */
-+    nullptr, /* usrregs */
-     &aarch64_regsets_info,
-   };
- 
--static struct regset_info aarch64_sve_regsets[] =
-+/* Given FEATURES, adjust the available register sets by setting their
-+   sizes.  A size of 0 means the register set is disabled and won't be
-+   used.  */
-+
-+static void
-+aarch64_adjust_register_sets (const struct aarch64_features &features)
- {
--  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS,
--    sizeof (struct user_pt_regs), GENERAL_REGS,
--    aarch64_fill_gregset, aarch64_store_gregset },
--  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE,
--    SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE), EXTENDED_REGS,
--    aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache
--  },
--  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK,
--    AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS,
--    NULL, aarch64_store_pauthregset },
--  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL,
--    AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset,
--    aarch64_store_mteregset },
--  NULL_REGSET
--};
-+  struct regset_info *regset;
- 
--static struct regsets_info aarch64_sve_regsets_info =
--  {
--    aarch64_sve_regsets, /* regsets.  */
--    0, /* num_regsets.  */
--    NULL, /* disabled_regsets.  */
--  };
-+  for (regset = aarch64_regsets; regset->size >= 0; regset++)
-+    {
-+      switch (regset->nt_type)
-+	{
-+	case NT_PRSTATUS:
-+	  /* General purpose registers are always present.  */
-+	  regset->size = sizeof (struct user_pt_regs);
-+	  break;
-+	case NT_FPREGSET:
-+	  /* This is unavailable when SVE is present.  */
-+	  if (!features.sve)
-+	    regset->size = sizeof (struct user_fpsimd_state);
-+	  break;
-+	case NT_ARM_SVE:
-+	  if (features.sve)
-+	    regset->size = SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE);
-+	  break;
-+	case NT_ARM_PAC_MASK:
-+	  if (features.pauth)
-+	    regset->size = AARCH64_PAUTH_REGS_SIZE;
-+	  break;
-+	case NT_ARM_TAGGED_ADDR_CTRL:
-+	  if (features.mte)
-+	    regset->size = AARCH64_LINUX_SIZEOF_MTE;
-+	  break;
-+	default:
-+	  gdb_assert_not_reached ("Unknown register set found.");
-+	}
-+    }
-+}
- 
--static struct regs_info regs_info_aarch64_sve =
--  {
--    NULL, /* regset_bitmap.  */
--    NULL, /* usrregs.  */
--    &aarch64_sve_regsets_info,
--  };
-+/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h.  */
-+#define AARCH64_HWCAP_PACA (1 << 30)
-+
-+/* Implementation of linux target ops method "low_arch_setup".  */
-+
-+void
-+aarch64_target::low_arch_setup ()
-+{
-+  unsigned int machine;
-+  int is_elf64;
-+  int tid;
-+
-+  tid = lwpid_of (current_thread);
-+
-+  is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
-+
-+  if (is_elf64)
-+    {
-+      struct aarch64_features features;
-+
-+      uint64_t vq = aarch64_sve_get_vq (tid);
-+      features.sve = (vq > 0);
-+      /* A-profile PAC is 64-bit only.  */
-+      features.pauth = linux_get_hwcap (8) & AARCH64_HWCAP_PACA;
-+      /* A-profile MTE is 64-bit only.  */
-+      features.mte = linux_get_hwcap2 (8) & HWCAP2_MTE;
-+
-+      current_process ()->tdesc
-+	= aarch64_linux_read_description (vq, features.pauth, features.mte);
-+
-+      /* Adjust the register sets we should use for this particular set of
-+	 features.  */
-+      aarch64_adjust_register_sets (features);
-+    }
-+  else
-+    current_process ()->tdesc = aarch32_linux_read_description ();
-+
-+  aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread));
-+}
- 
- /* Implementation of linux target ops method "get_regs_info".  */
- 
-@@ -802,9 +821,7 @@ aarch64_target::get_regs_info ()
-   if (!is_64bit_tdesc ())
-     return &regs_info_aarch32;
- 
--  if (is_sve_tdesc ())
--    return &regs_info_aarch64_sve;
--
-+  /* AArch64 64-bit registers.  */
-   return &regs_info_aarch64;
- }
- 
-@@ -3294,5 +3311,4 @@ initialize_low_arch (void)
-   initialize_low_arch_aarch32 ();
- 
-   initialize_regsets_info (&aarch64_regsets_info);
--  initialize_regsets_info (&aarch64_sve_regsets_info);
- }
--- 
-2.27.0
-
diff --git a/meta/recipes-devtools/gdb/gdb_11.1.bb b/meta/recipes-devtools/gdb/gdb_11.2.bb
similarity index 80%
rename from meta/recipes-devtools/gdb/gdb_11.1.bb
rename to meta/recipes-devtools/gdb/gdb_11.2.bb
index e73e3a2c5c..9c6db4ca2c 100644
--- a/meta/recipes-devtools/gdb/gdb_11.1.bb
+++ b/meta/recipes-devtools/gdb/gdb_11.2.bb
@@ -1,5 +1,15 @@
+require gdb-common.inc
+
+inherit gettext pkgconfig
+
+#LDFLAGS:append = " -s"
+#export CFLAGS:append=" -L${STAGING_LIBDIR}"
+
+# cross-canadian must not see this
+PACKAGES =+ "gdbserver"
+FILES:gdbserver = "${bindir}/gdbserver"
+
 require gdb.inc
-require gdb-${PV}.inc
 
 inherit python3-dir
 
@@ -26,3 +36,4 @@ EOF
 		chmod +x ${WORKDIR}/python
 	fi
 }
+
-- 
2.20.1

[PATCH 14/17] ltp: update 20210927 -> 20220121

[Alexander Kanavin]

The ltp compliancy parser is rewritten to actually
match the logs: they seem to be unstructured, test case names
are not printed and the only indication of failure is appearance of
FAIL[ED] somewhere.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/lib/oeqa/utils/logparser.py              | 27 ++++-----
 ...sh-sort-filelist-for-reproducibility.patch | 28 +++++++++
 .../0002-lib-fix-MemAvailable-parsing.patch   | 36 -----------
 ...-lapi-rtnetlink.h-Fix-include-guards.patch | 37 ------------
 ...f_addr.h-and-reuse-it-in-rtnetlink.h.patch | 58 ------------------
 ...0005-lapi-if_addr.h-Define-IFA_FLAGS.patch | 60 -------------------
 .../ltp/{ltp_20210927.bb => ltp_20220121.bb}  | 11 ++--
 7 files changed, 46 insertions(+), 211 deletions(-)
 create mode 100644 meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch
 rename meta/recipes-extended/ltp/{ltp_20210927.bb => ltp_20220121.bb} (94%)

diff --git a/meta/lib/oeqa/utils/logparser.py b/meta/lib/oeqa/utils/logparser.py
index 60e16d500e..879aefca33 100644
--- a/meta/lib/oeqa/utils/logparser.py
+++ b/meta/lib/oeqa/utils/logparser.py
@@ -135,30 +135,27 @@ class LtpComplianceParser(object):
 
     def parse(self, logfile):
         test_regex = {}
-        test_regex['PASSED'] = re.compile(r"^PASS")
-        test_regex['FAILED'] = re.compile(r"^FAIL")
-        test_regex['SKIPPED'] = re.compile(r"(?:UNTESTED)|(?:UNSUPPORTED)")
+        test_regex['FAILED'] = re.compile(r"FAIL")
 
         section_regex = {}
-        section_regex['test'] = re.compile(r"^Testing")
+        section_regex['test'] = re.compile(r"^Executing")
 
         with open(logfile, errors='replace') as f:
+            name = logfile
+            result = "PASSED"
             for line in f:
-                result = section_regex['test'].search(line)
-                if result:
-                    self.name = ""
-                    self.name = line.split()[1].strip()
-                    self.results[self.name] = "PASSED"
-                    failed = 0
+                regex_result = section_regex['test'].search(line)
+                if regex_result:
+                    name = line.split()[1].strip()
 
-                failed_result = test_regex['FAILED'].search(line)
-                if failed_result:
-                    failed = line.split()[1].strip()
-                    if int(failed) > 0:
-                        self.results[self.name] = "FAILED"
+                regex_result = test_regex['FAILED'].search(line)
+                if regex_result:
+                    result = "FAILED"
+            self.results[name] = result
 
         for test in self.results:
             result = self.results[test]
+            print (self.results)
             self.section['log'] = self.section['log'] + ("%s: %s\n" % (result.strip()[:-2], test.strip()))
 
         return self.results, self.section
diff --git a/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch b/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch
new file mode 100644
index 0000000000..e8d9f212a9
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch
@@ -0,0 +1,28 @@
+From 4aad23f208cc7725cd61bbe5aaadb9994c794cd0 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 26 Jan 2022 20:58:46 +0100
+Subject: [PATCH] metadata/parse.sh: sort filelist for reproducibility
+
+find does not guarantee the order of the files.
+
+Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/907]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ metadata/parse.sh | 2 +-
+
+diff --git a/metadata/parse.sh b/metadata/parse.sh
+index b43d024c68..1811665bfe 100755
+--- a/metadata/parse.sh
++++ b/metadata/parse.sh
+@@ -29,7 +29,7 @@ echo ' "tests": {'
+ 
+ first=1
+ 
+-for test in `find testcases/ -name '*.c'`; do
++for test in `find testcases/ -name '*.c'|sort`; do
+ 	a=$($top_builddir/metadata/metaparse -Iinclude -Itestcases/kernel/syscalls/utils/ "$test")
+ 	if [ -n "$a" ]; then
+ 		if [ -z "$first" ]; then
+-- 
+2.20.1
+
diff --git a/meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch b/meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch
deleted file mode 100644
index 1860b95ce9..0000000000
--- a/meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 29a096fe2bd356f419bd8a8404d5b652c996b92f Mon Sep 17 00:00:00 2001
-From: Ralph Siemsen <ralph.siemsen@linaro.org>
-Date: Mon, 27 Sep 2021 22:18:50 -0400
-Subject: [PATCH] lib: fix MemAvailable parsing
-
-The amount of available memory was not being returned correctly, which
-resulted in tests being executed when they should have been skipped.
-
-Fixes: 8759f4 ("lib: adjust the tmpfs size according to .dev_min_size and MemAvailable")
-Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
-Signed-off-by: Li Wang <liwang@redhat.com>
-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
-Upstream-Status: Backport [e42149e28 ("lib: fix MemAvailable parsing")]
----
- lib/tst_memutils.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c
-index ae1cad29b..a46de78f5 100644
---- a/lib/tst_memutils.c
-+++ b/lib/tst_memutils.c
-@@ -65,9 +65,9 @@ void tst_pollute_memory(size_t maxsize, int fillchar)
- 
- long long tst_available_mem(void)
- {
--	long long mem_available;
-+	unsigned long long mem_available = 0;
- 
--	if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %ld",
-+	if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %llu",
- 		&mem_available)) {
- 		mem_available = SAFE_READ_MEMINFO("MemFree:")
- 			+ SAFE_READ_MEMINFO("Cached:");
--- 
-2.33.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch b/meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch
deleted file mode 100644
index 6fcafaff1c..0000000000
--- a/meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 881709d1e4d1bba5bf8ca365bc058f338bd72dc2 Mon Sep 17 00:00:00 2001
-From: Petr Vorel <petr.vorel@gmail.com>
-Date: Wed, 29 Sep 2021 19:38:42 +0200
-Subject: [PATCH] lapi/rtnetlink.h: Fix include guards
-
-Fixes: 5fea0638a ("lapi: Add missing IFA_FLAGS")
-
-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
-Upstream-Status: Backport [a2a212cf8 ("lapi/rtnetlink.h: Fix include guards")]
----
- include/lapi/rtnetlink.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h
-index 8a1b5385b..04e9ad51a 100644
---- a/include/lapi/rtnetlink.h
-+++ b/include/lapi/rtnetlink.h
-@@ -1,8 +1,8 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- /* Copyright (c) 2021 Petr Vorel <petr.vorel@gmail.com> */
-
--#ifndef LAPI_IF_ADDR_H__
--# define LAPI_IF_ADDR_H__
-+#ifndef LAPI_RTNETLINK_H__
-+# define LAPI_RTNETLINK_H__
-
- #include <linux/rtnetlink.h>
-
-@@ -10,4 +10,4 @@
- # define IFA_FLAGS 8
- #endif
-
--#endif	/* LAPI_IF_ADDR_H__ */
-+#endif	/* LAPI_RTNETLINK_H__ */
---
-2.33.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch b/meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch
deleted file mode 100644
index 19ac3ba046..0000000000
--- a/meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b13440627bd4a9f060a33d400a47a40daa2bc12e Mon Sep 17 00:00:00 2001
-From: Petr Vorel <petr.vorel@gmail.com>
-Date: Wed, 29 Sep 2021 19:37:19 +0200
-Subject: [PATCH] lapi: Create if_addr.h and reuse it in rtnetlink.h
-
-There will be fix in next commit for missing IFA_F_NOPREFIXROUTE which
-requires creating lapi/if_addr.h. Thus move IFA_FLAGS to lapi/if_addr.h,
-as it belongs there and reuse lapi/if_addr.h in lapi/rtnetlink.h just
-like <linux/rtnetlink.h> includes <linux/if_addr.h>.
-
-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
-Upstream-Status: Submitted [https://lore.kernel.org/ltp/20210930183058.5240-3-petr.vorel@gmail.com/T/#u]
----
- include/lapi/if_addr.h   | 16 ++++++++++++++++
- include/lapi/rtnetlink.h |  5 +----
- 2 files changed, 17 insertions(+), 4 deletions(-)
- create mode 100644 include/lapi/if_addr.h
-
-diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h
-new file mode 100644
-index 000000000..4e50a0a4e
---- /dev/null
-+++ b/include/lapi/if_addr.h
-@@ -0,0 +1,16 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * Copyright (c) 2021 Petr Vorel <petr.vorel@gmail.com>
-+ */
-+
-+#ifndef LAPI_IF_ADDR_H__
-+#define LAPI_IF_ADDR_H__
-+
-+#include <linux/if_addr.h>
-+
-+#ifndef IFA_FLAGS
-+# define IFA_FLAGS 8
-+#endif
-+
-+
-+#endif /* LAPI_IF_ADDR_H__ */
-diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h
-index 04e9ad51a..089bf1a0d 100644
---- a/include/lapi/rtnetlink.h
-+++ b/include/lapi/rtnetlink.h
-@@ -5,9 +5,6 @@
- # define LAPI_RTNETLINK_H__
-
- #include <linux/rtnetlink.h>
--
--#ifndef IFA_FLAGS
--# define IFA_FLAGS 8
--#endif
-+#include "lapi/if_addr.h"
-
- #endif	/* LAPI_RTNETLINK_H__ */
---
-2.33.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch b/meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch
deleted file mode 100644
index f510fda8c9..0000000000
--- a/meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 9e357fb4fc00ab9c303e314b85b9ae3836141f81 Mon Sep 17 00:00:00 2001
-From: Petr Vorel <petr.vorel@gmail.com>
-Date: Wed, 29 Sep 2021 19:56:29 +0200
-Subject: [PATCH] lapi/if_addr.h: Define IFA_F_NOPREFIXROUTE
-
-and use it in icmp_rate_limit01.c.
-
-This fixes error on toolchains with very old kernel headers, e.g.
-Buildroot sourcery-arm:
-
-icmp_rate_limit01.c:82:3: error: 'IFA_F_NOPREFIXROUTE' undeclared (first use in this function)
-   IFA_F_NOPREFIXROUTE);
-
-Fixed because IFA_F_NOPREFIXROUTE was added in 3.14 and the oldest
-system we still support is Cent0S 7 with 3.10 kernel.
-
-NOTE: Cent0S 7 is obviously heavily patched thus it contains
-IFA_F_NOPREFIXROUTE and therefore CI build didn't catch this error.
-
-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
-Upstream-Status: Submitted [https://lore.kernel.org/ltp/20210930183058.5240-4-petr.vorel@gmail.com/T/#u]
----
- include/lapi/if_addr.h            | 3 +++
- testcases/cve/icmp_rate_limit01.c | 3 ++-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h
-index 4e50a0a4e..0f7e44784 100644
---- a/include/lapi/if_addr.h
-+++ b/include/lapi/if_addr.h
-@@ -12,5 +12,8 @@
- # define IFA_FLAGS 8
- #endif
-
-+#ifndef IFA_F_NOPREFIXROUTE
-+# define IFA_F_NOPREFIXROUTE	0x200
-+#endif
-
- #endif /* LAPI_IF_ADDR_H__ */
-diff --git a/testcases/cve/icmp_rate_limit01.c b/testcases/cve/icmp_rate_limit01.c
-index b3a237b30..3ada32675 100644
---- a/testcases/cve/icmp_rate_limit01.c
-+++ b/testcases/cve/icmp_rate_limit01.c
-@@ -27,11 +27,12 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
--#include <linux/if_addr.h>
- #include <linux/errqueue.h>
-
- #include <sched.h>
- #include <limits.h>
-+
-+#include "lapi/if_addr.h"
- #include "tst_test.h"
- #include "tst_netdevice.h"
-
---
-2.33.0
-
diff --git a/meta/recipes-extended/ltp/ltp_20210927.bb b/meta/recipes-extended/ltp/ltp_20220121.bb
similarity index 94%
rename from meta/recipes-extended/ltp/ltp_20210927.bb
rename to meta/recipes-extended/ltp/ltp_20220121.bb
index b5dfd8bb69..bf567c6fb8 100644
--- a/meta/recipes-extended/ltp/ltp_20210927.bb
+++ b/meta/recipes-extended/ltp/ltp_20220121.bb
@@ -22,14 +22,11 @@ CFLAGS:append:x86-64 = " -fomit-frame-pointer"
 
 CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__"
 CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
-SRCREV = "12beeda351b5d758a729aaf695b836ccc9eb5304"
+SRCREV = "b0561ad8d9ee9fe1244b5385e941eb65a21e91a1"
 
 SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \
            file://0001-Remove-OOM-tests-from-runtest-mm.patch \
-           file://0002-lib-fix-MemAvailable-parsing.patch \
-           file://0003-lapi-rtnetlink.h-Fix-include-guards.patch \
-           file://0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch \
-           file://0005-lapi-if_addr.h-Define-IFA_FLAGS.patch \
+           file://0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch \
            "
 
 S = "${WORKDIR}/git"
@@ -47,6 +44,10 @@ EXTRA_OECONF = " --with-realtime-testsuite --with-open-posix-testsuite "
 # ltp network/rpc test cases ftbfs when libtirpc is found
 EXTRA_OECONF += " --without-tirpc "
 
+do_compile() {
+    oe_runmake HOSTCC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}" HOST_LDFLAGS="${LDFLAGS_FOR_BUILD}"
+}
+
 do_install(){
     install -d ${D}${prefix}/
     oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install include-install
-- 
2.20.1

[PATCH 15/17] gnutls: update 3.7.2 -> 3.7.3

[Alexander Kanavin]

Drop unsupported option.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../gnutls/{gnutls_3.7.2.bb => gnutls_3.7.3.bb}                | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-support/gnutls/{gnutls_3.7.2.bb => gnutls_3.7.3.bb} (95%)

diff --git a/meta/recipes-support/gnutls/gnutls_3.7.2.bb b/meta/recipes-support/gnutls/gnutls_3.7.3.bb
similarity index 95%
rename from meta/recipes-support/gnutls/gnutls_3.7.2.bb
rename to meta/recipes-support/gnutls/gnutls_3.7.3.bb
index e1a084fac4..6c47ed350f 100644
--- a/meta/recipes-support/gnutls/gnutls_3.7.2.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.7.3.bb
@@ -23,7 +23,7 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
            file://arm_eabi.patch \
            "
 
-SRC_URI[sha256sum] = "646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752"
+SRC_URI[sha256sum] = "fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a"
 
 inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
 
@@ -42,7 +42,6 @@ EXTRA_OECONF = " \
     --disable-libdane \
     --disable-guile \
     --disable-rpath \
-    --enable-local-libopts \
     --enable-openssl-compatibility \
     --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
     --with-librt-prefix=${STAGING_DIR_HOST}${prefix} \
-- 
2.20.1

[PATCH 16/17] libusb1: correct SRC_URI

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-support/libusb/libusb1_1.0.24.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/libusb/libusb1_1.0.24.bb b/meta/recipes-support/libusb/libusb1_1.0.24.bb
index 95a20958a1..e70021f4f7 100644
--- a/meta/recipes-support/libusb/libusb1_1.0.24.bb
+++ b/meta/recipes-support/libusb/libusb1_1.0.24.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Userspace library to access USB (version 1.0)"
 DESCRIPTION = "A cross-platform library to access USB devices from Linux, \
 macOS, Windows, OpenBSD/NetBSD, Haiku and Solaris userspace."
-HOMEPAGE = "http://libusb.sf.net"
+HOMEPAGE = "https://libusb.info"
 BUGTRACKER = "http://www.libusb.org/report"
 SECTION = "libs"
 
@@ -10,10 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
+SRC_URI = "https://github.com/libusb/libusb/releases/download/v${PV}/libusb-${PV}.tar.bz2 \
            file://run-ptest \
           "
 
+UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb/releases"
+
 SRC_URI[sha256sum] = "7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a"
 
 S = "${WORKDIR}/libusb-${PV}"
-- 
2.20.1

[PATCH 17/17] gobject-introspection: replace prelink-rtld with objdump -p

[Alexander Kanavin]

g-i internally processes the output with regexes, and seems
happy with what objdump is printing. It only needs to resolve
the library name as passed to the linker to the library file name.
Also recursive resolution (that ldd is doing and objdump is not)
is not necessary.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/classes/gobject-introspection.bbclass    |  2 +-
 ...-error-return-codes-from-ldd-wrapper.patch | 28 -------------------
 .../gobject-introspection_1.70.0.bb           | 14 ++--------
 3 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch

diff --git a/meta/classes/gobject-introspection.bbclass b/meta/classes/gobject-introspection.bbclass
index 4db1b362d9..7bf9feb0d6 100644
--- a/meta/classes/gobject-introspection.bbclass
+++ b/meta/classes/gobject-introspection.bbclass
@@ -29,7 +29,7 @@ EXTRA_OEMESON:prepend:class-nativesdk = "${@['', '${GIRMESONBUILD}'][d.getVar('G
 
 # Generating introspection data depends on a combination of native and target
 # introspection tools, and qemu to run the target tools.
-DEPENDS:append:class-target = " gobject-introspection gobject-introspection-native qemu-native prelink-native"
+DEPENDS:append:class-target = " gobject-introspection gobject-introspection-native qemu-native"
 
 # Even though introspection is disabled on -native, gobject-introspection package is still
 # needed for m4 macros.
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch
deleted file mode 100644
index b484b5e9e6..0000000000
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 5 Sep 2018 16:46:52 +0200
-Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper
-
-prelink-rtld, which we use instead of ldd returns 127 when it can't find a library.
-It is not an error per se, but it breaks subprocess.check_output().
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- giscanner/shlibs.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index d67df95..80352a6 100644
---- a/giscanner/shlibs.py
-+++ b/giscanner/shlibs.py
-@@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary, libraries):
-             args.extend(['otool', '-L', binary.args[0]])
-         else:
-             args.extend(['ldd', binary.args[0]])
--        output = subprocess.check_output(args)
-+        output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout
-         if isinstance(output, bytes):
-             output = output.decode("utf-8", "replace")
- 
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb
index d4ee03d33c..4f72a33bfa 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb
@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
                     "
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
-           file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \
            file://0001-build-Avoid-the-doctemplates-hack.patch \
            "
 
@@ -33,9 +32,7 @@ DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-arch
 # target build needs qemu to run temporary introspection binaries created
 # on the fly by g-ir-scanner and a native version of itself to run
 # native versions of its own tools during build.
-# Also prelink-rtld is used to find out library dependencies of introspection binaries
-# (standard ldd doesn't work when cross-compiling).
-DEPENDS:append:class-target = " gobject-introspection-native qemu-native prelink-native"
+DEPENDS:append:class-target = " gobject-introspection-native qemu-native"
 
 # needed for writing out the qemu wrapper script
 export STAGING_DIR_HOST
@@ -55,13 +52,6 @@ EXTRA_OEMESON:class-target = " \
     ${@'-Dgir_dir_prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \
 "
 
-# Need to ensure ld.so.conf exists so prelink-native works
-# both before we build and if we install from sstate
-do_configure[prefuncs] += "gobject_introspection_preconfigure"
-python gobject_introspection_preconfigure () {
-    oe.utils.write_ld_so_conf(d)
-}
-
 do_configure:prepend:class-native() {
         # Tweak the native python scripts so that they don't refer to the
         # full path of native python binary (the solution is taken from glib-2.0 recipe)
@@ -113,7 +103,7 @@ EOF
         # for a different architecture
         cat > ${B}/g-ir-scanner-lddwrapper << EOF
 #!/bin/sh
-prelink-rtld --root=$STAGING_DIR_HOST "\$@"
+$OBJDUMP -p "\$@"
 EOF
         chmod +x ${B}/g-ir-scanner-lddwrapper
 
-- 
2.20.1

Re: [PATCH 14/17] ltp: update 20210927 -> 20220121

[Petr Vorel]

Hi Alexander,

> The ltp compliancy parser is rewritten to actually
> match the logs: they seem to be unstructured, test case names
> are not printed and the only indication of failure is appearance of
> FAIL[ED] somewhere.

I'd split meta/lib/oeqa/utils/logparser.py change into separate commit.
It's not related at all to the update.

Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
to the update part only.

> +do_compile() {
> +    oe_runmake HOSTCC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}" HOST_LDFLAGS="${LDFLAGS_FOR_BUILD}"
> +}

This would take me some time to figure out (actually that's why I was postponing
to do the update myself). Thanks!

Kind regards,
Petr

Re: [OE-core] [PATCH 17/17] gobject-introspection: replace prelink-rtld with objdump -p

[Khem Raj]

On Thu, Jan 27, 2022 at 2:21 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> g-i internally processes the output with regexes, and seems
> happy with what objdump is printing. It only needs to resolve
> the library name as passed to the linker to the library file name.
> Also recursive resolution (that ldd is doing and objdump is not)
> is not necessary.
>

thanks for doing this, it further unbolts prelink from core metaddata.
Objdump -p is good, does it use it from binutils-cross ?

> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta/classes/gobject-introspection.bbclass    |  2 +-
>  ...-error-return-codes-from-ldd-wrapper.patch | 28 -------------------
>  .../gobject-introspection_1.70.0.bb           | 14 ++--------
>  3 files changed, 3 insertions(+), 41 deletions(-)
>  delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch
>
> diff --git a/meta/classes/gobject-introspection.bbclass b/meta/classes/gobject-introspection.bbclass
> index 4db1b362d9..7bf9feb0d6 100644
> --- a/meta/classes/gobject-introspection.bbclass
> +++ b/meta/classes/gobject-introspection.bbclass
> @@ -29,7 +29,7 @@ EXTRA_OEMESON:prepend:class-nativesdk = "${@['', '${GIRMESONBUILD}'][d.getVar('G
>
>  # Generating introspection data depends on a combination of native and target
>  # introspection tools, and qemu to run the target tools.
> -DEPENDS:append:class-target = " gobject-introspection gobject-introspection-native qemu-native prelink-native"
> +DEPENDS:append:class-target = " gobject-introspection gobject-introspection-native qemu-native"
>
>  # Even though introspection is disabled on -native, gobject-introspection package is still
>  # needed for m4 macros.
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch
> deleted file mode 100644
> index b484b5e9e6..0000000000
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001
> -From: Alexander Kanavin <alex.kanavin@gmail.com>
> -Date: Wed, 5 Sep 2018 16:46:52 +0200
> -Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper
> -
> -prelink-rtld, which we use instead of ldd returns 127 when it can't find a library.
> -It is not an error per se, but it breaks subprocess.check_output().
> -
> -Upstream-Status: Inappropriate [oe-core specific]
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> -
> ----
> - giscanner/shlibs.py | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
> -index d67df95..80352a6 100644
> ---- a/giscanner/shlibs.py
> -+++ b/giscanner/shlibs.py
> -@@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary, libraries):
> -             args.extend(['otool', '-L', binary.args[0]])
> -         else:
> -             args.extend(['ldd', binary.args[0]])
> --        output = subprocess.check_output(args)
> -+        output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout
> -         if isinstance(output, bytes):
> -             output = output.decode("utf-8", "replace")
> -
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb
> index d4ee03d33c..4f72a33bfa 100644
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb
> +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb
> @@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
>                      "
>
>  SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
> -           file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \
>             file://0001-build-Avoid-the-doctemplates-hack.patch \
>             "
>
> @@ -33,9 +32,7 @@ DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-arch
>  # target build needs qemu to run temporary introspection binaries created
>  # on the fly by g-ir-scanner and a native version of itself to run
>  # native versions of its own tools during build.
> -# Also prelink-rtld is used to find out library dependencies of introspection binaries
> -# (standard ldd doesn't work when cross-compiling).
> -DEPENDS:append:class-target = " gobject-introspection-native qemu-native prelink-native"
> +DEPENDS:append:class-target = " gobject-introspection-native qemu-native"
>
>  # needed for writing out the qemu wrapper script
>  export STAGING_DIR_HOST
> @@ -55,13 +52,6 @@ EXTRA_OEMESON:class-target = " \
>      ${@'-Dgir_dir_prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \
>  "
>
> -# Need to ensure ld.so.conf exists so prelink-native works
> -# both before we build and if we install from sstate
> -do_configure[prefuncs] += "gobject_introspection_preconfigure"
> -python gobject_introspection_preconfigure () {
> -    oe.utils.write_ld_so_conf(d)
> -}
> -
>  do_configure:prepend:class-native() {
>          # Tweak the native python scripts so that they don't refer to the
>          # full path of native python binary (the solution is taken from glib-2.0 recipe)
> @@ -113,7 +103,7 @@ EOF
>          # for a different architecture
>          cat > ${B}/g-ir-scanner-lddwrapper << EOF
>  #!/bin/sh
> -prelink-rtld --root=$STAGING_DIR_HOST "\$@"
> +$OBJDUMP -p "\$@"
>  EOF
>          chmod +x ${B}/g-ir-scanner-lddwrapper
>
> --
> 2.20.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#161039): https://lists.openembedded.org/g/openembedded-core/message/161039
> Mute This Topic: https://lists.openembedded.org/mt/88718372/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [OE-core] [PATCH 13/17] gdb: update 11.1 -> 11.2

[Khem Raj]

On Thu, Jan 27, 2022 at 2:20 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Simplyfy .inc structure: merge gdb.inc into gdb_11.2.bb, rename
> gdb-${PV}.inc to gdb.inc. This will allow easier automatic updates.

this looks ok.

>
> Drop upstreamed patch.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta/recipes-devtools/gdb/gdb-11.1.inc        |  19 --
>  ...ian_11.1.bb => gdb-cross-canadian_11.2.bb} |   2 +-
>  .../{gdb-cross_11.1.bb => gdb-cross_11.2.bb}  |   2 +-
>  meta/recipes-devtools/gdb/gdb.inc             |  27 +-
>  ...erver-register-set-selection-dynamic.patch | 317 ------------------
>  .../gdb/{gdb_11.1.bb => gdb_11.2.bb}          |  13 +-
>  6 files changed, 31 insertions(+), 349 deletions(-)
>  delete mode 100644 meta/recipes-devtools/gdb/gdb-11.1.inc
>  rename meta/recipes-devtools/gdb/{gdb-cross-canadian_11.1.bb => gdb-cross-canadian_11.2.bb} (71%)
>  rename meta/recipes-devtools/gdb/{gdb-cross_11.1.bb => gdb-cross_11.2.bb} (50%)
>  delete mode 100644 meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch
>  rename meta/recipes-devtools/gdb/{gdb_11.1.bb => gdb_11.2.bb} (80%)
>
> diff --git a/meta/recipes-devtools/gdb/gdb-11.1.inc b/meta/recipes-devtools/gdb/gdb-11.1.inc
> deleted file mode 100644
> index 5364a880e3..0000000000
> --- a/meta/recipes-devtools/gdb/gdb-11.1.inc
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
> -                   file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
> -                   file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
> -                   file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
> -
> -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \
> -           file://0001-make-man-install-relative-to-DESTDIR.patch \
> -           file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \
> -           file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \
> -           file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \
> -           file://0006-use-asm-sgidefs.h.patch \
> -           file://0007-Change-order-of-CFLAGS.patch \
> -           file://0008-resolve-restrict-keyword-conflict.patch \
> -           file://0009-Fix-invalid-sigprocmask-call.patch \
> -           file://0010-gdbserver-ctrl-c-handling.patch \
> -           file://0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch \
> -           "
> -SRC_URI[sha256sum] = "cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94"
> diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_11.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_11.2.bb
> similarity index 71%
> rename from meta/recipes-devtools/gdb/gdb-cross-canadian_11.1.bb
> rename to meta/recipes-devtools/gdb/gdb-cross-canadian_11.2.bb
> index 301035940c..4ab2b7156d 100644
> --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_11.1.bb
> +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_11.2.bb
> @@ -1,3 +1,3 @@
>  require gdb-common.inc
>  require gdb-cross-canadian.inc
> -require gdb-${PV}.inc
> +require gdb.inc
> diff --git a/meta/recipes-devtools/gdb/gdb-cross_11.1.bb b/meta/recipes-devtools/gdb/gdb-cross_11.2.bb
> similarity index 50%
> rename from meta/recipes-devtools/gdb/gdb-cross_11.1.bb
> rename to meta/recipes-devtools/gdb/gdb-cross_11.2.bb
> index 50cf159fdb..3b654a2f0d 100644
> --- a/meta/recipes-devtools/gdb/gdb-cross_11.1.bb
> +++ b/meta/recipes-devtools/gdb/gdb-cross_11.2.bb
> @@ -1,2 +1,2 @@
>  require gdb-cross.inc
> -require gdb-${PV}.inc
> +require gdb.inc
> diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
> index 2c95ed3ca0..cf801b192b 100644
> --- a/meta/recipes-devtools/gdb/gdb.inc
> +++ b/meta/recipes-devtools/gdb/gdb.inc
> @@ -1,11 +1,18 @@
> -require gdb-common.inc
> -
> -inherit gettext pkgconfig
> -
> -#LDFLAGS:append = " -s"
> -#export CFLAGS:append=" -L${STAGING_LIBDIR}"
> -
> -# cross-canadian must not see this
> -PACKAGES =+ "gdbserver"
> -FILES:gdbserver = "${bindir}/gdbserver"
> +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
> +                   file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
> +                   file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
> +                   file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
>
> +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \
> +           file://0001-make-man-install-relative-to-DESTDIR.patch \
> +           file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \
> +           file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \
> +           file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \
> +           file://0006-use-asm-sgidefs.h.patch \
> +           file://0007-Change-order-of-CFLAGS.patch \
> +           file://0008-resolve-restrict-keyword-conflict.patch \
> +           file://0009-Fix-invalid-sigprocmask-call.patch \
> +           file://0010-gdbserver-ctrl-c-handling.patch \
> +           "
> +SRC_URI[sha256sum] = "1497c36a71881b8671a9a84a0ee40faab788ca30d7ba19d8463c3cc787152e32"
> diff --git a/meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch b/meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch
> deleted file mode 100644
> index 6fc1859391..0000000000
> --- a/meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch
> +++ /dev/null
> @@ -1,317 +0,0 @@
> -From eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Mon Sep 17 00:00:00 2001
> -From: Luis Machado <luis.machado@linaro.org>
> -Date: Fri, 29 Oct 2021 14:54:36 -0300
> -Subject: [PATCH] [AArch64] Make gdbserver register set selection dynamic
> -
> -The current register set selection mechanism for AArch64 is static, based
> -on a pre-populated array of register sets.
> -
> -This means that we might potentially probe register sets that are not
> -available. This is OK if the kernel errors out during ptrace, but probing the
> -tag_ctl register, for example, does not result in a ptrace error if the kernel
> -supports the tagged address ABI but not MTE (PR 28355).
> -
> -Making the register set selection dynamic, based on feature checks, solves
> -this and simplifies the code a bit. It allows us to list all of the register
> -sets only once, and pick and choose based on HWCAP/HWCAP2 or other properties.
> -
> -gdb/ChangeLog:
> -
> -2021-11-03  Luis Machado  <luis.machado@linaro.org>
> -
> -       PR gdb/28355
> -
> -       * arch/aarch64.h (struct aarch64_features): New struct.
> -
> -gdbserver/ChangeLog:
> -
> -2021-11-03  Luis Machado  <luis.machado@linaro.org>
> -
> -       PR gdb/28355
> -
> -       * linux-aarch64-low.cc (is_sve_tdesc): Remove.
> -       (aarch64_target::low_arch_setup): Rework to adjust the register sets.
> -       (aarch64_regsets): Update to list all register sets.
> -       (aarch64_regsets_info, regs_info_aarch64): Replace NULL with nullptr.
> -       (aarch64_sve_regsets, aarch64_sve_regsets_info)
> -       (regs_info_aarch64_sve): Remove.
> -       (aarch64_adjust_register_sets): New.
> -       (aarch64_target::get_regs_info): Remove references to removed structs.
> -       (initialize_low_arch): Likewise.
> -
> -[ChangeLog entry stripped so that patch applies cleanly]
> -Upstream-Status: Accepted
> ----
> -
> -diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h
> -index 0eb702c5b5e..95edb664b55 100644
> ---- a/gdb/arch/aarch64.h
> -+++ b/gdb/arch/aarch64.h
> -@@ -22,6 +22,15 @@
> -
> - #include "gdbsupport/tdesc.h"
> -
> -+/* Holds information on what architectural features are available.  This is
> -+   used to select register sets.  */
> -+struct aarch64_features
> -+{
> -+  bool sve = false;
> -+  bool pauth = false;
> -+  bool mte = false;
> -+};
> -+
> - /* Create the aarch64 target description.  A non zero VQ value indicates both
> -    the presence of SVE and the Vector Quotient - the number of 128bit chunks in
> -    an SVE Z register.  HAS_PAUTH_P indicates the presence of the PAUTH
> -diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc
> -index daccfef746e..9a8cb4169a7 100644
> ---- a/gdbserver/linux-aarch64-low.cc
> -+++ b/gdbserver/linux-aarch64-low.cc
> -@@ -196,16 +196,6 @@ is_64bit_tdesc (void)
> -   return register_size (regcache->tdesc, 0) == 8;
> - }
> -
> --/* Return true if the regcache contains the number of SVE registers.  */
> --
> --static bool
> --is_sve_tdesc (void)
> --{
> --  struct regcache *regcache = get_thread_regcache (current_thread, 0);
> --
> --  return tdesc_contains_feature (regcache->tdesc, "org.gnu.gdb.aarch64.sve");
> --}
> --
> - static void
> - aarch64_fill_gregset (struct regcache *regcache, void *buf)
> - {
> -@@ -680,40 +670,6 @@ aarch64_target::low_new_fork (process_info *parent,
> -   *child->priv->arch_private = *parent->priv->arch_private;
> - }
> -
> --/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h.  */
> --#define AARCH64_HWCAP_PACA (1 << 30)
> --
> --/* Implementation of linux target ops method "low_arch_setup".  */
> --
> --void
> --aarch64_target::low_arch_setup ()
> --{
> --  unsigned int machine;
> --  int is_elf64;
> --  int tid;
> --
> --  tid = lwpid_of (current_thread);
> --
> --  is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
> --
> --  if (is_elf64)
> --    {
> --      uint64_t vq = aarch64_sve_get_vq (tid);
> --      unsigned long hwcap = linux_get_hwcap (8);
> --      unsigned long hwcap2 = linux_get_hwcap2 (8);
> --      bool pauth_p = hwcap & AARCH64_HWCAP_PACA;
> --      /* MTE is AArch64-only.  */
> --      bool mte_p = hwcap2 & HWCAP2_MTE;
> --
> --      current_process ()->tdesc
> --      = aarch64_linux_read_description (vq, pauth_p, mte_p);
> --    }
> --  else
> --    current_process ()->tdesc = aarch32_linux_read_description ();
> --
> --  aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread));
> --}
> --
> - /* Wrapper for aarch64_sve_regs_copy_to_reg_buf.  */
> -
> - static void
> -@@ -730,21 +686,36 @@ aarch64_sve_regs_copy_from_regcache (struct regcache *regcache, void *buf)
> -   return aarch64_sve_regs_copy_from_reg_buf (regcache, buf);
> - }
> -
> -+/* Array containing all the possible register sets for AArch64/Linux.  During
> -+   architecture setup, these will be checked against the HWCAP/HWCAP2 bits for
> -+   validity and enabled/disabled accordingly.
> -+
> -+   Their sizes are set to 0 here, but they will be adjusted later depending
> -+   on whether each register set is available or not.  */
> - static struct regset_info aarch64_regsets[] =
> - {
> -+  /* GPR registers.  */
> -   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS,
> --    sizeof (struct user_pt_regs), GENERAL_REGS,
> -+    0, GENERAL_REGS,
> -     aarch64_fill_gregset, aarch64_store_gregset },
> -+  /* Floating Point (FPU) registers.  */
> -   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_FPREGSET,
> --    sizeof (struct user_fpsimd_state), FP_REGS,
> -+    0, FP_REGS,
> -     aarch64_fill_fpregset, aarch64_store_fpregset
> -   },
> -+  /* Scalable Vector Extension (SVE) registers.  */
> -+  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE,
> -+    0, EXTENDED_REGS,
> -+    aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache
> -+  },
> -+  /* PAC registers.  */
> -   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK,
> --    AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS,
> --    NULL, aarch64_store_pauthregset },
> -+    0, OPTIONAL_REGS,
> -+    nullptr, aarch64_store_pauthregset },
> -+  /* Tagged address control / MTE registers.  */
> -   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL,
> --    AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset,
> --    aarch64_store_mteregset },
> -+    0, OPTIONAL_REGS,
> -+    aarch64_fill_mteregset, aarch64_store_mteregset },
> -   NULL_REGSET
> - };
> -
> -@@ -752,47 +723,95 @@ static struct regsets_info aarch64_regsets_info =
> -   {
> -     aarch64_regsets, /* regsets */
> -     0, /* num_regsets */
> --    NULL, /* disabled_regsets */
> -+    nullptr, /* disabled_regsets */
> -   };
> -
> - static struct regs_info regs_info_aarch64 =
> -   {
> --    NULL, /* regset_bitmap */
> --    NULL, /* usrregs */
> -+    nullptr, /* regset_bitmap */
> -+    nullptr, /* usrregs */
> -     &aarch64_regsets_info,
> -   };
> -
> --static struct regset_info aarch64_sve_regsets[] =
> -+/* Given FEATURES, adjust the available register sets by setting their
> -+   sizes.  A size of 0 means the register set is disabled and won't be
> -+   used.  */
> -+
> -+static void
> -+aarch64_adjust_register_sets (const struct aarch64_features &features)
> - {
> --  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS,
> --    sizeof (struct user_pt_regs), GENERAL_REGS,
> --    aarch64_fill_gregset, aarch64_store_gregset },
> --  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE,
> --    SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE), EXTENDED_REGS,
> --    aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache
> --  },
> --  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK,
> --    AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS,
> --    NULL, aarch64_store_pauthregset },
> --  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL,
> --    AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset,
> --    aarch64_store_mteregset },
> --  NULL_REGSET
> --};
> -+  struct regset_info *regset;
> -
> --static struct regsets_info aarch64_sve_regsets_info =
> --  {
> --    aarch64_sve_regsets, /* regsets.  */
> --    0, /* num_regsets.  */
> --    NULL, /* disabled_regsets.  */
> --  };
> -+  for (regset = aarch64_regsets; regset->size >= 0; regset++)
> -+    {
> -+      switch (regset->nt_type)
> -+      {
> -+      case NT_PRSTATUS:
> -+        /* General purpose registers are always present.  */
> -+        regset->size = sizeof (struct user_pt_regs);
> -+        break;
> -+      case NT_FPREGSET:
> -+        /* This is unavailable when SVE is present.  */
> -+        if (!features.sve)
> -+          regset->size = sizeof (struct user_fpsimd_state);
> -+        break;
> -+      case NT_ARM_SVE:
> -+        if (features.sve)
> -+          regset->size = SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE);
> -+        break;
> -+      case NT_ARM_PAC_MASK:
> -+        if (features.pauth)
> -+          regset->size = AARCH64_PAUTH_REGS_SIZE;
> -+        break;
> -+      case NT_ARM_TAGGED_ADDR_CTRL:
> -+        if (features.mte)
> -+          regset->size = AARCH64_LINUX_SIZEOF_MTE;
> -+        break;
> -+      default:
> -+        gdb_assert_not_reached ("Unknown register set found.");
> -+      }
> -+    }
> -+}
> -
> --static struct regs_info regs_info_aarch64_sve =
> --  {
> --    NULL, /* regset_bitmap.  */
> --    NULL, /* usrregs.  */
> --    &aarch64_sve_regsets_info,
> --  };
> -+/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h.  */
> -+#define AARCH64_HWCAP_PACA (1 << 30)
> -+
> -+/* Implementation of linux target ops method "low_arch_setup".  */
> -+
> -+void
> -+aarch64_target::low_arch_setup ()
> -+{
> -+  unsigned int machine;
> -+  int is_elf64;
> -+  int tid;
> -+
> -+  tid = lwpid_of (current_thread);
> -+
> -+  is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
> -+
> -+  if (is_elf64)
> -+    {
> -+      struct aarch64_features features;
> -+
> -+      uint64_t vq = aarch64_sve_get_vq (tid);
> -+      features.sve = (vq > 0);
> -+      /* A-profile PAC is 64-bit only.  */
> -+      features.pauth = linux_get_hwcap (8) & AARCH64_HWCAP_PACA;
> -+      /* A-profile MTE is 64-bit only.  */
> -+      features.mte = linux_get_hwcap2 (8) & HWCAP2_MTE;
> -+
> -+      current_process ()->tdesc
> -+      = aarch64_linux_read_description (vq, features.pauth, features.mte);
> -+
> -+      /* Adjust the register sets we should use for this particular set of
> -+       features.  */
> -+      aarch64_adjust_register_sets (features);
> -+    }
> -+  else
> -+    current_process ()->tdesc = aarch32_linux_read_description ();
> -+
> -+  aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread));
> -+}
> -
> - /* Implementation of linux target ops method "get_regs_info".  */
> -
> -@@ -802,9 +821,7 @@ aarch64_target::get_regs_info ()
> -   if (!is_64bit_tdesc ())
> -     return &regs_info_aarch32;
> -
> --  if (is_sve_tdesc ())
> --    return &regs_info_aarch64_sve;
> --
> -+  /* AArch64 64-bit registers.  */
> -   return &regs_info_aarch64;
> - }
> -
> -@@ -3294,5 +3311,4 @@ initialize_low_arch (void)
> -   initialize_low_arch_aarch32 ();
> -
> -   initialize_regsets_info (&aarch64_regsets_info);
> --  initialize_regsets_info (&aarch64_sve_regsets_info);
> - }
> ---
> -2.27.0
> -
> diff --git a/meta/recipes-devtools/gdb/gdb_11.1.bb b/meta/recipes-devtools/gdb/gdb_11.2.bb
> similarity index 80%
> rename from meta/recipes-devtools/gdb/gdb_11.1.bb
> rename to meta/recipes-devtools/gdb/gdb_11.2.bb
> index e73e3a2c5c..9c6db4ca2c 100644
> --- a/meta/recipes-devtools/gdb/gdb_11.1.bb
> +++ b/meta/recipes-devtools/gdb/gdb_11.2.bb
> @@ -1,5 +1,15 @@
> +require gdb-common.inc
> +
> +inherit gettext pkgconfig
> +
> +#LDFLAGS:append = " -s"
> +#export CFLAGS:append=" -L${STAGING_LIBDIR}"
> +
> +# cross-canadian must not see this
> +PACKAGES =+ "gdbserver"
> +FILES:gdbserver = "${bindir}/gdbserver"
> +
>  require gdb.inc
> -require gdb-${PV}.inc
>
>  inherit python3-dir
>
> @@ -26,3 +36,4 @@ EOF
>                 chmod +x ${WORKDIR}/python
>         fi
>  }
> +
> --
> 2.20.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#161035): https://lists.openembedded.org/g/openembedded-core/message/161035
> Mute This Topic: https://lists.openembedded.org/mt/88718367/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [OE-core] [PATCH 11/17] zstd: update 1.5.0 -> 1.5.2

[Khem Raj]

quick look shows that size of zstd package reduces quite a bit, I wonder why

  -4720   KiB zstd
  +2932   KiB zstd

small is ofcourse better, but I wonder what could reduce it so much
between 1.5.0 and 1.5.2

On Thu, Jan 27, 2022 at 2:20 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Drop patches merged upstream.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  ...rt-all-wildcard-file-list-expansions.patch |  81 --------
>  .../zstd/zstd/0001-MinGW-Build-Fixes.patch    | 193 ------------------
>  .../zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb}     |   7 +-
>  3 files changed, 2 insertions(+), 279 deletions(-)
>  delete mode 100644 meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
>  delete mode 100644 meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
>  rename meta/recipes-extended/zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb} (86%)
>
> diff --git a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch b/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
> deleted file mode 100644
> index 3d23648f5b..0000000000
> --- a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
> +++ /dev/null
> @@ -1,81 +0,0 @@
> -From 77c7963c7a0f1c455f20520d5c7b1ec9b17a44fb Mon Sep 17 00:00:00 2001
> -From: Alexander Kanavin <alex.kanavin@gmail.com>
> -Date: Wed, 23 Dec 2020 19:14:32 +0100
> -Subject: [PATCH] Makefile: sort all wildcard file list expansions
> -
> -Otherwise the order is non-deterministic and breaks
> -reproducible builds.
> -
> -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2895]
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> -
> ----
> - programs/Makefile   | 10 +++++-----
> - tests/Makefile      |  4 ++--
> - tests/fuzz/Makefile |  2 +-
> - 3 files changed, 8 insertions(+), 8 deletions(-)
> -
> -diff --git a/programs/Makefile b/programs/Makefile
> -index 599fb02f..2c416467 100644
> ---- a/programs/Makefile
> -+++ b/programs/Makefile
> -@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy
> -
> - vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS) $(ZSTDLIB_DECOMPRESS) $(ZDICT_DIR) $(ZSTDLEGACY_DIR)
> -
> --ZSTDLIB_COMMON_C := $(wildcard $(ZSTDLIB_COMMON)/*.c)
> --ZSTDLIB_COMPRESS_C := $(wildcard $(ZSTDLIB_COMPRESS)/*.c)
> --ZSTDLIB_DECOMPRESS_C := $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c)
> -+ZSTDLIB_COMMON_C := $(sort $(wildcard $(ZSTDLIB_COMMON)/*.c))
> -+ZSTDLIB_COMPRESS_C := $(sort $(wildcard $(ZSTDLIB_COMPRESS)/*.c))
> -+ZSTDLIB_DECOMPRESS_C := $(sort $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c))
> - ZSTDLIB_CORE_SRC := $(ZSTDLIB_DECOMPRESS_C) $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)
> --ZDICT_SRC := $(wildcard $(ZDICT_DIR)/*.c)
> -+ZDICT_SRC := $(sort $(wildcard $(ZDICT_DIR)/*.c))
> -
> - ZSTD_LEGACY_SUPPORT ?= 5
> - ZSTDLEGACY_SRC :=
> -@@ -93,7 +93,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC) $(ZSTDLEGACY_SRC) $(ZDICT_SRC))
> - ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC))
> - ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o)
> -
> --ZSTD_CLI_SRC := $(wildcard *.c)
> -+ZSTD_CLI_SRC := $(sort $(wildcard *.c))
> - ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o)
> -
> - ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC)
> -diff --git a/tests/Makefile b/tests/Makefile
> -index 85553007..b71cdba8 100644
> ---- a/tests/Makefile
> -+++ b/tests/Makefile
> -@@ -49,7 +49,7 @@ ZSTDDECOMP_FILES := $(ZSTDDIR)/decompress/*.c
> - ZSTD_FILES  := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES) $(ZSTDCOMP_FILES)
> - ZDICT_FILES := $(ZSTDDIR)/dictBuilder/*.c
> -
> --ZSTD_F1 := $(wildcard $(ZSTD_FILES))
> -+ZSTD_F1 := $(sort $(wildcard $(ZSTD_FILES)))
> - ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1))
> - ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1))
> - ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2))
> -@@ -202,7 +202,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c bigdict.c
> - invalidDictionaries : $(ZSTD_OBJECTS) invalidDictionaries.c
> -
> - legacy : CPPFLAGS += -I$(ZSTDDIR)/legacy -DZSTD_LEGACY_SUPPORT=4
> --legacy : $(ZSTD_FILES) $(wildcard $(ZSTDDIR)/legacy/*.c) legacy.c
> -+legacy : $(ZSTD_FILES) $(sort $(wildcard $(ZSTDDIR)/legacy/*.c)) legacy.c
> -
> - decodecorpus : LDLIBS += -lm
> - decodecorpus : $(filter-out zstdc_zstd_compress.o, $(ZSTD_OBJECTS)) $(ZDICT_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c decodecorpus.c
> -diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile
> -index ccb574b7..b1cb2935 100644
> ---- a/tests/fuzz/Makefile
> -+++ b/tests/fuzz/Makefile
> -@@ -62,7 +62,7 @@ FUZZ_SRC       := \
> -       $(ZSTDCOMP_SRC) \
> -       $(ZSTDDICT_SRC) \
> -       $(ZSTDLEGACY_SRC)
> --FUZZ_SRC := $(wildcard $(FUZZ_SRC))
> -+FUZZ_SRC := $(sort $(wildcard $(FUZZ_SRC)))
> -
> - FUZZ_D_OBJ1 := $(subst $(ZSTDDIR)/common/,d_lib_common_,$(FUZZ_SRC))
> - FUZZ_D_OBJ2 := $(subst $(ZSTDDIR)/compress/,d_lib_compress_,$(FUZZ_D_OBJ1))
> diff --git a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch b/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
> deleted file mode 100644
> index a0e00dca03..0000000000
> --- a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
> +++ /dev/null
> @@ -1,193 +0,0 @@
> -From ab9a34c92eec815ef214470c927ddbe2e950e7e5 Mon Sep 17 00:00:00 2001
> -From: Joshua Watt <JPEWhacker@gmail.com>
> -Date: Wed, 26 May 2021 09:15:40 -0500
> -Subject: [PATCH] MinGW Build Fixes
> -
> -Fixes building on MinGW by
> - 1) Exporting the OS variable so that it is visible to sub-make
> -    invocations
> - 2) Fixing the extension handling so that make correctly identifies when
> -    targets need to be rebuilt. Without the correct handling, make would
> -    rebuild the executable targets when running `make install` because
> -    it couldn't find them with the correct extension.
> -
> -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2685]
> -Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
> ----
> - Makefile          |  1 +
> - programs/Makefile | 74 +++++++++++++++++++++++------------------------
> - 2 files changed, 38 insertions(+), 37 deletions(-)
> -
> -diff --git a/Makefile b/Makefile
> -index c1908f0a..f9ce9504 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -29,6 +29,7 @@ VOID = /dev/null
> - # fail on other tested distros (ubuntu, debian) even
> - # without manually specifying the TARGET_SYSTEM.
> - TARGET_SYSTEM ?= $(OS)
> -+export OS
> -
> - ifneq (,$(filter Windows%,$(TARGET_SYSTEM)))
> -   EXT =.exe
> -diff --git a/programs/Makefile b/programs/Makefile
> -index 599fb02f..79b45c83 100644
> ---- a/programs/Makefile
> -+++ b/programs/Makefile
> -@@ -209,37 +209,37 @@ SET_CACHE_DIRECTORY = \
> -
> -
> - .PHONY: all
> --all: zstd
> -+all: zstd$(EXT)
> -
> - .PHONY: allVariants
> --allVariants: zstd zstd-compress zstd-decompress zstd-small zstd-nolegacy zstd-dictBuilder
> -+allVariants: zstd$(EXT) zstd-compress$(EXT) zstd-decompress$(EXT) zstd-small$(EXT) zstd-nolegacy$(EXT) zstd-dictBuilder$(EXT)
> -
> - .PHONY: zstd  # must always be run
> --zstd : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
> --zstd : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD)
> --zstd : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD)
> --zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
> -+zstd$(EXT) : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
> -+zstd$(EXT) : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD)
> -+zstd$(EXT) : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD)
> -+zstd$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
> - ifneq (,$(filter Windows%,$(OS)))
> --zstd : $(RES_FILE)
> -+zstd$(EXT) : $(RES_FILE)
> - endif
> -
> - ifndef BUILD_DIR
> - # generate BUILD_DIR from flags
> -
> --zstd:
> -+zstd$(EXT):
> -       $(SET_CACHE_DIRECTORY)
> -
> - else
> - # BUILD_DIR is defined
> -
> - ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_ALL_OBJ))
> --$(BUILD_DIR)/zstd : $(ZSTD_OBJ)
> -+$(BUILD_DIR)/zstd$(EXT) : $(ZSTD_OBJ)
> -       @echo "$(THREAD_MSG)"
> -       @echo "$(ZLIB_MSG)"
> -       @echo "$(LZMA_MSG)"
> -       @echo "$(LZ4_MSG)"
> -       @echo LINK $@
> --      $(CC) $(FLAGS) $^ $(LDLIBS) -o $@$(EXT)
> -+      $(CC) $(FLAGS) $^ $(LDLIBS) -o $@
> -
> - ifeq ($(HAVE_HASH),1)
> - SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) | cut -f 1 -d " ")
> -@@ -249,7 +249,7 @@ else
> - BIN_ISDIFFERENT = 1
> - endif
> -
> --zstd : $(BUILD_DIR)/zstd
> -+zstd$(EXT) : $(BUILD_DIR)/zstd$(EXT)
> -       if [ $(BIN_ISDIFFERENT) -eq 1 ]; then \
> -               cp -f $< $@; \
> -               echo zstd build completed; \
> -@@ -263,46 +263,46 @@ endif  # BUILD_DIR
> - .PHONY: zstd-release
> - zstd-release: DEBUGFLAGS := -DBACKTRACE_ENABLE=0
> - zstd-release: DEBUGFLAGS_LD :=
> --zstd-release: zstd
> -+zstd-release: zstd$(EXT)
> -
> --zstd32 : CPPFLAGS += $(THREAD_CPP)
> --zstd32 : LDFLAGS  += $(THREAD_LD)
> --zstd32 : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
> -+zstd32$(EXT) : CPPFLAGS += $(THREAD_CPP)
> -+zstd32$(EXT) : LDFLAGS  += $(THREAD_LD)
> -+zstd32$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
> - ifneq (,$(filter Windows%,$(OS)))
> --zstd32 : $(RES32_FILE)
> -+zstd32$(EXT) : $(RES32_FILE)
> - endif
> --zstd32 : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC)
> --      $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
> -+zstd32$(EXT) : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC)
> -+      $(CC) -m32 $(FLAGS) $^ -o $@
> -
> - ## zstd-nolegacy: same scope as zstd, with just support of legacy formats removed
> --zstd-nolegacy : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD) $(DEBUGFLAGS_LD)
> --zstd-nolegacy : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ)
> --      $(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS)
> -+zstd-nolegacy$(EXT) : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD) $(DEBUGFLAGS_LD)
> -+zstd-nolegacy$(EXT) : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ)
> -+      $(CC) $(FLAGS) $^ -o $@ $(LDFLAGS)
> -
> - .PHONY: zstd-nomt
> - zstd-nomt : THREAD_CPP :=
> - zstd-nomt : THREAD_LD  :=
> - zstd-nomt : THREAD_MSG := - multi-threading disabled
> --zstd-nomt : zstd
> -+zstd-nomt : zstd$(EXT)
> -
> - .PHONY: zstd-nogz
> - zstd-nogz : ZLIBCPP :=
> - zstd-nogz : ZLIBLD  :=
> - zstd-nogz : ZLIB_MSG := - gzip support is disabled
> --zstd-nogz : zstd
> -+zstd-nogz : zstd$(EXT)
> -
> - .PHONY: zstd-noxz
> - zstd-noxz : LZMACPP :=
> - zstd-noxz : LZMALD  :=
> - zstd-noxz : LZMA_MSG := - xz/lzma support is disabled
> --zstd-noxz : zstd
> -+zstd-noxz : zstd$(EXT)
> -
> - ## zstd-dll: zstd executable linked to dynamic library libzstd (must have same version)
> - .PHONY: zstd-dll
> - zstd-dll : LDFLAGS+= -L$(ZSTDDIR)
> - zstd-dll : LDLIBS += -lzstd
> - zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c
> --zstd-dll : zstd
> -+zstd-dll : zstd$(EXT)
> -
> -
> - ## zstd-pgo: zstd executable optimized with PGO.
> -@@ -321,23 +321,23 @@ zstd-pgo :
> -       $(MAKE) zstd MOREFLAGS=-fprofile-use
> -
> - ## zstd-small: minimal target, supporting only zstd compression and decompression. no bench. no legacy. no other format.
> --zstd-small: CFLAGS = -Os -s
> --zstd-frugal zstd-small: $(ZSTDLIB_CORE_SRC) zstdcli.c util.c timefn.c fileio.c
> --      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ -o $@$(EXT)
> -+zstd-small$(EXT): CFLAGS = -Os -s
> -+zstd-frugal$(EXT) zstd-small$(EXT): $(ZSTDLIB_CORE_SRC) zstdcli.c util.c timefn.c fileio.c
> -+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ -o $@
> -
> --zstd-decompress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) zstdcli.c util.c timefn.c fileio.c
> --      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS -DZSTD_NOTRACE $^ -o $@$(EXT)
> -+zstd-decompress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) zstdcli.c util.c timefn.c fileio.c
> -+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS -DZSTD_NOTRACE $^ -o $@
> -
> --zstd-compress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c util.c timefn.c fileio.c
> --      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS -DZSTD_NOTRACE $^ -o $@$(EXT)
> -+zstd-compress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c util.c timefn.c fileio.c
> -+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS -DZSTD_NOTRACE $^ -o $@
> -
> - ## zstd-dictBuilder: executable supporting dictionary creation and compression (only)
> --zstd-dictBuilder: CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS -DZSTD_NOTRACE
> --zstd-dictBuilder: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c
> --      $(CC) $(FLAGS) $^ -o $@$(EXT)
> -+zstd-dictBuilder$(EXT): CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS -DZSTD_NOTRACE
> -+zstd-dictBuilder$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c
> -+      $(CC) $(FLAGS) $^ -o $@
> -
> --zstdmt: zstd
> --      ln -sf zstd zstdmt
> -+zstdmt$(EXT): zstd$(EXT)
> -+      ln -sf zstd$(EXT) zstdmt$(EXT)
> -
> - .PHONY: generate_res
> - generate_res: $(RES64_FILE) $(RES32_FILE)
> ---
> -2.31.1
> -
> diff --git a/meta/recipes-extended/zstd/zstd_1.5.0.bb b/meta/recipes-extended/zstd/zstd_1.5.2.bb
> similarity index 86%
> rename from meta/recipes-extended/zstd/zstd_1.5.0.bb
> rename to meta/recipes-extended/zstd/zstd_1.5.2.bb
> index 51305d0562..71f439ef57 100644
> --- a/meta/recipes-extended/zstd/zstd_1.5.0.bb
> +++ b/meta/recipes-extended/zstd/zstd_1.5.2.bb
> @@ -9,12 +9,9 @@ LICENSE = "BSD-3-Clause & GPLv2"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \
>                      file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"
>
> -SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https \
> -           file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \
> -           file://0001-MinGW-Build-Fixes.patch \
> -           "
> +SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https"
>
> -SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6"
> +SRCREV = "e47e674cd09583ff0503f0f6defd6d23d8b718d3"
>  UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
>
>  CVE_PRODUCT = "zstandard"
> --
> 2.20.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#161033): https://lists.openembedded.org/g/openembedded-core/message/161033
> Mute This Topic: https://lists.openembedded.org/mt/88718362/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [PATCH 14/17] ltp: update 20210927 -> 20220121

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 534 bytes --]

On Thu, 27 Jan 2022 at 18:21, Petr Vorel <petr.vorel@gmail.com> wrote:

> Hi Alexander,
>
> > The ltp compliancy parser is rewritten to actually
> > match the logs: they seem to be unstructured, test case names
> > are not printed and the only indication of failure is appearance of
> > FAIL[ED] somewhere.
>
> I'd split meta/lib/oeqa/utils/logparser.py change into separate commit.
> It's not related at all to the update.
>

Without this, the update would break the ltp_compliancy ptest, as it would
cause the parser to fail.

Alex

[-- Attachment #2: Type: text/html, Size: 918 bytes --]

Re: [OE-core] [PATCH 17/17] gobject-introspection: replace prelink-rtld with objdump -p

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 6716 bytes --]

On Thu, 27 Jan 2022 at 19:09, Khem Raj <raj.khem@gmail.com> wrote:

> On Thu, Jan 27, 2022 at 2:21 AM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
> >
> > g-i internally processes the output with regexes, and seems
> > happy with what objdump is printing. It only needs to resolve
> > the library name as passed to the linker to the library file name.
> > Also recursive resolution (that ldd is doing and objdump is not)
> > is not necessary.
> >
>
> thanks for doing this, it further unbolts prelink from core metaddata.
> Objdump -p is good, does it use it from binutils-cross ?
>

$OBJDUMP is set to the executable from there, yes.

Alex



>
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >  meta/classes/gobject-introspection.bbclass    |  2 +-
> >  ...-error-return-codes-from-ldd-wrapper.patch | 28 -------------------
> >  .../gobject-introspection_1.70.0.bb           | 14 ++--------
> >  3 files changed, 3 insertions(+), 41 deletions(-)
> >  delete mode 100644
> meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch
> >
> > diff --git a/meta/classes/gobject-introspection.bbclass
> b/meta/classes/gobject-introspection.bbclass
> > index 4db1b362d9..7bf9feb0d6 100644
> > --- a/meta/classes/gobject-introspection.bbclass
> > +++ b/meta/classes/gobject-introspection.bbclass
> > @@ -29,7 +29,7 @@ EXTRA_OEMESON:prepend:class-nativesdk = "${@['',
> '${GIRMESONBUILD}'][d.getVar('G
> >
> >  # Generating introspection data depends on a combination of native and
> target
> >  # introspection tools, and qemu to run the target tools.
> > -DEPENDS:append:class-target = " gobject-introspection
> gobject-introspection-native qemu-native prelink-native"
> > +DEPENDS:append:class-target = " gobject-introspection
> gobject-introspection-native qemu-native"
> >
> >  # Even though introspection is disabled on -native,
> gobject-introspection package is still
> >  # needed for m4 macros.
> > diff --git
> a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch
> b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch
> > deleted file mode 100644
> > index b484b5e9e6..0000000000
> > ---
> a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch
> > +++ /dev/null
> > @@ -1,28 +0,0 @@
> > -From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001
> > -From: Alexander Kanavin <alex.kanavin@gmail.com>
> > -Date: Wed, 5 Sep 2018 16:46:52 +0200
> > -Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper
> > -
> > -prelink-rtld, which we use instead of ldd returns 127 when it can't
> find a library.
> > -It is not an error per se, but it breaks subprocess.check_output().
> > -
> > -Upstream-Status: Inappropriate [oe-core specific]
> > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > -
> > ----
> > - giscanner/shlibs.py | 2 +-
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > -
> > -diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
> > -index d67df95..80352a6 100644
> > ---- a/giscanner/shlibs.py
> > -+++ b/giscanner/shlibs.py
> > -@@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary,
> libraries):
> > -             args.extend(['otool', '-L', binary.args[0]])
> > -         else:
> > -             args.extend(['ldd', binary.args[0]])
> > --        output = subprocess.check_output(args)
> > -+        output = subprocess.run(args, check=False,
> stdout=subprocess.PIPE).stdout
> > -         if isinstance(output, bytes):
> > -             output = output.decode("utf-8", "replace")
> > -
> > diff --git a/meta/recipes-gnome/gobject-introspection/
> gobject-introspection_1.70.0.bb
> b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb
> > index d4ee03d33c..4f72a33bfa 100644
> > --- a/meta/recipes-gnome/gobject-introspection/
> gobject-introspection_1.70.0.bb
> > +++ b/meta/recipes-gnome/gobject-introspection/
> gobject-introspection_1.70.0.bb
> > @@ -14,7 +14,6 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
> >                      "
> >
> >  SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}",
> 2)}/${BPN}-${PV}.tar.xz \
> > -
>  file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \
> >             file://0001-build-Avoid-the-doctemplates-hack.patch \
> >             "
> >
> > @@ -33,9 +32,7 @@ DEPENDS += " libffi zlib glib-2.0 python3 flex-native
> bison-native autoconf-arch
> >  # target build needs qemu to run temporary introspection binaries
> created
> >  # on the fly by g-ir-scanner and a native version of itself to run
> >  # native versions of its own tools during build.
> > -# Also prelink-rtld is used to find out library dependencies of
> introspection binaries
> > -# (standard ldd doesn't work when cross-compiling).
> > -DEPENDS:append:class-target = " gobject-introspection-native
> qemu-native prelink-native"
> > +DEPENDS:append:class-target = " gobject-introspection-native
> qemu-native"
> >
> >  # needed for writing out the qemu wrapper script
> >  export STAGING_DIR_HOST
> > @@ -55,13 +52,6 @@ EXTRA_OEMESON:class-target = " \
> >      ${@'-Dgir_dir_prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \
> >  "
> >
> > -# Need to ensure ld.so.conf exists so prelink-native works
> > -# both before we build and if we install from sstate
> > -do_configure[prefuncs] += "gobject_introspection_preconfigure"
> > -python gobject_introspection_preconfigure () {
> > -    oe.utils.write_ld_so_conf(d)
> > -}
> > -
> >  do_configure:prepend:class-native() {
> >          # Tweak the native python scripts so that they don't refer to
> the
> >          # full path of native python binary (the solution is taken from
> glib-2.0 recipe)
> > @@ -113,7 +103,7 @@ EOF
> >          # for a different architecture
> >          cat > ${B}/g-ir-scanner-lddwrapper << EOF
> >  #!/bin/sh
> > -prelink-rtld --root=$STAGING_DIR_HOST "\$@"
> > +$OBJDUMP -p "\$@"
> >  EOF
> >          chmod +x ${B}/g-ir-scanner-lddwrapper
> >
> > --
> > 2.20.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#161039):
> https://lists.openembedded.org/g/openembedded-core/message/161039
> > Mute This Topic: https://lists.openembedded.org/mt/88718372/1997914
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>

[-- Attachment #2: Type: text/html, Size: 9419 bytes --]

Re: [OE-core] [PATCH 11/17] zstd: update 1.5.0 -> 1.5.2

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 16660 bytes --]

On Thu, 27 Jan 2022 at 19:56, Khem Raj <raj.khem@gmail.com> wrote:

> quick look shows that size of zstd package reduces quite a bit, I wonder
> why
>
>   -4720   KiB zstd
>   +2932   KiB zstd
>
> small is ofcourse better, but I wonder what could reduce it so much
> between 1.5.0 and 1.5.2
>

buildhistory-diff does not reveal anything fishy:

alex@nereus:~/development/poky/build-64-alt$ buildhistory-diff
Changes to packages/core2-64-poky-linux/zstd (sysroot):
  /usr/lib/libzstd.so.1 changed symlink target from libzstd.so.1.5.0 to
libzstd.so.1.5.2
  /usr/lib/libzstd.so changed symlink target from libzstd.so.1.5.0 to
libzstd.so.1.5.2
  /usr/lib/libzstd.so.1.5.0 moved to /usr/lib/libzstd.so.1.5.2
packages/core2-64-poky-linux/zstd/zstd-dbg: PKGSIZE changed from 23736192
to 16994448 (-28%)
packages/core2-64-poky-linux/zstd/zstd-src: PKGSIZE changed from 2741079 to
3050284 (+11%)
packages/core2-64-poky-linux/zstd/zstd-staticdev: PKGSIZE changed from
9332966 to 6596796 (-29%)
packages/core2-64-poky-linux/zstd/zstd: PKGSIZE changed from 3279119 to
2407719 (-27%)
packages/core2-64-poky-linux/zstd/zstd: FILELIST: removed
"/usr/lib/libzstd.so.1.5.0", added "/usr/lib/libzstd.so.1.5.2"
Changes to packages/x86_64-linux/zstd-native (sysroot):
  /usr/lib/libzstd.so.1 changed symlink target from libzstd.so.1.5.0 to
libzstd.so.1.5.2
  /usr/lib/libzstd.so changed symlink target from libzstd.so.1.5.0 to
libzstd.so.1.5.2
  /usr/lib/libzstd.so.1.5.0 moved to /usr/lib/libzstd.so.1.5.2

Alex




>
> On Thu, Jan 27, 2022 at 2:20 AM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
> >
> > Drop patches merged upstream.
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >  ...rt-all-wildcard-file-list-expansions.patch |  81 --------
> >  .../zstd/zstd/0001-MinGW-Build-Fixes.patch    | 193 ------------------
> >  .../zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb}     |   7 +-
> >  3 files changed, 2 insertions(+), 279 deletions(-)
> >  delete mode 100644
> meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
> >  delete mode 100644
> meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
> >  rename meta/recipes-extended/zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb}
> (86%)
> >
> > diff --git
> a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
> b/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
> > deleted file mode 100644
> > index 3d23648f5b..0000000000
> > ---
> a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
> > +++ /dev/null
> > @@ -1,81 +0,0 @@
> > -From 77c7963c7a0f1c455f20520d5c7b1ec9b17a44fb Mon Sep 17 00:00:00 2001
> > -From: Alexander Kanavin <alex.kanavin@gmail.com>
> > -Date: Wed, 23 Dec 2020 19:14:32 +0100
> > -Subject: [PATCH] Makefile: sort all wildcard file list expansions
> > -
> > -Otherwise the order is non-deterministic and breaks
> > -reproducible builds.
> > -
> > -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2895]
> > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > -
> > ----
> > - programs/Makefile   | 10 +++++-----
> > - tests/Makefile      |  4 ++--
> > - tests/fuzz/Makefile |  2 +-
> > - 3 files changed, 8 insertions(+), 8 deletions(-)
> > -
> > -diff --git a/programs/Makefile b/programs/Makefile
> > -index 599fb02f..2c416467 100644
> > ---- a/programs/Makefile
> > -+++ b/programs/Makefile
> > -@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy
> > -
> > - vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS) $(ZSTDLIB_DECOMPRESS)
> $(ZDICT_DIR) $(ZSTDLEGACY_DIR)
> > -
> > --ZSTDLIB_COMMON_C := $(wildcard $(ZSTDLIB_COMMON)/*.c)
> > --ZSTDLIB_COMPRESS_C := $(wildcard $(ZSTDLIB_COMPRESS)/*.c)
> > --ZSTDLIB_DECOMPRESS_C := $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c)
> > -+ZSTDLIB_COMMON_C := $(sort $(wildcard $(ZSTDLIB_COMMON)/*.c))
> > -+ZSTDLIB_COMPRESS_C := $(sort $(wildcard $(ZSTDLIB_COMPRESS)/*.c))
> > -+ZSTDLIB_DECOMPRESS_C := $(sort $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c))
> > - ZSTDLIB_CORE_SRC := $(ZSTDLIB_DECOMPRESS_C) $(ZSTDLIB_COMMON_C)
> $(ZSTDLIB_COMPRESS_C)
> > --ZDICT_SRC := $(wildcard $(ZDICT_DIR)/*.c)
> > -+ZDICT_SRC := $(sort $(wildcard $(ZDICT_DIR)/*.c))
> > -
> > - ZSTD_LEGACY_SUPPORT ?= 5
> > - ZSTDLEGACY_SRC :=
> > -@@ -93,7 +93,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC)
> $(ZSTDLEGACY_SRC) $(ZDICT_SRC))
> > - ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC))
> > - ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o)
> > -
> > --ZSTD_CLI_SRC := $(wildcard *.c)
> > -+ZSTD_CLI_SRC := $(sort $(wildcard *.c))
> > - ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o)
> > -
> > - ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC)
> > -diff --git a/tests/Makefile b/tests/Makefile
> > -index 85553007..b71cdba8 100644
> > ---- a/tests/Makefile
> > -+++ b/tests/Makefile
> > -@@ -49,7 +49,7 @@ ZSTDDECOMP_FILES := $(ZSTDDIR)/decompress/*.c
> > - ZSTD_FILES  := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES)
> $(ZSTDCOMP_FILES)
> > - ZDICT_FILES := $(ZSTDDIR)/dictBuilder/*.c
> > -
> > --ZSTD_F1 := $(wildcard $(ZSTD_FILES))
> > -+ZSTD_F1 := $(sort $(wildcard $(ZSTD_FILES)))
> > - ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1))
> > - ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1))
> > - ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2))
> > -@@ -202,7 +202,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c
> bigdict.c
> > - invalidDictionaries : $(ZSTD_OBJECTS) invalidDictionaries.c
> > -
> > - legacy : CPPFLAGS += -I$(ZSTDDIR)/legacy -DZSTD_LEGACY_SUPPORT=4
> > --legacy : $(ZSTD_FILES) $(wildcard $(ZSTDDIR)/legacy/*.c) legacy.c
> > -+legacy : $(ZSTD_FILES) $(sort $(wildcard $(ZSTDDIR)/legacy/*.c))
> legacy.c
> > -
> > - decodecorpus : LDLIBS += -lm
> > - decodecorpus : $(filter-out zstdc_zstd_compress.o, $(ZSTD_OBJECTS))
> $(ZDICT_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c decodecorpus.c
> > -diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile
> > -index ccb574b7..b1cb2935 100644
> > ---- a/tests/fuzz/Makefile
> > -+++ b/tests/fuzz/Makefile
> > -@@ -62,7 +62,7 @@ FUZZ_SRC       := \
> > -       $(ZSTDCOMP_SRC) \
> > -       $(ZSTDDICT_SRC) \
> > -       $(ZSTDLEGACY_SRC)
> > --FUZZ_SRC := $(wildcard $(FUZZ_SRC))
> > -+FUZZ_SRC := $(sort $(wildcard $(FUZZ_SRC)))
> > -
> > - FUZZ_D_OBJ1 := $(subst $(ZSTDDIR)/common/,d_lib_common_,$(FUZZ_SRC))
> > - FUZZ_D_OBJ2 := $(subst
> $(ZSTDDIR)/compress/,d_lib_compress_,$(FUZZ_D_OBJ1))
> > diff --git
> a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
> b/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
> > deleted file mode 100644
> > index a0e00dca03..0000000000
> > --- a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
> > +++ /dev/null
> > @@ -1,193 +0,0 @@
> > -From ab9a34c92eec815ef214470c927ddbe2e950e7e5 Mon Sep 17 00:00:00 2001
> > -From: Joshua Watt <JPEWhacker@gmail.com>
> > -Date: Wed, 26 May 2021 09:15:40 -0500
> > -Subject: [PATCH] MinGW Build Fixes
> > -
> > -Fixes building on MinGW by
> > - 1) Exporting the OS variable so that it is visible to sub-make
> > -    invocations
> > - 2) Fixing the extension handling so that make correctly identifies when
> > -    targets need to be rebuilt. Without the correct handling, make would
> > -    rebuild the executable targets when running `make install` because
> > -    it couldn't find them with the correct extension.
> > -
> > -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2685]
> > -Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
> > ----
> > - Makefile          |  1 +
> > - programs/Makefile | 74 +++++++++++++++++++++++------------------------
> > - 2 files changed, 38 insertions(+), 37 deletions(-)
> > -
> > -diff --git a/Makefile b/Makefile
> > -index c1908f0a..f9ce9504 100644
> > ---- a/Makefile
> > -+++ b/Makefile
> > -@@ -29,6 +29,7 @@ VOID = /dev/null
> > - # fail on other tested distros (ubuntu, debian) even
> > - # without manually specifying the TARGET_SYSTEM.
> > - TARGET_SYSTEM ?= $(OS)
> > -+export OS
> > -
> > - ifneq (,$(filter Windows%,$(TARGET_SYSTEM)))
> > -   EXT =.exe
> > -diff --git a/programs/Makefile b/programs/Makefile
> > -index 599fb02f..79b45c83 100644
> > ---- a/programs/Makefile
> > -+++ b/programs/Makefile
> > -@@ -209,37 +209,37 @@ SET_CACHE_DIRECTORY = \
> > -
> > -
> > - .PHONY: all
> > --all: zstd
> > -+all: zstd$(EXT)
> > -
> > - .PHONY: allVariants
> > --allVariants: zstd zstd-compress zstd-decompress zstd-small
> zstd-nolegacy zstd-dictBuilder
> > -+allVariants: zstd$(EXT) zstd-compress$(EXT) zstd-decompress$(EXT)
> zstd-small$(EXT) zstd-nolegacy$(EXT) zstd-dictBuilder$(EXT)
> > -
> > - .PHONY: zstd  # must always be run
> > --zstd : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
> > --zstd : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD)
> > --zstd : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD)
> > --zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
> > -+zstd$(EXT) : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
> > -+zstd$(EXT) : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD)
> > -+zstd$(EXT) : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD)
> > -+zstd$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
> > - ifneq (,$(filter Windows%,$(OS)))
> > --zstd : $(RES_FILE)
> > -+zstd$(EXT) : $(RES_FILE)
> > - endif
> > -
> > - ifndef BUILD_DIR
> > - # generate BUILD_DIR from flags
> > -
> > --zstd:
> > -+zstd$(EXT):
> > -       $(SET_CACHE_DIRECTORY)
> > -
> > - else
> > - # BUILD_DIR is defined
> > -
> > - ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_ALL_OBJ))
> > --$(BUILD_DIR)/zstd : $(ZSTD_OBJ)
> > -+$(BUILD_DIR)/zstd$(EXT) : $(ZSTD_OBJ)
> > -       @echo "$(THREAD_MSG)"
> > -       @echo "$(ZLIB_MSG)"
> > -       @echo "$(LZMA_MSG)"
> > -       @echo "$(LZ4_MSG)"
> > -       @echo LINK $@
> > --      $(CC) $(FLAGS) $^ $(LDLIBS) -o $@$(EXT)
> > -+      $(CC) $(FLAGS) $^ $(LDLIBS) -o $@
> > -
> > - ifeq ($(HAVE_HASH),1)
> > - SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) | cut
> -f 1 -d " ")
> > -@@ -249,7 +249,7 @@ else
> > - BIN_ISDIFFERENT = 1
> > - endif
> > -
> > --zstd : $(BUILD_DIR)/zstd
> > -+zstd$(EXT) : $(BUILD_DIR)/zstd$(EXT)
> > -       if [ $(BIN_ISDIFFERENT) -eq 1 ]; then \
> > -               cp -f $< $@; \
> > -               echo zstd build completed; \
> > -@@ -263,46 +263,46 @@ endif  # BUILD_DIR
> > - .PHONY: zstd-release
> > - zstd-release: DEBUGFLAGS := -DBACKTRACE_ENABLE=0
> > - zstd-release: DEBUGFLAGS_LD :=
> > --zstd-release: zstd
> > -+zstd-release: zstd$(EXT)
> > -
> > --zstd32 : CPPFLAGS += $(THREAD_CPP)
> > --zstd32 : LDFLAGS  += $(THREAD_LD)
> > --zstd32 : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
> > -+zstd32$(EXT) : CPPFLAGS += $(THREAD_CPP)
> > -+zstd32$(EXT) : LDFLAGS  += $(THREAD_LD)
> > -+zstd32$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
> > - ifneq (,$(filter Windows%,$(OS)))
> > --zstd32 : $(RES32_FILE)
> > -+zstd32$(EXT) : $(RES32_FILE)
> > - endif
> > --zstd32 : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC)
> > --      $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
> > -+zstd32$(EXT) : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC)
> > -+      $(CC) -m32 $(FLAGS) $^ -o $@
> > -
> > - ## zstd-nolegacy: same scope as zstd, with just support of legacy
> formats removed
> > --zstd-nolegacy : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD)
> $(DEBUGFLAGS_LD)
> > --zstd-nolegacy : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ)
> > --      $(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS)
> > -+zstd-nolegacy$(EXT) : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD)
> $(LZ4LD) $(DEBUGFLAGS_LD)
> > -+zstd-nolegacy$(EXT) : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ)
> > -+      $(CC) $(FLAGS) $^ -o $@ $(LDFLAGS)
> > -
> > - .PHONY: zstd-nomt
> > - zstd-nomt : THREAD_CPP :=
> > - zstd-nomt : THREAD_LD  :=
> > - zstd-nomt : THREAD_MSG := - multi-threading disabled
> > --zstd-nomt : zstd
> > -+zstd-nomt : zstd$(EXT)
> > -
> > - .PHONY: zstd-nogz
> > - zstd-nogz : ZLIBCPP :=
> > - zstd-nogz : ZLIBLD  :=
> > - zstd-nogz : ZLIB_MSG := - gzip support is disabled
> > --zstd-nogz : zstd
> > -+zstd-nogz : zstd$(EXT)
> > -
> > - .PHONY: zstd-noxz
> > - zstd-noxz : LZMACPP :=
> > - zstd-noxz : LZMALD  :=
> > - zstd-noxz : LZMA_MSG := - xz/lzma support is disabled
> > --zstd-noxz : zstd
> > -+zstd-noxz : zstd$(EXT)
> > -
> > - ## zstd-dll: zstd executable linked to dynamic library libzstd (must
> have same version)
> > - .PHONY: zstd-dll
> > - zstd-dll : LDFLAGS+= -L$(ZSTDDIR)
> > - zstd-dll : LDLIBS += -lzstd
> > - zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c
> > --zstd-dll : zstd
> > -+zstd-dll : zstd$(EXT)
> > -
> > -
> > - ## zstd-pgo: zstd executable optimized with PGO.
> > -@@ -321,23 +321,23 @@ zstd-pgo :
> > -       $(MAKE) zstd MOREFLAGS=-fprofile-use
> > -
> > - ## zstd-small: minimal target, supporting only zstd compression and
> decompression. no bench. no legacy. no other format.
> > --zstd-small: CFLAGS = -Os -s
> > --zstd-frugal zstd-small: $(ZSTDLIB_CORE_SRC) zstdcli.c util.c timefn.c
> fileio.c
> > --      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ -o
> $@$(EXT)
> > -+zstd-small$(EXT): CFLAGS = -Os -s
> > -+zstd-frugal$(EXT) zstd-small$(EXT): $(ZSTDLIB_CORE_SRC) zstdcli.c
> util.c timefn.c fileio.c
> > -+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ -o
> $@
> > -
> > --zstd-decompress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) zstdcli.c
> util.c timefn.c fileio.c
> > --      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS
> -DZSTD_NOTRACE $^ -o $@$(EXT)
> > -+zstd-decompress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C)
> zstdcli.c util.c timefn.c fileio.c
> > -+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS
> -DZSTD_NOTRACE $^ -o $@
> > -
> > --zstd-compress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c
> util.c timefn.c fileio.c
> > --      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS
> -DZSTD_NOTRACE $^ -o $@$(EXT)
> > -+zstd-compress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)
> zstdcli.c util.c timefn.c fileio.c
> > -+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS
> -DZSTD_NOTRACE $^ -o $@
> > -
> > - ## zstd-dictBuilder: executable supporting dictionary creation and
> compression (only)
> > --zstd-dictBuilder: CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS
> -DZSTD_NOTRACE
> > --zstd-dictBuilder: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)
> $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c
> > --      $(CC) $(FLAGS) $^ -o $@$(EXT)
> > -+zstd-dictBuilder$(EXT): CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS
> -DZSTD_NOTRACE
> > -+zstd-dictBuilder$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)
> $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c
> > -+      $(CC) $(FLAGS) $^ -o $@
> > -
> > --zstdmt: zstd
> > --      ln -sf zstd zstdmt
> > -+zstdmt$(EXT): zstd$(EXT)
> > -+      ln -sf zstd$(EXT) zstdmt$(EXT)
> > -
> > - .PHONY: generate_res
> > - generate_res: $(RES64_FILE) $(RES32_FILE)
> > ---
> > -2.31.1
> > -
> > diff --git a/meta/recipes-extended/zstd/zstd_1.5.0.bb
> b/meta/recipes-extended/zstd/zstd_1.5.2.bb
> > similarity index 86%
> > rename from meta/recipes-extended/zstd/zstd_1.5.0.bb
> > rename to meta/recipes-extended/zstd/zstd_1.5.2.bb
> > index 51305d0562..71f439ef57 100644
> > --- a/meta/recipes-extended/zstd/zstd_1.5.0.bb
> > +++ b/meta/recipes-extended/zstd/zstd_1.5.2.bb
> > @@ -9,12 +9,9 @@ LICENSE = "BSD-3-Clause & GPLv2"
> >  LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32
> \
> >                      file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"
> >
> > -SRC_URI = "git://
> github.com/facebook/zstd.git;branch=release;protocol=https \
> > -
>  file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \
> > -           file://0001-MinGW-Build-Fixes.patch \
> > -           "
> > +SRC_URI = "git://
> github.com/facebook/zstd.git;branch=release;protocol=https"
> >
> > -SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6"
> > +SRCREV = "e47e674cd09583ff0503f0f6defd6d23d8b718d3"
> >  UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
> >
> >  CVE_PRODUCT = "zstandard"
> > --
> > 2.20.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#161033):
> https://lists.openembedded.org/g/openembedded-core/message/161033
> > Mute This Topic: https://lists.openembedded.org/mt/88718362/1997914
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>

[-- Attachment #2: Type: text/html, Size: 21468 bytes --]

Re: [OE-core] [PATCH 11/17] zstd: update 1.5.0 -> 1.5.2

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 17349 bytes --]

I think zstd changelog for 1.5.1 settles the issue:

https://github.com/facebook/zstd/releases/tag/v1.5.1

Alex

On Thu, 27 Jan 2022 at 20:51, Alexander Kanavin via lists.openembedded.org
<alex.kanavin=gmail.com@lists.openembedded.org> wrote:

> On Thu, 27 Jan 2022 at 19:56, Khem Raj <raj.khem@gmail.com> wrote:
>
>> quick look shows that size of zstd package reduces quite a bit, I wonder
>> why
>>
>>   -4720   KiB zstd
>>   +2932   KiB zstd
>>
>> small is ofcourse better, but I wonder what could reduce it so much
>> between 1.5.0 and 1.5.2
>>
>
> buildhistory-diff does not reveal anything fishy:
>
> alex@nereus:~/development/poky/build-64-alt$ buildhistory-diff
> Changes to packages/core2-64-poky-linux/zstd (sysroot):
>   /usr/lib/libzstd.so.1 changed symlink target from libzstd.so.1.5.0 to
> libzstd.so.1.5.2
>   /usr/lib/libzstd.so changed symlink target from libzstd.so.1.5.0 to
> libzstd.so.1.5.2
>   /usr/lib/libzstd.so.1.5.0 moved to /usr/lib/libzstd.so.1.5.2
> packages/core2-64-poky-linux/zstd/zstd-dbg: PKGSIZE changed from 23736192
> to 16994448 (-28%)
> packages/core2-64-poky-linux/zstd/zstd-src: PKGSIZE changed from 2741079
> to 3050284 (+11%)
> packages/core2-64-poky-linux/zstd/zstd-staticdev: PKGSIZE changed from
> 9332966 to 6596796 (-29%)
> packages/core2-64-poky-linux/zstd/zstd: PKGSIZE changed from 3279119 to
> 2407719 (-27%)
> packages/core2-64-poky-linux/zstd/zstd: FILELIST: removed
> "/usr/lib/libzstd.so.1.5.0", added "/usr/lib/libzstd.so.1.5.2"
> Changes to packages/x86_64-linux/zstd-native (sysroot):
>   /usr/lib/libzstd.so.1 changed symlink target from libzstd.so.1.5.0 to
> libzstd.so.1.5.2
>   /usr/lib/libzstd.so changed symlink target from libzstd.so.1.5.0 to
> libzstd.so.1.5.2
>   /usr/lib/libzstd.so.1.5.0 moved to /usr/lib/libzstd.so.1.5.2
>
> Alex
>
>
>
>
>>
>> On Thu, Jan 27, 2022 at 2:20 AM Alexander Kanavin
>> <alex.kanavin@gmail.com> wrote:
>> >
>> > Drop patches merged upstream.
>> >
>> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>> > ---
>> >  ...rt-all-wildcard-file-list-expansions.patch |  81 --------
>> >  .../zstd/zstd/0001-MinGW-Build-Fixes.patch    | 193 ------------------
>> >  .../zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb}     |   7 +-
>> >  3 files changed, 2 insertions(+), 279 deletions(-)
>> >  delete mode 100644
>> meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
>> >  delete mode 100644
>> meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
>> >  rename meta/recipes-extended/zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb}
>> (86%)
>> >
>> > diff --git
>> a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
>> b/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
>> > deleted file mode 100644
>> > index 3d23648f5b..0000000000
>> > ---
>> a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
>> > +++ /dev/null
>> > @@ -1,81 +0,0 @@
>> > -From 77c7963c7a0f1c455f20520d5c7b1ec9b17a44fb Mon Sep 17 00:00:00 2001
>> > -From: Alexander Kanavin <alex.kanavin@gmail.com>
>> > -Date: Wed, 23 Dec 2020 19:14:32 +0100
>> > -Subject: [PATCH] Makefile: sort all wildcard file list expansions
>> > -
>> > -Otherwise the order is non-deterministic and breaks
>> > -reproducible builds.
>> > -
>> > -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2895
>> ]
>> > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>> > -
>> > ----
>> > - programs/Makefile   | 10 +++++-----
>> > - tests/Makefile      |  4 ++--
>> > - tests/fuzz/Makefile |  2 +-
>> > - 3 files changed, 8 insertions(+), 8 deletions(-)
>> > -
>> > -diff --git a/programs/Makefile b/programs/Makefile
>> > -index 599fb02f..2c416467 100644
>> > ---- a/programs/Makefile
>> > -+++ b/programs/Makefile
>> > -@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy
>> > -
>> > - vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS) $(ZSTDLIB_DECOMPRESS)
>> $(ZDICT_DIR) $(ZSTDLEGACY_DIR)
>> > -
>> > --ZSTDLIB_COMMON_C := $(wildcard $(ZSTDLIB_COMMON)/*.c)
>> > --ZSTDLIB_COMPRESS_C := $(wildcard $(ZSTDLIB_COMPRESS)/*.c)
>> > --ZSTDLIB_DECOMPRESS_C := $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c)
>> > -+ZSTDLIB_COMMON_C := $(sort $(wildcard $(ZSTDLIB_COMMON)/*.c))
>> > -+ZSTDLIB_COMPRESS_C := $(sort $(wildcard $(ZSTDLIB_COMPRESS)/*.c))
>> > -+ZSTDLIB_DECOMPRESS_C := $(sort $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c))
>> > - ZSTDLIB_CORE_SRC := $(ZSTDLIB_DECOMPRESS_C) $(ZSTDLIB_COMMON_C)
>> $(ZSTDLIB_COMPRESS_C)
>> > --ZDICT_SRC := $(wildcard $(ZDICT_DIR)/*.c)
>> > -+ZDICT_SRC := $(sort $(wildcard $(ZDICT_DIR)/*.c))
>> > -
>> > - ZSTD_LEGACY_SUPPORT ?= 5
>> > - ZSTDLEGACY_SRC :=
>> > -@@ -93,7 +93,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC)
>> $(ZSTDLEGACY_SRC) $(ZDICT_SRC))
>> > - ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC))
>> > - ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o)
>> > -
>> > --ZSTD_CLI_SRC := $(wildcard *.c)
>> > -+ZSTD_CLI_SRC := $(sort $(wildcard *.c))
>> > - ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o)
>> > -
>> > - ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC)
>> > -diff --git a/tests/Makefile b/tests/Makefile
>> > -index 85553007..b71cdba8 100644
>> > ---- a/tests/Makefile
>> > -+++ b/tests/Makefile
>> > -@@ -49,7 +49,7 @@ ZSTDDECOMP_FILES := $(ZSTDDIR)/decompress/*.c
>> > - ZSTD_FILES  := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES)
>> $(ZSTDCOMP_FILES)
>> > - ZDICT_FILES := $(ZSTDDIR)/dictBuilder/*.c
>> > -
>> > --ZSTD_F1 := $(wildcard $(ZSTD_FILES))
>> > -+ZSTD_F1 := $(sort $(wildcard $(ZSTD_FILES)))
>> > - ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1))
>> > - ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1))
>> > - ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2))
>> > -@@ -202,7 +202,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c
>> bigdict.c
>> > - invalidDictionaries : $(ZSTD_OBJECTS) invalidDictionaries.c
>> > -
>> > - legacy : CPPFLAGS += -I$(ZSTDDIR)/legacy -DZSTD_LEGACY_SUPPORT=4
>> > --legacy : $(ZSTD_FILES) $(wildcard $(ZSTDDIR)/legacy/*.c) legacy.c
>> > -+legacy : $(ZSTD_FILES) $(sort $(wildcard $(ZSTDDIR)/legacy/*.c))
>> legacy.c
>> > -
>> > - decodecorpus : LDLIBS += -lm
>> > - decodecorpus : $(filter-out zstdc_zstd_compress.o, $(ZSTD_OBJECTS))
>> $(ZDICT_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c decodecorpus.c
>> > -diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile
>> > -index ccb574b7..b1cb2935 100644
>> > ---- a/tests/fuzz/Makefile
>> > -+++ b/tests/fuzz/Makefile
>> > -@@ -62,7 +62,7 @@ FUZZ_SRC       := \
>> > -       $(ZSTDCOMP_SRC) \
>> > -       $(ZSTDDICT_SRC) \
>> > -       $(ZSTDLEGACY_SRC)
>> > --FUZZ_SRC := $(wildcard $(FUZZ_SRC))
>> > -+FUZZ_SRC := $(sort $(wildcard $(FUZZ_SRC)))
>> > -
>> > - FUZZ_D_OBJ1 := $(subst $(ZSTDDIR)/common/,d_lib_common_,$(FUZZ_SRC))
>> > - FUZZ_D_OBJ2 := $(subst
>> $(ZSTDDIR)/compress/,d_lib_compress_,$(FUZZ_D_OBJ1))
>> > diff --git
>> a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
>> b/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
>> > deleted file mode 100644
>> > index a0e00dca03..0000000000
>> > --- a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
>> > +++ /dev/null
>> > @@ -1,193 +0,0 @@
>> > -From ab9a34c92eec815ef214470c927ddbe2e950e7e5 Mon Sep 17 00:00:00 2001
>> > -From: Joshua Watt <JPEWhacker@gmail.com>
>> > -Date: Wed, 26 May 2021 09:15:40 -0500
>> > -Subject: [PATCH] MinGW Build Fixes
>> > -
>> > -Fixes building on MinGW by
>> > - 1) Exporting the OS variable so that it is visible to sub-make
>> > -    invocations
>> > - 2) Fixing the extension handling so that make correctly identifies
>> when
>> > -    targets need to be rebuilt. Without the correct handling, make
>> would
>> > -    rebuild the executable targets when running `make install` because
>> > -    it couldn't find them with the correct extension.
>> > -
>> > -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2685
>> ]
>> > -Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
>> > ----
>> > - Makefile          |  1 +
>> > - programs/Makefile | 74 +++++++++++++++++++++++------------------------
>> > - 2 files changed, 38 insertions(+), 37 deletions(-)
>> > -
>> > -diff --git a/Makefile b/Makefile
>> > -index c1908f0a..f9ce9504 100644
>> > ---- a/Makefile
>> > -+++ b/Makefile
>> > -@@ -29,6 +29,7 @@ VOID = /dev/null
>> > - # fail on other tested distros (ubuntu, debian) even
>> > - # without manually specifying the TARGET_SYSTEM.
>> > - TARGET_SYSTEM ?= $(OS)
>> > -+export OS
>> > -
>> > - ifneq (,$(filter Windows%,$(TARGET_SYSTEM)))
>> > -   EXT =.exe
>> > -diff --git a/programs/Makefile b/programs/Makefile
>> > -index 599fb02f..79b45c83 100644
>> > ---- a/programs/Makefile
>> > -+++ b/programs/Makefile
>> > -@@ -209,37 +209,37 @@ SET_CACHE_DIRECTORY = \
>> > -
>> > -
>> > - .PHONY: all
>> > --all: zstd
>> > -+all: zstd$(EXT)
>> > -
>> > - .PHONY: allVariants
>> > --allVariants: zstd zstd-compress zstd-decompress zstd-small
>> zstd-nolegacy zstd-dictBuilder
>> > -+allVariants: zstd$(EXT) zstd-compress$(EXT) zstd-decompress$(EXT)
>> zstd-small$(EXT) zstd-nolegacy$(EXT) zstd-dictBuilder$(EXT)
>> > -
>> > - .PHONY: zstd  # must always be run
>> > --zstd : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
>> > --zstd : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD)
>> > --zstd : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD)
>> > --zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
>> > -+zstd$(EXT) : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
>> > -+zstd$(EXT) : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD)
>> > -+zstd$(EXT) : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD)
>> > -+zstd$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
>> > - ifneq (,$(filter Windows%,$(OS)))
>> > --zstd : $(RES_FILE)
>> > -+zstd$(EXT) : $(RES_FILE)
>> > - endif
>> > -
>> > - ifndef BUILD_DIR
>> > - # generate BUILD_DIR from flags
>> > -
>> > --zstd:
>> > -+zstd$(EXT):
>> > -       $(SET_CACHE_DIRECTORY)
>> > -
>> > - else
>> > - # BUILD_DIR is defined
>> > -
>> > - ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_ALL_OBJ))
>> > --$(BUILD_DIR)/zstd : $(ZSTD_OBJ)
>> > -+$(BUILD_DIR)/zstd$(EXT) : $(ZSTD_OBJ)
>> > -       @echo "$(THREAD_MSG)"
>> > -       @echo "$(ZLIB_MSG)"
>> > -       @echo "$(LZMA_MSG)"
>> > -       @echo "$(LZ4_MSG)"
>> > -       @echo LINK $@
>> > --      $(CC) $(FLAGS) $^ $(LDLIBS) -o $@$(EXT)
>> > -+      $(CC) $(FLAGS) $^ $(LDLIBS) -o $@
>> > -
>> > - ifeq ($(HAVE_HASH),1)
>> > - SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) |
>> cut -f 1 -d " ")
>> > -@@ -249,7 +249,7 @@ else
>> > - BIN_ISDIFFERENT = 1
>> > - endif
>> > -
>> > --zstd : $(BUILD_DIR)/zstd
>> > -+zstd$(EXT) : $(BUILD_DIR)/zstd$(EXT)
>> > -       if [ $(BIN_ISDIFFERENT) -eq 1 ]; then \
>> > -               cp -f $< $@; \
>> > -               echo zstd build completed; \
>> > -@@ -263,46 +263,46 @@ endif  # BUILD_DIR
>> > - .PHONY: zstd-release
>> > - zstd-release: DEBUGFLAGS := -DBACKTRACE_ENABLE=0
>> > - zstd-release: DEBUGFLAGS_LD :=
>> > --zstd-release: zstd
>> > -+zstd-release: zstd$(EXT)
>> > -
>> > --zstd32 : CPPFLAGS += $(THREAD_CPP)
>> > --zstd32 : LDFLAGS  += $(THREAD_LD)
>> > --zstd32 : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
>> > -+zstd32$(EXT) : CPPFLAGS += $(THREAD_CPP)
>> > -+zstd32$(EXT) : LDFLAGS  += $(THREAD_LD)
>> > -+zstd32$(EXT) : CPPFLAGS +=
>> -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
>> > - ifneq (,$(filter Windows%,$(OS)))
>> > --zstd32 : $(RES32_FILE)
>> > -+zstd32$(EXT) : $(RES32_FILE)
>> > - endif
>> > --zstd32 : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC)
>> > --      $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
>> > -+zstd32$(EXT) : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC)
>> > -+      $(CC) -m32 $(FLAGS) $^ -o $@
>> > -
>> > - ## zstd-nolegacy: same scope as zstd, with just support of legacy
>> formats removed
>> > --zstd-nolegacy : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD)
>> $(DEBUGFLAGS_LD)
>> > --zstd-nolegacy : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ)
>> > --      $(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS)
>> > -+zstd-nolegacy$(EXT) : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD)
>> $(LZ4LD) $(DEBUGFLAGS_LD)
>> > -+zstd-nolegacy$(EXT) : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ)
>> > -+      $(CC) $(FLAGS) $^ -o $@ $(LDFLAGS)
>> > -
>> > - .PHONY: zstd-nomt
>> > - zstd-nomt : THREAD_CPP :=
>> > - zstd-nomt : THREAD_LD  :=
>> > - zstd-nomt : THREAD_MSG := - multi-threading disabled
>> > --zstd-nomt : zstd
>> > -+zstd-nomt : zstd$(EXT)
>> > -
>> > - .PHONY: zstd-nogz
>> > - zstd-nogz : ZLIBCPP :=
>> > - zstd-nogz : ZLIBLD  :=
>> > - zstd-nogz : ZLIB_MSG := - gzip support is disabled
>> > --zstd-nogz : zstd
>> > -+zstd-nogz : zstd$(EXT)
>> > -
>> > - .PHONY: zstd-noxz
>> > - zstd-noxz : LZMACPP :=
>> > - zstd-noxz : LZMALD  :=
>> > - zstd-noxz : LZMA_MSG := - xz/lzma support is disabled
>> > --zstd-noxz : zstd
>> > -+zstd-noxz : zstd$(EXT)
>> > -
>> > - ## zstd-dll: zstd executable linked to dynamic library libzstd (must
>> have same version)
>> > - .PHONY: zstd-dll
>> > - zstd-dll : LDFLAGS+= -L$(ZSTDDIR)
>> > - zstd-dll : LDLIBS += -lzstd
>> > - zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c
>> > --zstd-dll : zstd
>> > -+zstd-dll : zstd$(EXT)
>> > -
>> > -
>> > - ## zstd-pgo: zstd executable optimized with PGO.
>> > -@@ -321,23 +321,23 @@ zstd-pgo :
>> > -       $(MAKE) zstd MOREFLAGS=-fprofile-use
>> > -
>> > - ## zstd-small: minimal target, supporting only zstd compression and
>> decompression. no bench. no legacy. no other format.
>> > --zstd-small: CFLAGS = -Os -s
>> > --zstd-frugal zstd-small: $(ZSTDLIB_CORE_SRC) zstdcli.c util.c timefn.c
>> fileio.c
>> > --      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^
>> -o $@$(EXT)
>> > -+zstd-small$(EXT): CFLAGS = -Os -s
>> > -+zstd-frugal$(EXT) zstd-small$(EXT): $(ZSTDLIB_CORE_SRC) zstdcli.c
>> util.c timefn.c fileio.c
>> > -+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^
>> -o $@
>> > -
>> > --zstd-decompress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C)
>> zstdcli.c util.c timefn.c fileio.c
>> > --      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS
>> -DZSTD_NOTRACE $^ -o $@$(EXT)
>> > -+zstd-decompress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C)
>> zstdcli.c util.c timefn.c fileio.c
>> > -+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS
>> -DZSTD_NOTRACE $^ -o $@
>> > -
>> > --zstd-compress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c
>> util.c timefn.c fileio.c
>> > --      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS
>> -DZSTD_NOTRACE $^ -o $@$(EXT)
>> > -+zstd-compress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)
>> zstdcli.c util.c timefn.c fileio.c
>> > -+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS
>> -DZSTD_NOTRACE $^ -o $@
>> > -
>> > - ## zstd-dictBuilder: executable supporting dictionary creation and
>> compression (only)
>> > --zstd-dictBuilder: CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS
>> -DZSTD_NOTRACE
>> > --zstd-dictBuilder: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)
>> $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c
>> > --      $(CC) $(FLAGS) $^ -o $@$(EXT)
>> > -+zstd-dictBuilder$(EXT): CPPFLAGS += -DZSTD_NOBENCH
>> -DZSTD_NODECOMPRESS -DZSTD_NOTRACE
>> > -+zstd-dictBuilder$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)
>> $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c
>> > -+      $(CC) $(FLAGS) $^ -o $@
>> > -
>> > --zstdmt: zstd
>> > --      ln -sf zstd zstdmt
>> > -+zstdmt$(EXT): zstd$(EXT)
>> > -+      ln -sf zstd$(EXT) zstdmt$(EXT)
>> > -
>> > - .PHONY: generate_res
>> > - generate_res: $(RES64_FILE) $(RES32_FILE)
>> > ---
>> > -2.31.1
>> > -
>> > diff --git a/meta/recipes-extended/zstd/zstd_1.5.0.bb
>> b/meta/recipes-extended/zstd/zstd_1.5.2.bb
>> > similarity index 86%
>> > rename from meta/recipes-extended/zstd/zstd_1.5.0.bb
>> > rename to meta/recipes-extended/zstd/zstd_1.5.2.bb
>> > index 51305d0562..71f439ef57 100644
>> > --- a/meta/recipes-extended/zstd/zstd_1.5.0.bb
>> > +++ b/meta/recipes-extended/zstd/zstd_1.5.2.bb
>> > @@ -9,12 +9,9 @@ LICENSE = "BSD-3-Clause & GPLv2"
>> >  LIC_FILES_CHKSUM =
>> "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \
>> >
>> file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"
>> >
>> > -SRC_URI = "git://
>> github.com/facebook/zstd.git;branch=release;protocol=https \
>> > -
>>  file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \
>> > -           file://0001-MinGW-Build-Fixes.patch \
>> > -           "
>> > +SRC_URI = "git://
>> github.com/facebook/zstd.git;branch=release;protocol=https"
>> >
>> > -SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6"
>> > +SRCREV = "e47e674cd09583ff0503f0f6defd6d23d8b718d3"
>> >  UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
>> >
>> >  CVE_PRODUCT = "zstandard"
>> > --
>> > 2.20.1
>> >
>> >
>> >
>> >
>>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#161053):
> https://lists.openembedded.org/g/openembedded-core/message/161053
> Mute This Topic: https://lists.openembedded.org/mt/88718362/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

[-- Attachment #2: Type: text/html, Size: 22190 bytes --]

Re: [PATCH 14/17] ltp: update 20210927 -> 20220121

[Petr Vorel]

> On Thu, 27 Jan 2022 at 18:21, Petr Vorel <petr.vorel@gmail.com> wrote:

> > Hi Alexander,

> > > The ltp compliancy parser is rewritten to actually
> > > match the logs: they seem to be unstructured, test case names
> > > are not printed and the only indication of failure is appearance of
> > > FAIL[ED] somewhere.

> > I'd split meta/lib/oeqa/utils/logparser.py change into separate commit.
> > It's not related at all to the update.


> Without this, the update would break the ltp_compliancy ptest, as it would
> cause the parser to fail.
OK. If it can work with the previous version I'd commit it separately.
But maybe it's correct this way, I understand LTP, not openembedded.

Anyway, thanks for the update.

Kind regards,
Petr

> Alex

Re: [OE-core] [PATCH 11/17] zstd: update 1.5.0 -> 1.5.2

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 17924 bytes --]

On Thu, Jan 27, 2022 at 12:10 PM Alexander Kanavin <alex.kanavin@gmail.com>
wrote:

> I think zstd changelog for 1.5.1 settles the issue:
>
> https://github.com/facebook/zstd/releases/tag/v1.5.1
>

Yeah indeed

 thanks

>
> Alex
>
> On Thu, 27 Jan 2022 at 20:51, Alexander Kanavin via lists.openembedded.org
> <alex.kanavin=gmail.com@lists.openembedded.org> wrote:
>
>> On Thu, 27 Jan 2022 at 19:56, Khem Raj <raj.khem@gmail.com> wrote:
>>
>>> quick look shows that size of zstd package reduces quite a bit, I wonder
>>> why
>>>
>>>   -4720   KiB zstd
>>>   +2932   KiB zstd
>>>
>>> small is ofcourse better, but I wonder what could reduce it so much
>>> between 1.5.0 and 1.5.2
>>>
>>
>> buildhistory-diff does not reveal anything fishy:
>>
>> alex@nereus:~/development/poky/build-64-alt$ buildhistory-diff
>> Changes to packages/core2-64-poky-linux/zstd (sysroot):
>>   /usr/lib/libzstd.so.1 changed symlink target from libzstd.so.1.5.0 to
>> libzstd.so.1.5.2
>>   /usr/lib/libzstd.so changed symlink target from libzstd.so.1.5.0 to
>> libzstd.so.1.5.2
>>   /usr/lib/libzstd.so.1.5.0 moved to /usr/lib/libzstd.so.1.5.2
>> packages/core2-64-poky-linux/zstd/zstd-dbg: PKGSIZE changed from 23736192
>> to 16994448 (-28%)
>> packages/core2-64-poky-linux/zstd/zstd-src: PKGSIZE changed from 2741079
>> to 3050284 (+11%)
>> packages/core2-64-poky-linux/zstd/zstd-staticdev: PKGSIZE changed from
>> 9332966 to 6596796 (-29%)
>> packages/core2-64-poky-linux/zstd/zstd: PKGSIZE changed from 3279119 to
>> 2407719 (-27%)
>> packages/core2-64-poky-linux/zstd/zstd: FILELIST: removed
>> "/usr/lib/libzstd.so.1.5.0", added "/usr/lib/libzstd.so.1.5.2"
>> Changes to packages/x86_64-linux/zstd-native (sysroot):
>>   /usr/lib/libzstd.so.1 changed symlink target from libzstd.so.1.5.0 to
>> libzstd.so.1.5.2
>>   /usr/lib/libzstd.so changed symlink target from libzstd.so.1.5.0 to
>> libzstd.so.1.5.2
>>   /usr/lib/libzstd.so.1.5.0 moved to /usr/lib/libzstd.so.1.5.2
>>
>> Alex
>>
>>
>>
>>
>>>
>>> On Thu, Jan 27, 2022 at 2:20 AM Alexander Kanavin
>>> <alex.kanavin@gmail.com> wrote:
>>> >
>>> > Drop patches merged upstream.
>>> >
>>> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>>> > ---
>>> >  ...rt-all-wildcard-file-list-expansions.patch |  81 --------
>>> >  .../zstd/zstd/0001-MinGW-Build-Fixes.patch    | 193 ------------------
>>> >  .../zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb}     |   7 +-
>>> >  3 files changed, 2 insertions(+), 279 deletions(-)
>>> >  delete mode 100644
>>> meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
>>> >  delete mode 100644
>>> meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
>>> >  rename meta/recipes-extended/zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb}
>>> (86%)
>>> >
>>> > diff --git
>>> a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
>>> b/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
>>> > deleted file mode 100644
>>> > index 3d23648f5b..0000000000
>>> > ---
>>> a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
>>> > +++ /dev/null
>>> > @@ -1,81 +0,0 @@
>>> > -From 77c7963c7a0f1c455f20520d5c7b1ec9b17a44fb Mon Sep 17 00:00:00 2001
>>> > -From: Alexander Kanavin <alex.kanavin@gmail.com>
>>> > -Date: Wed, 23 Dec 2020 19:14:32 +0100
>>> > -Subject: [PATCH] Makefile: sort all wildcard file list expansions
>>> > -
>>> > -Otherwise the order is non-deterministic and breaks
>>> > -reproducible builds.
>>> > -
>>> > -Upstream-Status: Submitted [
>>> https://github.com/facebook/zstd/pull/2895]
>>> > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>>> > -
>>> > ----
>>> > - programs/Makefile   | 10 +++++-----
>>> > - tests/Makefile      |  4 ++--
>>> > - tests/fuzz/Makefile |  2 +-
>>> > - 3 files changed, 8 insertions(+), 8 deletions(-)
>>> > -
>>> > -diff --git a/programs/Makefile b/programs/Makefile
>>> > -index 599fb02f..2c416467 100644
>>> > ---- a/programs/Makefile
>>> > -+++ b/programs/Makefile
>>> > -@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy
>>> > -
>>> > - vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS)
>>> $(ZSTDLIB_DECOMPRESS) $(ZDICT_DIR) $(ZSTDLEGACY_DIR)
>>> > -
>>> > --ZSTDLIB_COMMON_C := $(wildcard $(ZSTDLIB_COMMON)/*.c)
>>> > --ZSTDLIB_COMPRESS_C := $(wildcard $(ZSTDLIB_COMPRESS)/*.c)
>>> > --ZSTDLIB_DECOMPRESS_C := $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c)
>>> > -+ZSTDLIB_COMMON_C := $(sort $(wildcard $(ZSTDLIB_COMMON)/*.c))
>>> > -+ZSTDLIB_COMPRESS_C := $(sort $(wildcard $(ZSTDLIB_COMPRESS)/*.c))
>>> > -+ZSTDLIB_DECOMPRESS_C := $(sort $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c))
>>> > - ZSTDLIB_CORE_SRC := $(ZSTDLIB_DECOMPRESS_C) $(ZSTDLIB_COMMON_C)
>>> $(ZSTDLIB_COMPRESS_C)
>>> > --ZDICT_SRC := $(wildcard $(ZDICT_DIR)/*.c)
>>> > -+ZDICT_SRC := $(sort $(wildcard $(ZDICT_DIR)/*.c))
>>> > -
>>> > - ZSTD_LEGACY_SUPPORT ?= 5
>>> > - ZSTDLEGACY_SRC :=
>>> > -@@ -93,7 +93,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC)
>>> $(ZSTDLEGACY_SRC) $(ZDICT_SRC))
>>> > - ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC))
>>> > - ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o)
>>> > -
>>> > --ZSTD_CLI_SRC := $(wildcard *.c)
>>> > -+ZSTD_CLI_SRC := $(sort $(wildcard *.c))
>>> > - ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o)
>>> > -
>>> > - ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC)
>>> > -diff --git a/tests/Makefile b/tests/Makefile
>>> > -index 85553007..b71cdba8 100644
>>> > ---- a/tests/Makefile
>>> > -+++ b/tests/Makefile
>>> > -@@ -49,7 +49,7 @@ ZSTDDECOMP_FILES := $(ZSTDDIR)/decompress/*.c
>>> > - ZSTD_FILES  := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES)
>>> $(ZSTDCOMP_FILES)
>>> > - ZDICT_FILES := $(ZSTDDIR)/dictBuilder/*.c
>>> > -
>>> > --ZSTD_F1 := $(wildcard $(ZSTD_FILES))
>>> > -+ZSTD_F1 := $(sort $(wildcard $(ZSTD_FILES)))
>>> > - ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1))
>>> > - ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1))
>>> > - ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2))
>>> > -@@ -202,7 +202,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c
>>> bigdict.c
>>> > - invalidDictionaries : $(ZSTD_OBJECTS) invalidDictionaries.c
>>> > -
>>> > - legacy : CPPFLAGS += -I$(ZSTDDIR)/legacy -DZSTD_LEGACY_SUPPORT=4
>>> > --legacy : $(ZSTD_FILES) $(wildcard $(ZSTDDIR)/legacy/*.c) legacy.c
>>> > -+legacy : $(ZSTD_FILES) $(sort $(wildcard $(ZSTDDIR)/legacy/*.c))
>>> legacy.c
>>> > -
>>> > - decodecorpus : LDLIBS += -lm
>>> > - decodecorpus : $(filter-out zstdc_zstd_compress.o, $(ZSTD_OBJECTS))
>>> $(ZDICT_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c decodecorpus.c
>>> > -diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile
>>> > -index ccb574b7..b1cb2935 100644
>>> > ---- a/tests/fuzz/Makefile
>>> > -+++ b/tests/fuzz/Makefile
>>> > -@@ -62,7 +62,7 @@ FUZZ_SRC       := \
>>> > -       $(ZSTDCOMP_SRC) \
>>> > -       $(ZSTDDICT_SRC) \
>>> > -       $(ZSTDLEGACY_SRC)
>>> > --FUZZ_SRC := $(wildcard $(FUZZ_SRC))
>>> > -+FUZZ_SRC := $(sort $(wildcard $(FUZZ_SRC)))
>>> > -
>>> > - FUZZ_D_OBJ1 := $(subst $(ZSTDDIR)/common/,d_lib_common_,$(FUZZ_SRC))
>>> > - FUZZ_D_OBJ2 := $(subst
>>> $(ZSTDDIR)/compress/,d_lib_compress_,$(FUZZ_D_OBJ1))
>>> > diff --git
>>> a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
>>> b/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
>>> > deleted file mode 100644
>>> > index a0e00dca03..0000000000
>>> > --- a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch
>>> > +++ /dev/null
>>> > @@ -1,193 +0,0 @@
>>> > -From ab9a34c92eec815ef214470c927ddbe2e950e7e5 Mon Sep 17 00:00:00 2001
>>> > -From: Joshua Watt <JPEWhacker@gmail.com>
>>> > -Date: Wed, 26 May 2021 09:15:40 -0500
>>> > -Subject: [PATCH] MinGW Build Fixes
>>> > -
>>> > -Fixes building on MinGW by
>>> > - 1) Exporting the OS variable so that it is visible to sub-make
>>> > -    invocations
>>> > - 2) Fixing the extension handling so that make correctly identifies
>>> when
>>> > -    targets need to be rebuilt. Without the correct handling, make
>>> would
>>> > -    rebuild the executable targets when running `make install` because
>>> > -    it couldn't find them with the correct extension.
>>> > -
>>> > -Upstream-Status: Submitted [
>>> https://github.com/facebook/zstd/pull/2685]
>>> > -Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
>>> > ----
>>> > - Makefile          |  1 +
>>> > - programs/Makefile | 74
>>> +++++++++++++++++++++++------------------------
>>> > - 2 files changed, 38 insertions(+), 37 deletions(-)
>>> > -
>>> > -diff --git a/Makefile b/Makefile
>>> > -index c1908f0a..f9ce9504 100644
>>> > ---- a/Makefile
>>> > -+++ b/Makefile
>>> > -@@ -29,6 +29,7 @@ VOID = /dev/null
>>> > - # fail on other tested distros (ubuntu, debian) even
>>> > - # without manually specifying the TARGET_SYSTEM.
>>> > - TARGET_SYSTEM ?= $(OS)
>>> > -+export OS
>>> > -
>>> > - ifneq (,$(filter Windows%,$(TARGET_SYSTEM)))
>>> > -   EXT =.exe
>>> > -diff --git a/programs/Makefile b/programs/Makefile
>>> > -index 599fb02f..79b45c83 100644
>>> > ---- a/programs/Makefile
>>> > -+++ b/programs/Makefile
>>> > -@@ -209,37 +209,37 @@ SET_CACHE_DIRECTORY = \
>>> > -
>>> > -
>>> > - .PHONY: all
>>> > --all: zstd
>>> > -+all: zstd$(EXT)
>>> > -
>>> > - .PHONY: allVariants
>>> > --allVariants: zstd zstd-compress zstd-decompress zstd-small
>>> zstd-nolegacy zstd-dictBuilder
>>> > -+allVariants: zstd$(EXT) zstd-compress$(EXT) zstd-decompress$(EXT)
>>> zstd-small$(EXT) zstd-nolegacy$(EXT) zstd-dictBuilder$(EXT)
>>> > -
>>> > - .PHONY: zstd  # must always be run
>>> > --zstd : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
>>> > --zstd : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD)
>>> > --zstd : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD)
>>> > --zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
>>> > -+zstd$(EXT) : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP)
>>> $(LZ4CPP)
>>> > -+zstd$(EXT) : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD)
>>> > -+zstd$(EXT) : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD)
>>> > -+zstd$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
>>> > - ifneq (,$(filter Windows%,$(OS)))
>>> > --zstd : $(RES_FILE)
>>> > -+zstd$(EXT) : $(RES_FILE)
>>> > - endif
>>> > -
>>> > - ifndef BUILD_DIR
>>> > - # generate BUILD_DIR from flags
>>> > -
>>> > --zstd:
>>> > -+zstd$(EXT):
>>> > -       $(SET_CACHE_DIRECTORY)
>>> > -
>>> > - else
>>> > - # BUILD_DIR is defined
>>> > -
>>> > - ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_ALL_OBJ))
>>> > --$(BUILD_DIR)/zstd : $(ZSTD_OBJ)
>>> > -+$(BUILD_DIR)/zstd$(EXT) : $(ZSTD_OBJ)
>>> > -       @echo "$(THREAD_MSG)"
>>> > -       @echo "$(ZLIB_MSG)"
>>> > -       @echo "$(LZMA_MSG)"
>>> > -       @echo "$(LZ4_MSG)"
>>> > -       @echo LINK $@
>>> > --      $(CC) $(FLAGS) $^ $(LDLIBS) -o $@$(EXT)
>>> > -+      $(CC) $(FLAGS) $^ $(LDLIBS) -o $@
>>> > -
>>> > - ifeq ($(HAVE_HASH),1)
>>> > - SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) |
>>> cut -f 1 -d " ")
>>> > -@@ -249,7 +249,7 @@ else
>>> > - BIN_ISDIFFERENT = 1
>>> > - endif
>>> > -
>>> > --zstd : $(BUILD_DIR)/zstd
>>> > -+zstd$(EXT) : $(BUILD_DIR)/zstd$(EXT)
>>> > -       if [ $(BIN_ISDIFFERENT) -eq 1 ]; then \
>>> > -               cp -f $< $@; \
>>> > -               echo zstd build completed; \
>>> > -@@ -263,46 +263,46 @@ endif  # BUILD_DIR
>>> > - .PHONY: zstd-release
>>> > - zstd-release: DEBUGFLAGS := -DBACKTRACE_ENABLE=0
>>> > - zstd-release: DEBUGFLAGS_LD :=
>>> > --zstd-release: zstd
>>> > -+zstd-release: zstd$(EXT)
>>> > -
>>> > --zstd32 : CPPFLAGS += $(THREAD_CPP)
>>> > --zstd32 : LDFLAGS  += $(THREAD_LD)
>>> > --zstd32 : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
>>> > -+zstd32$(EXT) : CPPFLAGS += $(THREAD_CPP)
>>> > -+zstd32$(EXT) : LDFLAGS  += $(THREAD_LD)
>>> > -+zstd32$(EXT) : CPPFLAGS +=
>>> -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
>>> > - ifneq (,$(filter Windows%,$(OS)))
>>> > --zstd32 : $(RES32_FILE)
>>> > -+zstd32$(EXT) : $(RES32_FILE)
>>> > - endif
>>> > --zstd32 : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC)
>>> > --      $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
>>> > -+zstd32$(EXT) : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC)
>>> > -+      $(CC) -m32 $(FLAGS) $^ -o $@
>>> > -
>>> > - ## zstd-nolegacy: same scope as zstd, with just support of legacy
>>> formats removed
>>> > --zstd-nolegacy : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD)
>>> $(DEBUGFLAGS_LD)
>>> > --zstd-nolegacy : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ)
>>> > --      $(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS)
>>> > -+zstd-nolegacy$(EXT) : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD)
>>> $(LZ4LD) $(DEBUGFLAGS_LD)
>>> > -+zstd-nolegacy$(EXT) : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC)
>>> $(ZSTD_CLI_OBJ)
>>> > -+      $(CC) $(FLAGS) $^ -o $@ $(LDFLAGS)
>>> > -
>>> > - .PHONY: zstd-nomt
>>> > - zstd-nomt : THREAD_CPP :=
>>> > - zstd-nomt : THREAD_LD  :=
>>> > - zstd-nomt : THREAD_MSG := - multi-threading disabled
>>> > --zstd-nomt : zstd
>>> > -+zstd-nomt : zstd$(EXT)
>>> > -
>>> > - .PHONY: zstd-nogz
>>> > - zstd-nogz : ZLIBCPP :=
>>> > - zstd-nogz : ZLIBLD  :=
>>> > - zstd-nogz : ZLIB_MSG := - gzip support is disabled
>>> > --zstd-nogz : zstd
>>> > -+zstd-nogz : zstd$(EXT)
>>> > -
>>> > - .PHONY: zstd-noxz
>>> > - zstd-noxz : LZMACPP :=
>>> > - zstd-noxz : LZMALD  :=
>>> > - zstd-noxz : LZMA_MSG := - xz/lzma support is disabled
>>> > --zstd-noxz : zstd
>>> > -+zstd-noxz : zstd$(EXT)
>>> > -
>>> > - ## zstd-dll: zstd executable linked to dynamic library libzstd (must
>>> have same version)
>>> > - .PHONY: zstd-dll
>>> > - zstd-dll : LDFLAGS+= -L$(ZSTDDIR)
>>> > - zstd-dll : LDLIBS += -lzstd
>>> > - zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c
>>> > --zstd-dll : zstd
>>> > -+zstd-dll : zstd$(EXT)
>>> > -
>>> > -
>>> > - ## zstd-pgo: zstd executable optimized with PGO.
>>> > -@@ -321,23 +321,23 @@ zstd-pgo :
>>> > -       $(MAKE) zstd MOREFLAGS=-fprofile-use
>>> > -
>>> > - ## zstd-small: minimal target, supporting only zstd compression and
>>> decompression. no bench. no legacy. no other format.
>>> > --zstd-small: CFLAGS = -Os -s
>>> > --zstd-frugal zstd-small: $(ZSTDLIB_CORE_SRC) zstdcli.c util.c
>>> timefn.c fileio.c
>>> > --      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^
>>> -o $@$(EXT)
>>> > -+zstd-small$(EXT): CFLAGS = -Os -s
>>> > -+zstd-frugal$(EXT) zstd-small$(EXT): $(ZSTDLIB_CORE_SRC) zstdcli.c
>>> util.c timefn.c fileio.c
>>> > -+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^
>>> -o $@
>>> > -
>>> > --zstd-decompress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C)
>>> zstdcli.c util.c timefn.c fileio.c
>>> > --      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS
>>> -DZSTD_NOTRACE $^ -o $@$(EXT)
>>> > -+zstd-decompress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C)
>>> zstdcli.c util.c timefn.c fileio.c
>>> > -+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS
>>> -DZSTD_NOTRACE $^ -o $@
>>> > -
>>> > --zstd-compress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c
>>> util.c timefn.c fileio.c
>>> > --      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT
>>> -DZSTD_NODECOMPRESS -DZSTD_NOTRACE $^ -o $@$(EXT)
>>> > -+zstd-compress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)
>>> zstdcli.c util.c timefn.c fileio.c
>>> > -+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT
>>> -DZSTD_NODECOMPRESS -DZSTD_NOTRACE $^ -o $@
>>> > -
>>> > - ## zstd-dictBuilder: executable supporting dictionary creation and
>>> compression (only)
>>> > --zstd-dictBuilder: CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS
>>> -DZSTD_NOTRACE
>>> > --zstd-dictBuilder: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)
>>> $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c
>>> > --      $(CC) $(FLAGS) $^ -o $@$(EXT)
>>> > -+zstd-dictBuilder$(EXT): CPPFLAGS += -DZSTD_NOBENCH
>>> -DZSTD_NODECOMPRESS -DZSTD_NOTRACE
>>> > -+zstd-dictBuilder$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)
>>> $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c
>>> > -+      $(CC) $(FLAGS) $^ -o $@
>>> > -
>>> > --zstdmt: zstd
>>> > --      ln -sf zstd zstdmt
>>> > -+zstdmt$(EXT): zstd$(EXT)
>>> > -+      ln -sf zstd$(EXT) zstdmt$(EXT)
>>> > -
>>> > - .PHONY: generate_res
>>> > - generate_res: $(RES64_FILE) $(RES32_FILE)
>>> > ---
>>> > -2.31.1
>>> > -
>>> > diff --git a/meta/recipes-extended/zstd/zstd_1.5.0.bb
>>> b/meta/recipes-extended/zstd/zstd_1.5.2.bb
>>> > similarity index 86%
>>> > rename from meta/recipes-extended/zstd/zstd_1.5.0.bb
>>> > rename to meta/recipes-extended/zstd/zstd_1.5.2.bb
>>> > index 51305d0562..71f439ef57 100644
>>> > --- a/meta/recipes-extended/zstd/zstd_1.5.0.bb
>>> > +++ b/meta/recipes-extended/zstd/zstd_1.5.2.bb
>>> > @@ -9,12 +9,9 @@ LICENSE = "BSD-3-Clause & GPLv2"
>>> >  LIC_FILES_CHKSUM =
>>> "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \
>>> >
>>> file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"
>>> >
>>> > -SRC_URI = "git://
>>> github.com/facebook/zstd.git;branch=release;protocol=https \
>>> > -
>>>  file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \
>>> > -           file://0001-MinGW-Build-Fixes.patch \
>>> > -           "
>>> > +SRC_URI = "git://
>>> github.com/facebook/zstd.git;branch=release;protocol=https"
>>> >
>>> > -SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6"
>>> > +SRCREV = "e47e674cd09583ff0503f0f6defd6d23d8b718d3"
>>> >  UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
>>> >
>>> >  CVE_PRODUCT = "zstandard"
>>> > --
>>> > 2.20.1
>>> >
>>> >
>>> >
>>> >
>>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>>
> View/Reply Online (#161053):
>> https://lists.openembedded.org/g/openembedded-core/message/161053
>> Mute This Topic: https://lists.openembedded.org/mt/88718362/1686489
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
>> alex.kanavin@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
>>

[-- Attachment #2: Type: text/html, Size: 23888 bytes --]