Skip to contentSkip to conversation

mesa: fold mesa-gl variant into the main recipe using mcextend class

PATCH In review Alexander Kanavin 3 participants 27 messages Jan 27, 2022 1 message not in the archive Zstd

lore
Share & tools
lore
#0 lore raw

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

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.

---
 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
meta/recipes-graphics/mesa/mesa-gl_21.3.4.bb deleted +0 -16
deleted file mode 100644
index 142bb743b1..0000000000
@@ -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 ?= ""
meta/recipes-graphics/mesa/mesa.inc deleted +0 -316

316 lines not on this page · raw message

meta/recipes-graphics/mesa/mesa_21.3.4.bb +336 -1

341 lines not on this page · raw message

Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/17 bind: upgrade 9.16.24 -> 9.16.25

From: Alexander Kanavin <[email protected]>

License-Update: copyright years

---
 .../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%)
meta/recipes-connectivity/bind/bind-9.16.25/0001-avoid-start-failure-with-bind-user.patch renamed from meta/recipes-connectivity/bind/bind-9.16.24/0001-avoid-start-failure-with-bind-user.patch +0 -0
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
meta/recipes-connectivity/bind/bind-9.16.25/0001-named-lwresd-V-and-start-log-hide-build-options.patch renamed from meta/recipes-connectivity/bind/bind-9.16.24/0001-named-lwresd-V-and-start-log-hide-build-options.patch +0 -0
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
meta/recipes-connectivity/bind/bind-9.16.25/bind-ensure-searching-for-json-headers-searches-sysr.patch renamed from meta/recipes-connectivity/bind/bind-9.16.24/bind-ensure-searching-for-json-headers-searches-sysr.patch +0 -0
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
meta/recipes-connectivity/bind/bind-9.16.25/bind9 renamed from meta/recipes-connectivity/bind/bind-9.16.24/bind9 +0 -0
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
meta/recipes-connectivity/bind/bind-9.16.25/conf.patch renamed from meta/recipes-connectivity/bind/bind-9.16.24/conf.patch +0 -0
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
meta/recipes-connectivity/bind/bind-9.16.25/generate-rndc-key.sh renamed from meta/recipes-connectivity/bind/bind-9.16.24/generate-rndc-key.sh +0 -0
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
meta/recipes-connectivity/bind/bind-9.16.25/init.d-add-support-for-read-only-rootfs.patch renamed from meta/recipes-connectivity/bind/bind-9.16.24/init.d-add-support-for-read-only-rootfs.patch +0 -0
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
meta/recipes-connectivity/bind/bind-9.16.25/make-etc-initd-bind-stop-work.patch renamed from meta/recipes-connectivity/bind/bind-9.16.24/make-etc-initd-bind-stop-work.patch +0 -0
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
meta/recipes-connectivity/bind/bind-9.16.25/named.service renamed from meta/recipes-connectivity/bind/bind-9.16.24/named.service +0 -0
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
meta/recipes-connectivity/bind/bind_9.16.25.bb renamed from meta/recipes-connectivity/bind/bind_9.16.24.bb +2 -2
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
@@ -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
Signature · 1 line
2.20.1
#2 lore raw

PATCH 3/17 ifupdown: upgrade 0.8.36 -> 0.8.37

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../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%)
meta/recipes-core/ifupdown/ifupdown_0.8.37.bb renamed from meta/recipes-core/ifupdown/ifupdown_0.8.36.bb +1 -1
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
@@ -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"
 
Signature · 1 line
2.20.1
#3 lore raw

PATCH 4/17 ethtool: upgrade 5.15 -> 5.16

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../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%)
meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +3 -3
index 0ec3537198..034dc92444 100644
@@ -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 <[email protected]>
 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, [email protected])
+ AC_INIT(ethtool, 5.16, [email protected])
  AC_PREREQ(2.52)
  AC_CONFIG_SRCDIR([ethtool.c])
 -AM_INIT_AUTOMAKE([gnu subdir-objects])
meta/recipes-extended/ethtool/ethtool_5.16.bb renamed from meta/recipes-extended/ethtool/ethtool_5.15.bb +1 -1
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
@@ -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/"
 
Signature · 1 line
2.20.1
#4 lore raw

PATCH 5/17 webkitgtk: upgrade 2.34.3 -> 2.34.4

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../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%)
meta/recipes-sato/webkit/webkitgtk_2.34.4.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.34.3.bb +1 -1
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
@@ -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
 
Signature · 1 line
2.20.1
#5 lore raw

PATCH 6/17 debianutils: upgrade 5.5 -> 5.7

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../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%)
meta/recipes-support/debianutils/debianutils_5.7.bb renamed from meta/recipes-support/debianutils/debianutils_5.5.bb +1 -1
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
@@ -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
 
Signature · 1 line
2.20.1
#6 lore raw

PATCH 7/17 diffoscope: upgrade 200 -> 201

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../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%)
meta/recipes-support/diffoscope/diffoscope_201.bb renamed from meta/recipes-support/diffoscope/diffoscope_200.bb +1 -1
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
@@ -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"
 
Signature · 1 line
2.20.1
#7 lore raw

PATCH 8/17 libbsd: upgrade 0.11.3 -> 0.11.5

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

License-Update: additional files

---
 .../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%)
meta/recipes-support/libbsd/libbsd_0.11.5.bb renamed from meta/recipes-support/libbsd/libbsd_0.11.3.bb +2 -2
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
@@ -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
 
Signature · 1 line
2.20.1
#8 lore raw

PATCH 9/17 libical: upgrade 3.0.12 -> 3.0.13

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../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%)
meta/recipes-support/libical/libical_3.0.13.bb renamed from meta/recipes-support/libical/libical_3.0.12.bb +1 -1
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
@@ -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
Signature · 1 line
2.20.1
#9 lore raw

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

In reply to Alexander Kanavin

License-Update: copyright years

---
 ...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%)
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch deleted +0 -82
deleted file mode 100644
index 7b0713cf6d..0000000000
@@ -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 <[email protected]>
-
-From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <[email protected]>
-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 <[email protected]>
----
- 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
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch deleted +0 -151

151 lines not on this page · raw message

meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-replace-systemd-install-Alias-with-WantedBy.patch deleted +0 -52

52 lines not on this page · raw message

meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch deleted +0 -62

62 lines not on this page · raw message

meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch deleted +0 -50

50 lines not on this page · raw message

meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-0326.patch deleted +0 -45

45 lines not on this page · raw message

meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-27803.patch deleted +0 -58

58 lines not on this page · raw message

meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-30004.patch deleted +0 -123

123 lines not on this page · raw message

meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb renamed from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb +6 -15
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
@@ -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"
 
Signature · 1 line
2.20.1
#10 lore raw

PATCH 11/17 zstd: update 1.5.0 -> 1.5.2

In reply to Alexander Kanavin

Drop patches merged upstream.

---
 ...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%)
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -81
deleted file mode 100644
index 3d23648f5b..0000000000
@@ -1,81 +0,0 @@
-From 77c7963c7a0f1c455f20520d5c7b1ec9b17a44fb Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-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 <[email protected]>
-
----
- 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))
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -193

193 lines not on this page · raw message

meta/recipes-extended/zstd/zstd_1.5.2.bb renamed from meta/recipes-extended/zstd/zstd_1.5.0.bb +2 -5
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
@@ -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"
Signature · 1 line
2.20.1
#11 lore raw

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

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

Quoted 333 lines · Alexander Kanavin

Drop patches merged upstream.

---
 ...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%)
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -81
deleted file mode 100644
index 3d23648f5b..0000000000
@@ -1,81 +0,0 @@
-From 77c7963c7a0f1c455f20520d5c7b1ec9b17a44fb Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-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 <[email protected]>
-
----
- 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))
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -193
deleted file mode 100644
index a0e00dca03..0000000000
@@ -1,193 +0,0 @@
-From ab9a34c92eec815ef214470c927ddbe2e950e7e5 Mon Sep 17 00:00:00 2001
-From: Joshua Watt <[email protected]>
-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 <[email protected]>
----
- 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
-
meta/recipes-extended/zstd/zstd_1.5.2.bb renamed from meta/recipes-extended/zstd/zstd_1.5.0.bb +2 -6
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
@@ -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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#12 lore raw

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

Quoted 9 lines · 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

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

Quoted 385 lines
Quoted 10 lines · Alexander Kanavin

Drop patches merged upstream.

---
 ...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

Quoted 1 line
 delete mode 100644

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 1 line
 rename meta/recipes-extended/zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb}

(86%)

Quoted 2 lines

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

Quoted 3 lines

deleted file mode 100644
index 3d23648f5b..0000000000
---

a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 16 lines

+++ /dev/null

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -14
@@ -1,81 +0,0 @@
-From 77c7963c7a0f1c455f20520d5c7b1ec9b17a44fb Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-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 <[email protected]>
-
----
- programs/Makefile   | 10 +++++-----
- tests/Makefile      |  4 ++--

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch line 24

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -10
- 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)

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 8 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -8
-
--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)

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 6 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -6
--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))

Quoted 4 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -4
- ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC))
- ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o)
-
--ZSTD_CLI_SRC := $(wildcard *.c)

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -10
-+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)

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 8 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -8
- 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

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 5 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -5
- 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

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 3 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -3
-
- decodecorpus : LDLIBS += -lm
- decodecorpus : $(filter-out zstdc_zstd_compress.o, $(ZSTD_OBJECTS))

$(ZDICT_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c decodecorpus.c

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 13 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -13
-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))

Quoted 1 line

diff --git

a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch b/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 40 lines

deleted file mode 100644
index a0e00dca03..0000000000

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -35
@@ -1,193 +0,0 @@
-From ab9a34c92eec815ef214470c927ddbe2e950e7e5 Mon Sep 17 00:00:00 2001
-From: Joshua Watt <[email protected]>
-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 <[email protected]>
----
- 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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 45

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -10
-+++ 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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 46

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+allVariants: zstd$(EXT) zstd-compress$(EXT) zstd-decompress$(EXT)

zstd-small$(EXT) zstd-nolegacy$(EXT) zstd-dictBuilder$(EXT)

Quoted 28 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -28
-
- .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)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -10
-       @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 " ")

Quoted 22 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -22
-@@ -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)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -10
- 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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 117

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--zstd-nolegacy : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD)

$(DEBUGFLAGS_LD)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 3 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -3
--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)

Quoted 15 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -15
-+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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -10
-+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)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 13 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -13
- .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.

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 160

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
--zstd-small: CFLAGS = -Os -s
--zstd-frugal zstd-small: $(ZSTDLIB_CORE_SRC) zstdcli.c util.c timefn.c

fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 161

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ -o

$@$(EXT)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 163

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
-+zstd-small$(EXT): CFLAGS = -Os -s
-+zstd-frugal$(EXT) zstd-small$(EXT): $(ZSTDLIB_CORE_SRC) zstdcli.c

util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 164

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ -o

$@

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 166

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
-
--zstd-decompress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) zstdcli.c

util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 167

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS

-DZSTD_NOTRACE $^ -o $@$(EXT)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 168

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+zstd-decompress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C)

zstdcli.c util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 169

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS

-DZSTD_NOTRACE $^ -o $@

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 171

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
-
--zstd-compress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c

util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 172

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS

-DZSTD_NOTRACE $^ -o $@$(EXT)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 173

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+zstd-compress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)

zstdcli.c util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 174

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS

-DZSTD_NOTRACE $^ -o $@

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 176

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
-
- ## zstd-dictBuilder: executable supporting dictionary creation and

compression (only)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 177

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--zstd-dictBuilder: CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS

-DZSTD_NOTRACE

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 178

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--zstd-dictBuilder: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)

$(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 180

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
--      $(CC) $(FLAGS) $^ -o $@$(EXT)
-+zstd-dictBuilder$(EXT): CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS

-DZSTD_NOTRACE

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 181

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+zstd-dictBuilder$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)

$(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c

Review

Quoted 13 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -12
-+      $(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
-
(quoted diff) +0 -0

b/meta/recipes-extended/zstd/zstd_1.5.2.bb

meta/recipes-extended/zstd/zstd_1.5.2.bb LICENSE = "BSD-3-Clause & GPLv2" · line 9

Quoted 8 lines

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

meta/recipes-extended/zstd/zstd_1.5.2.bb renamed from meta/recipes-extended/zstd/zstd_1.5.0.bb +0 -0
@@ -9,12 +9,9 @@ LICENSE = "BSD-3-Clause & GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32

\

meta/recipes-extended/zstd/zstd_1.5.2.bb LICENSE = "BSD-3-Clause & GPLv2"

Quoted 3 lines
meta/recipes-extended/zstd/zstd_1.5.2.bb renamed from meta/recipes-extended/zstd/zstd_1.5.0.bb +0 -1
                     file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"
 
-SRC_URI = "git://

github.com/facebook/zstd.git;branch=release;protocol=https \

meta/recipes-extended/zstd/zstd_1.5.2.bb LICENSE = "BSD-3-Clause & GPLv2" · line 13

Quoted 1 line
meta/recipes-extended/zstd/zstd_1.5.2.bb renamed from meta/recipes-extended/zstd/zstd_1.5.0.bb +0 -1
-

file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \

meta/recipes-extended/zstd/zstd_1.5.2.bb LICENSE = "BSD-3-Clause & GPLv2"

Quoted 3 lines
meta/recipes-extended/zstd/zstd_1.5.2.bb renamed from meta/recipes-extended/zstd/zstd_1.5.0.bb +1 -2
-           file://0001-MinGW-Build-Fixes.patch \
-           "
+SRC_URI = "git://

github.com/facebook/zstd.git;branch=release;protocol=https"

Quoted 10 lines
meta/recipes-extended/zstd/zstd_1.5.2.bb renamed from meta/recipes-extended/zstd/zstd_1.5.0.bb +1 -2
-SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6"
+SRCREV = "e47e674cd09583ff0503f0f6defd6d23d8b718d3"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 CVE_PRODUCT = "zstandard"
--

2.20.1

Quoted 3 lines

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#161033):

https://lists.openembedded.org/g/openembedded-core/message/161033

Quoted 3 lines

Mute This Topic: https://lists.openembedded.org/mt/88718362/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [

[email protected]]

Quoted 2 lines

-=-=-=-=-=-=-=-=-=-=-=-

A message that is not in the archive (sent off-list or not yet received): [email protected]

#14 lore raw

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

I think zstd changelog for 1.5.1 settles the issue:

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

Alex

Quoted 438 lines · Alexander Kanavin via lists.openembedded.org
Quoted 9 lines · 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

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

Quoted 375 lines
Quoted 10 lines · Alexander Kanavin

Drop patches merged upstream.

---
 ...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

Quoted 1 line
 delete mode 100644

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 1 line
 rename meta/recipes-extended/zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb}

(86%)

Quoted 2 lines

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

Quoted 3 lines

deleted file mode 100644
index 3d23648f5b..0000000000
---

a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch line 9

Quoted 11 lines

+++ /dev/null

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -9
@@ -1,81 +0,0 @@
-From 77c7963c7a0f1c455f20520d5c7b1ec9b17a44fb Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-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

]

Quoted 5 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -5
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- programs/Makefile   | 10 +++++-----
- tests/Makefile      |  4 ++--

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -10
- 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)

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 8 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -8
-
--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)

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 6 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -6
--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))

Quoted 4 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -4
- ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC))
- ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o)
-
--ZSTD_CLI_SRC := $(wildcard *.c)

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -10
-+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)

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 8 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -8
- 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

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 5 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -5
- 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

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 3 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -3
-
- decodecorpus : LDLIBS += -lm
- decodecorpus : $(filter-out zstdc_zstd_compress.o, $(ZSTD_OBJECTS))

$(ZDICT_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c decodecorpus.c

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 13 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -13
-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))

Quoted 1 line

diff --git

a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch b/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 5 lines

deleted file mode 100644
index a0e00dca03..0000000000

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 9

Quoted 9 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -9
@@ -1,193 +0,0 @@
-From ab9a34c92eec815ef214470c927ddbe2e950e7e5 Mon Sep 17 00:00:00 2001
-From: Joshua Watt <[email protected]>
-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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 10

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-    targets need to be rebuilt. Without the correct handling, make

would

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 4 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -4
-    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

]

Quoted 21 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -21
-Signed-off-by: Joshua Watt <[email protected]>
----
- 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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -10
-+++ 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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 46

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+allVariants: zstd$(EXT) zstd-compress$(EXT) zstd-decompress$(EXT)

zstd-small$(EXT) zstd-nolegacy$(EXT) zstd-dictBuilder$(EXT)

Quoted 28 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -28
-
- .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)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -10
-       @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 " ")

Quoted 12 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -12
-@@ -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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -10
- 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)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -10
- 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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 117

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--zstd-nolegacy : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD)

$(DEBUGFLAGS_LD)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 3 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -3
--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)

Quoted 15 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -15
-+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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -10
-+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)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 13 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -13
- .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.

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 160

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
--zstd-small: CFLAGS = -Os -s
--zstd-frugal zstd-small: $(ZSTDLIB_CORE_SRC) zstdcli.c util.c timefn.c

fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 161

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^

-o $@$(EXT)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 163

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
-+zstd-small$(EXT): CFLAGS = -Os -s
-+zstd-frugal$(EXT) zstd-small$(EXT): $(ZSTDLIB_CORE_SRC) zstdcli.c

util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 164

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^

-o $@

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 166

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
-
--zstd-decompress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C)

zstdcli.c util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 167

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS

-DZSTD_NOTRACE $^ -o $@$(EXT)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 168

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+zstd-decompress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C)

zstdcli.c util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 169

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS

-DZSTD_NOTRACE $^ -o $@

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 171

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
-
--zstd-compress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c

util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 172

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS

-DZSTD_NOTRACE $^ -o $@$(EXT)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 173

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+zstd-compress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)

zstdcli.c util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 174

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS

-DZSTD_NOTRACE $^ -o $@

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 176

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
-
- ## zstd-dictBuilder: executable supporting dictionary creation and

compression (only)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 177

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--zstd-dictBuilder: CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS

-DZSTD_NOTRACE

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 178

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--zstd-dictBuilder: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)

$(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 180

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
--      $(CC) $(FLAGS) $^ -o $@$(EXT)
-+zstd-dictBuilder$(EXT): CPPFLAGS += -DZSTD_NOBENCH

-DZSTD_NODECOMPRESS -DZSTD_NOTRACE

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 181

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+zstd-dictBuilder$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)

$(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c

Review

Quoted 13 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -12
-+      $(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
-
(quoted diff) +0 -0

b/meta/recipes-extended/zstd/zstd_1.5.2.bb

meta/recipes-extended/zstd/zstd_1.5.2.bb LICENSE = "BSD-3-Clause & GPLv2" · line 9

Quoted 8 lines

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

meta/recipes-extended/zstd/zstd_1.5.2.bb renamed from meta/recipes-extended/zstd/zstd_1.5.0.bb +0 -0
@@ -9,12 +9,9 @@ LICENSE = "BSD-3-Clause & GPLv2"
 LIC_FILES_CHKSUM =

"file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \

Quoted 1 line

file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"

Quoted 2 lines

-SRC_URI = "git://

github.com/facebook/zstd.git;branch=release;protocol=https \

Quoted 1 line

-

file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \

meta/recipes-extended/zstd/zstd_1.5.2.bb LICENSE = "BSD-3-Clause & GPLv2"

Quoted 3 lines
meta/recipes-extended/zstd/zstd_1.5.2.bb renamed from meta/recipes-extended/zstd/zstd_1.5.0.bb +1 -2
-           file://0001-MinGW-Build-Fixes.patch \
-           "
+SRC_URI = "git://

github.com/facebook/zstd.git;branch=release;protocol=https"

Quoted 5 lines
meta/recipes-extended/zstd/zstd_1.5.2.bb renamed from meta/recipes-extended/zstd/zstd_1.5.0.bb +1 -1
-SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6"
+SRCREV = "e47e674cd09583ff0503f0f6defd6d23d8b718d3"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
Quoted 8 lines
Quoted 7 lines

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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#15 lore raw

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

Quoted 4 lines · Alexander Kanavin

I think zstd changelog for 1.5.1 settles the issue:

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

Yeah indeed

thanks

Quoted 448 lines

Alex

Quoted 430 lines · Alexander Kanavin via lists.openembedded.org
Quoted 9 lines · 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

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

Quoted 378 lines
Quoted 10 lines · Alexander Kanavin

Drop patches merged upstream.

---
 ...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

Quoted 1 line
 delete mode 100644

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 1 line
 rename meta/recipes-extended/zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb}

(86%)

Quoted 2 lines

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

Quoted 3 lines

deleted file mode 100644
index 3d23648f5b..0000000000
---

a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch line 9

Quoted 11 lines

+++ /dev/null

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -9
@@ -1,81 +0,0 @@
-From 77c7963c7a0f1c455f20520d5c7b1ec9b17a44fb Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-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]

Quoted 5 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -5
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- programs/Makefile   | 10 +++++-----
- tests/Makefile      |  4 ++--

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -10
- 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)

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 8 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -8
-
--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)

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 6 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -6
--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))

Quoted 4 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -4
- ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC))
- ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o)
-
--ZSTD_CLI_SRC := $(wildcard *.c)

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -10
-+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)

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 8 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -8
- 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

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 5 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -5
- 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

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 3 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -3
-
- decodecorpus : LDLIBS += -lm
- decodecorpus : $(filter-out zstdc_zstd_compress.o, $(ZSTD_OBJECTS))

$(ZDICT_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c decodecorpus.c

meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch

Quoted 13 lines
meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch deleted +0 -13
-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))

Quoted 1 line

diff --git

a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch b/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 5 lines

deleted file mode 100644
index a0e00dca03..0000000000

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 9

Quoted 9 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -9
@@ -1,193 +0,0 @@
-From ab9a34c92eec815ef214470c927ddbe2e950e7e5 Mon Sep 17 00:00:00 2001
-From: Joshua Watt <[email protected]>
-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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 10

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-    targets need to be rebuilt. Without the correct handling, make

would

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 4 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -4
-    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]

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 4 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -4
-Signed-off-by: Joshua Watt <[email protected]>
----
- Makefile          |  1 +
- programs/Makefile | 74

+++++++++++++++++++++++------------------------

Quoted 17 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -17
- 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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -10
-+++ 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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 46

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+allVariants: zstd$(EXT) zstd-compress$(EXT) zstd-decompress$(EXT)

zstd-small$(EXT) zstd-nolegacy$(EXT) zstd-dictBuilder$(EXT)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 7 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -7
-
- .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)

Quoted 21 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -21
-+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)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -10
-       @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 " ")

Quoted 12 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -12
-@@ -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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -10
- 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)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -10
- 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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 117

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--zstd-nolegacy : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD)

$(DEBUGFLAGS_LD)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 3 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -3
--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)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 121

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+zstd-nolegacy$(EXT) : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC)

$(ZSTD_CLI_OBJ)

Quoted 14 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -14
-+      $(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

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 10 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -10
-+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)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch

Quoted 13 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -13
- .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.

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 160

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
--zstd-small: CFLAGS = -Os -s
--zstd-frugal zstd-small: $(ZSTDLIB_CORE_SRC) zstdcli.c util.c

timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 161

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^

-o $@$(EXT)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 163

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
-+zstd-small$(EXT): CFLAGS = -Os -s
-+zstd-frugal$(EXT) zstd-small$(EXT): $(ZSTDLIB_CORE_SRC) zstdcli.c

util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 164

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^

-o $@

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 166

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
-
--zstd-decompress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C)

zstdcli.c util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 167

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS

-DZSTD_NOTRACE $^ -o $@$(EXT)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 168

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+zstd-decompress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C)

zstdcli.c util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 169

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS

-DZSTD_NOTRACE $^ -o $@

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 171

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
-
--zstd-compress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c

util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 172

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT

-DZSTD_NODECOMPRESS -DZSTD_NOTRACE $^ -o $@$(EXT)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 173

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+zstd-compress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)

zstdcli.c util.c timefn.c fileio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 174

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+      $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT

-DZSTD_NODECOMPRESS -DZSTD_NOTRACE $^ -o $@

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 176

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
-
- ## zstd-dictBuilder: executable supporting dictionary creation and

compression (only)

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 177

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--zstd-dictBuilder: CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS

-DZSTD_NOTRACE

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 178

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
--zstd-dictBuilder: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)

$(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 180

Quoted 2 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -2
--      $(CC) $(FLAGS) $^ -o $@$(EXT)
-+zstd-dictBuilder$(EXT): CPPFLAGS += -DZSTD_NOBENCH

-DZSTD_NODECOMPRESS -DZSTD_NOTRACE

meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch line 181

Quoted 1 line
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -1
-+zstd-dictBuilder$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C)

$(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c

Review

Quoted 13 lines
meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted +0 -12
-+      $(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
-
(quoted diff) +0 -0

b/meta/recipes-extended/zstd/zstd_1.5.2.bb

meta/recipes-extended/zstd/zstd_1.5.2.bb LICENSE = "BSD-3-Clause & GPLv2" · line 9

Quoted 8 lines

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

meta/recipes-extended/zstd/zstd_1.5.2.bb renamed from meta/recipes-extended/zstd/zstd_1.5.0.bb +0 -0
@@ -9,12 +9,9 @@ LICENSE = "BSD-3-Clause & GPLv2"
 LIC_FILES_CHKSUM =

"file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \

Quoted 1 line

file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"

Quoted 2 lines

-SRC_URI = "git://

github.com/facebook/zstd.git;branch=release;protocol=https \

Quoted 1 line

-

file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \

meta/recipes-extended/zstd/zstd_1.5.2.bb LICENSE = "BSD-3-Clause & GPLv2"

Quoted 3 lines
meta/recipes-extended/zstd/zstd_1.5.2.bb renamed from meta/recipes-extended/zstd/zstd_1.5.0.bb +1 -2
-           file://0001-MinGW-Build-Fixes.patch \
-           "
+SRC_URI = "git://

github.com/facebook/zstd.git;branch=release;protocol=https"

Quoted 5 lines
meta/recipes-extended/zstd/zstd_1.5.2.bb renamed from meta/recipes-extended/zstd/zstd_1.5.0.bb +1 -1
-SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6"
+SRCREV = "e47e674cd09583ff0503f0f6defd6d23d8b718d3"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
Quoted 8 lines
Quoted 7 lines

CVE_PRODUCT = "zstandard"
--
2.20.1

Quoted 3 lines

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#161053):

Quoted 8 lines

https://lists.openembedded.org/g/openembedded-core/message/161053
Mute This Topic: https://lists.openembedded.org/mt/88718362/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#16 lore raw

PATCH 12/17 rust: update 1.58.0 -> 1.58.1

In reply to Alexander Kanavin
---
 ...-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%)
meta/recipes-devtools/cargo/cargo-cross-canadian_1.58.1.bb renamed from meta/recipes-devtools/cargo/cargo-cross-canadian_1.58.0.bb +0 -0
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
meta/recipes-devtools/cargo/cargo_1.58.1.bb renamed from meta/recipes-devtools/cargo/cargo_1.58.0.bb +0 -0
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
meta/recipes-devtools/rust/libstd-rs_1.58.1.bb renamed from meta/recipes-devtools/rust/libstd-rs_1.58.0.bb +0 -0
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
meta/recipes-devtools/rust/rust-cross-canadian_1.58.1.bb renamed from meta/recipes-devtools/rust/rust-cross-canadian_1.58.0.bb +0 -0
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
meta/recipes-devtools/rust/rust-cross_1.58.1.bb renamed from meta/recipes-devtools/rust/rust-cross_1.58.0.bb +0 -0
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
meta/recipes-devtools/rust/rust-llvm_1.58.1.bb renamed from meta/recipes-devtools/rust/rust-llvm_1.58.0.bb +1 -0
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
@@ -3,3 +3,4 @@
 LLVM_RELEASE = "13.0.0"
 require rust-source.inc
 require rust-llvm.inc
+
meta/recipes-devtools/rust/rust-source.inc +1 -1
index 63ba02b299..92b1535130 100644
@@ -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"
 
meta/recipes-devtools/rust/rust-tools-cross-canadian_1.58.1.bb renamed from meta/recipes-devtools/rust/rust-tools-cross-canadian_1.58.0.bb +0 -0
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
meta/recipes-devtools/rust/rust_1.58.1.bb renamed from meta/recipes-devtools/rust/rust_1.58.0.bb +0 -0
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
Signature · 1 line
2.20.1
#17 lore raw

PATCH 13/17 gdb: update 11.1 -> 11.2

In reply to 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.

---
 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%)
meta/recipes-devtools/gdb/gdb-11.1.inc deleted +0 -19
deleted file mode 100644
index 5364a880e3..0000000000
@@ -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"
meta/recipes-devtools/gdb/gdb-cross-canadian_11.2.bb renamed from meta/recipes-devtools/gdb/gdb-cross-canadian_11.1.bb +1 -1
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
@@ -1,3 +1,3 @@
 require gdb-common.inc
 require gdb-cross-canadian.inc
-require gdb-${PV}.inc
+require gdb.inc
meta/recipes-devtools/gdb/gdb-cross_11.2.bb renamed from meta/recipes-devtools/gdb/gdb-cross_11.1.bb +1 -1
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
@@ -1,2 +1,2 @@
 require gdb-cross.inc
-require gdb-${PV}.inc
+require gdb.inc
meta/recipes-devtools/gdb/gdb.inc +17 -10
index 2c95ed3ca0..cf801b192b 100644
@@ -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"
meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch deleted +0 -317

317 lines not on this page · raw message

meta/recipes-devtools/gdb/gdb_11.2.bb renamed from meta/recipes-devtools/gdb/gdb_11.1.bb +12 -1
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
@@ -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
 }
+
Signature · 1 line
2.20.1
#18 lore raw

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

Quoted 3 lines · 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.

this looks ok.

Quoted 463 lines

Drop upstreamed patch.

---
 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%)
meta/recipes-devtools/gdb/gdb-11.1.inc deleted +0 -19
deleted file mode 100644
index 5364a880e3..0000000000
@@ -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"
meta/recipes-devtools/gdb/gdb-cross-canadian_11.2.bb renamed from meta/recipes-devtools/gdb/gdb-cross-canadian_11.1.bb +1 -1
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
@@ -1,3 +1,3 @@
 require gdb-common.inc
 require gdb-cross-canadian.inc
-require gdb-${PV}.inc
+require gdb.inc
meta/recipes-devtools/gdb/gdb-cross_11.2.bb renamed from meta/recipes-devtools/gdb/gdb-cross_11.1.bb +1 -1
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
@@ -1,2 +1,2 @@
 require gdb-cross.inc
-require gdb-${PV}.inc
+require gdb.inc
meta/recipes-devtools/gdb/gdb.inc +17 -10
index 2c95ed3ca0..cf801b192b 100644
@@ -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"
meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch deleted +0 -317
deleted file mode 100644
index 6fc1859391..0000000000
@@ -1,317 +0,0 @@
-From eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Mon Sep 17 00:00:00 2001
-From: Luis Machado <[email protected]>
-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  <[email protected]>
-
-       PR gdb/28355
-
-       * arch/aarch64.h (struct aarch64_features): New struct.
-
-gdbserver/ChangeLog:
-
-2021-11-03  Luis Machado  <[email protected]>
-
-       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
-
meta/recipes-devtools/gdb/gdb_11.2.bb renamed from meta/recipes-devtools/gdb/gdb_11.1.bb +12 -2
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
@@ -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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#19 lore raw

PATCH 14/17 ltp: update 20210927 -> 20220121

In reply to 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.

---
 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%)
meta/lib/oeqa/utils/logparser.py +12 -15
index 60e16d500e..879aefca33 100644
@@ -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
meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch new file +28 -0
new file mode 100644
index 0000000000..e8d9f212a9
@@ -0,0 +1,28 @@
+From 4aad23f208cc7725cd61bbe5aaadb9994c794cd0 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch deleted +0 -36
deleted file mode 100644
index 1860b95ce9..0000000000
@@ -1,36 +0,0 @@
-From 29a096fe2bd356f419bd8a8404d5b652c996b92f Mon Sep 17 00:00:00 2001
-From: Ralph Siemsen <[email protected]>
-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 <[email protected]>
-Signed-off-by: Li Wang <[email protected]>
-Signed-off-by: Petr Vorel <[email protected]>
-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
-
meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch deleted +0 -37
deleted file mode 100644
index 6fcafaff1c..0000000000
@@ -1,37 +0,0 @@
-From 881709d1e4d1bba5bf8ca365bc058f338bd72dc2 Mon Sep 17 00:00:00 2001
-From: Petr Vorel <[email protected]>
-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 <[email protected]>
-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 <[email protected]> */
-
--#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
-
meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch deleted +0 -58

58 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch deleted +0 -60

60 lines not on this page · raw message

meta/recipes-extended/ltp/ltp_20220121.bb renamed from meta/recipes-extended/ltp/ltp_20210927.bb +6 -5
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
@@ -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
Signature · 1 line
2.20.1
Reviewed-by on v1 14/17
#20 lore raw

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

Hi Alexander,

Quoted 4 lines

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.

to the update part only.

meta/recipes-extended/ltp/ltp_20220121.bb EXTRA_OECONF = " --with-realtime-testsuite --with-open-posix-testsuite " · line 49

Quoted 3 lines
meta/recipes-extended/ltp/ltp_20220121.bb renamed from meta/recipes-extended/ltp/ltp_20210927.bb +3 -0
+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

#21 lore raw

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

Quoted 10 lines · Petr Vorel

Hi Alexander,

Quoted 4 lines

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

#22 lore raw

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

Quoted 9 lines · Petr Vorel
Quoted 7 lines

Hi Alexander,

Quoted 4 lines

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.

Quoted 6 lines
Quoted 2 lines

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

Quoted 1 line

Alex

#23 lore raw

PATCH 15/17 gnutls: update 3.7.2 -> 3.7.3

In reply to Alexander Kanavin

Drop unsupported option.

---
 .../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%)
meta/recipes-support/gnutls/gnutls_3.7.3.bb renamed from meta/recipes-support/gnutls/gnutls_3.7.2.bb +1 -2
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
@@ -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} \
Signature · 1 line
2.20.1
#24 lore raw

PATCH 16/17 libusb1: correct SRC_URI

In reply to Alexander Kanavin
---
 meta/recipes-support/libusb/libusb1_1.0.24.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-support/libusb/libusb1_1.0.24.bb +4 -2
index 95a20958a1..e70021f4f7 100644
@@ -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}"
Signature · 1 line
2.20.1
#25 lore raw

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

In reply to 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.

---
 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
meta/classes/gobject-introspection.bbclass +1 -1
index 4db1b362d9..7bf9feb0d6 100644
@@ -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.
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch deleted +0 -28
deleted file mode 100644
index b484b5e9e6..0000000000
@@ -1,28 +0,0 @@
-From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-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 <[email protected]>
-
----
- 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")
- 
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb +2 -12
index d4ee03d33c..4f72a33bfa 100644
@@ -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
 
Signature · 1 line
2.20.1
#26 lore raw

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

Quoted 7 lines · 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.

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

Quoted 113 lines
---
 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
meta/classes/gobject-introspection.bbclass +1 -1
index 4db1b362d9..7bf9feb0d6 100644
@@ -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.
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch deleted +0 -28
deleted file mode 100644
index b484b5e9e6..0000000000
@@ -1,28 +0,0 @@
-From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-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 <[email protected]>
-
----
- 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")
-
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb +2 -13
index d4ee03d33c..4f72a33bfa 100644
@@ -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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#27 lore raw

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

Quoted 10 lines · Khem Raj
Quoted 7 lines · 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.

Quoted 3 lines

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

Quoted 144 lines
Quoted 8 lines
---
 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

Review

Quoted 2 lines
(quoted diff) +0 -0

b/meta/classes/gobject-introspection.bbclass

meta/classes/gobject-introspection.bbclass EXTRA_OEMESON:prepend:class-nativesdk = "${@['',

Quoted 4 lines

index 4db1b362d9..7bf9feb0d6 100644

meta/classes/gobject-introspection.bbclass +0 -0
@@ -29,7 +29,7 @@ EXTRA_OEMESON:prepend:class-nativesdk = "${@['',

'${GIRMESONBUILD}'][d.getVar('G

meta/classes/gobject-introspection.bbclass EXTRA_OEMESON:prepend:class-nativesdk = "${@['', · line 29

Quoted 2 lines
meta/classes/gobject-introspection.bbclass +0 -0
 # Generating introspection data depends on a combination of native and

target

meta/classes/gobject-introspection.bbclass EXTRA_OEMESON:prepend:class-nativesdk = "${@['', · line 31

Quoted 2 lines
meta/classes/gobject-introspection.bbclass +0 -1
 # introspection tools, and qemu to run the target tools.
-DEPENDS:append:class-target = " gobject-introspection

gobject-introspection-native qemu-native prelink-native"

meta/classes/gobject-introspection.bbclass EXTRA_OEMESON:prepend:class-nativesdk = "${@['', · line 31

Quoted 1 line
meta/classes/gobject-introspection.bbclass +1 -0
+DEPENDS:append:class-target = " gobject-introspection

gobject-introspection-native qemu-native"

meta/classes/gobject-introspection.bbclass EXTRA_OEMESON:prepend:class-nativesdk = "${@['', · line 32

Quoted 2 lines
meta/classes/gobject-introspection.bbclass +0 -0
 # Even though introspection is disabled on -native,

gobject-introspection package is still

Quoted 2 lines
meta/classes/gobject-introspection.bbclass +0 -0
 # 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

Quoted 3 lines

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

meta/classes/gobject-introspection.bbclass line 6

Quoted 8 lines

+++ /dev/null

meta/classes/gobject-introspection.bbclass +0 -6
@@ -1,28 +0,0 @@
-From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-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.

Quoted 4 lines
meta/classes/gobject-introspection.bbclass +0 -4
-It is not an error per se, but it breaks subprocess.check_output().
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <[email protected]>

meta/classes/gobject-introspection.bbclass line 20

Quoted 10 lines
meta/classes/gobject-introspection.bbclass +0 -10
-
----
- 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):

meta/classes/gobject-introspection.bbclass line 25

Quoted 5 lines
meta/classes/gobject-introspection.bbclass +0 -5
-             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

Review

Quoted 4 lines
meta/classes/gobject-introspection.bbclass +0 -3
-         if isinstance(output, bytes):
-             output = output.decode("utf-8", "replace")
-
(quoted diff) +0 -0

gobject-introspection_1.70.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb

Quoted 2 lines

index d4ee03d33c..4f72a33bfa 100644
--- a/meta/recipes-gnome/gobject-introspection/

gobject-introspection_1.70.0.bb

Quoted 1 line

+++ b/meta/recipes-gnome/gobject-introspection/

gobject-introspection_1.70.0.bb

Review LIC_FILES_CHKSUM =

Quoted 1 line
(quoted diff) +0 -0
@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM =

"file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \

Review LIC_FILES_CHKSUM = · line 16

Quoted 3 lines
(quoted diff) +0 -0
                     "
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}",

2)}/${BPN}-${PV}.tar.xz \

Review LIC_FILES_CHKSUM = · line 17

Quoted 1 line
(quoted diff) +0 -1
-

file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \

meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb DEPENDS += " libffi zlib glib-2.0 python3 flex-native

Quoted 4 lines
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb +0 -0
            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

Review DEPENDS += " libffi zlib glib-2.0 python3 flex-native · line 32

Quoted 1 line
(quoted diff) +0 -0
 # target build needs qemu to run temporary introspection binaries

created

meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-arch

Quoted 3 lines
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb +0 -1
 # 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

Review DEPENDS += " libffi zlib glib-2.0 python3 flex-native · line 38

Quoted 2 lines
(quoted diff) +0 -2
-# (standard ldd doesn't work when cross-compiling).
-DEPENDS:append:class-target = " gobject-introspection-native

qemu-native prelink-native"

Review DEPENDS += " libffi zlib glib-2.0 python3 flex-native · line 35

Quoted 1 line
(quoted diff) +1 -0
+DEPENDS:append:class-target = " gobject-introspection-native

qemu-native"

Quoted 6 lines
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb +0 -0
 # 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 ''} \
 "

meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb EXTRA_OEMESON:class-target = " \ · line 56

Quoted 10 lines
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb +0 -7
 
-# 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

Review EXTRA_OEMESON:class-target = " \ · line 57

Quoted 1 line
(quoted diff) +0 -0
         # full path of native python binary (the solution is taken from

glib-2.0 recipe)

Quoted 13 lines
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb +1 -2
@@ -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

Quoted 3 lines

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#161039):

https://lists.openembedded.org/g/openembedded-core/message/161039

Quoted 3 lines

Mute This Topic: https://lists.openembedded.org/mt/88718372/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [

[email protected]]

Quoted 2 lines

-=-=-=-=-=-=-=-=-=-=-=-