Skip to contentSkip to conversation

Upgrade 4 recipes

PATCH New [email protected] 1 participant 5 messages Nov 17, 2025

lore
Share & tools
lore
#0 lore raw

cover Upgrade 4 recipes

From: Robert Yang <[email protected]>

The following changes since commit e7dc42e30c76bf0fbb4d3cc019bbec675bac55fa:

oe-build-perf-report: relax metadata matching rules (2025-11-16 23:44:30 +0000)

are available in the Git repository at:

https://github.com/robertlinux/yocto rbt/pu
https://github.com/robertlinux/yocto/tree/rbt/pu

Robert Yang (4):
squashfs-tools: 4.7.2 -> 4.7.4
fmt: 11.2.0 -> 12.1.0
git: 2.51.0 -> 2.51.2
ccache: 4.12 -> 4.12.1

 .../{ccache_4.12.bb => ccache_4.12.1.bb}      |  2 +-
 ...compilation-on-clang-21-libc-21-4477.patch | 46 -------------------
 ...01-Workaround-an-ABI-issue-in-spdlog.patch |  8 ++--
 .../fmt/{fmt_11.2.0.bb => fmt_12.1.0.bb}      |  5 +-
 ...-do-not-force-RHEL-7-specific-build-.patch |  4 +-
 meta/recipes-devtools/git/git/fixsort.patch   |  2 +-
 .../git/{git_2.51.0.bb => git_2.51.2.bb}      |  2 +-
 ...tools_4.7.2.bb => squashfs-tools_4.7.4.bb} |  2 +-
 8 files changed, 12 insertions(+), 59 deletions(-)
 rename meta/recipes-devtools/ccache/{ccache_4.12.bb => ccache_4.12.1.bb} (93%)
 delete mode 100644 meta/recipes-devtools/fmt/fmt/0001-Fix-compilation-on-clang-21-libc-21-4477.patch
 rename meta/recipes-devtools/fmt/{fmt_11.2.0.bb => fmt_12.1.0.bb} (84%)
 rename meta/recipes-devtools/git/{git_2.51.0.bb => git_2.51.2.bb} (98%)
 rename meta/recipes-devtools/squashfs-tools/{squashfs-tools_4.7.2.bb => squashfs-tools_4.7.4.bb} (96%)
Signature · 1 line
2.49.0
#1 lore raw

PATCH 1/4 squashfs-tools: 4.7.2 -> 4.7.4

From: Robert Yang <[email protected]>

---
 .../{squashfs-tools_4.7.2.bb => squashfs-tools_4.7.4.bb}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/squashfs-tools/{squashfs-tools_4.7.2.bb => squashfs-tools_4.7.4.bb} (96%)
meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.4.bb renamed from meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.2.bb +1 -1
similarity index 96%
rename from meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.2.bb
rename to meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.4.bb
index 8bca98f419..eb3974bcb5 100644
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=master;tag=${PV}"
-SRCREV = "99d23a31b471433c51e9c145aeba2ab1536e34df"
+SRCREV = "bad1d213ab6df587d6fa0ef7286180fbf7b86167"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
Signature · 1 line
2.49.0
#2 lore raw

PATCH 2/4 fmt: 11.2.0 -> 12.1.0

In reply to [email protected]

From: Robert Yang <[email protected]>

* Remove backport patch 0001-Fix-compilation-on-cl
* Refresh 0001-Workaround-an-ABI-issue-in-spdlog.patch

---
 ...compilation-on-clang-21-libc-21-4477.patch | 46 -------------------
 ...01-Workaround-an-ABI-issue-in-spdlog.patch |  8 ++--
 .../fmt/{fmt_11.2.0.bb => fmt_12.1.0.bb}      |  5 +-
 3 files changed, 6 insertions(+), 53 deletions(-)
 delete mode 100644 meta/recipes-devtools/fmt/fmt/0001-Fix-compilation-on-clang-21-libc-21-4477.patch
 rename meta/recipes-devtools/fmt/{fmt_11.2.0.bb => fmt_12.1.0.bb} (84%)
meta/recipes-devtools/fmt/fmt/0001-Fix-compilation-on-clang-21-libc-21-4477.patch deleted +0 -46
deleted file mode 100644
index 911fa90a40..0000000000
@@ -1,46 +0,0 @@
-From f4345467fce7edbc6b36c3fa1cf197a67be617e2 Mon Sep 17 00:00:00 2001
-From: Remy Jette <[email protected]>
-Date: Sat, 21 Jun 2025 07:28:14 -0700
-Subject: [PATCH] Fix compilation on clang-21 / libc++-21 (#4477)
-
-`<cstdlib>` was not being included, so malloc and free were only declared
-via transitive includes. Some includes changed in the latest libc++-21
-build which broke fmt.
-
-Also changed `malloc`/`free` to `std::malloc` and `std::free`, as
-putting those symbols in the global namespace is optional for the
-implementation when including `<cstdlib>`.
-
-Upstream-Status: Backport [https://github.com/fmtlib/fmt/pull/4477]
-Signed-off-by: Khem Raj <[email protected]>
----
- include/fmt/format.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: fmt-11.2.0/include/fmt/format.h
-===================================================================
---- fmt-11.2.0.orig/include/fmt/format.h
-+++ fmt-11.2.0/include/fmt/format.h
-@@ -44,6 +44,7 @@
- #  include <cmath>    // std::signbit
- #  include <cstddef>  // std::byte
- #  include <cstdint>  // uint32_t
-+#  include <cstdlib>  // std::malloc, std::free
- #  include <cstring>  // std::memcpy
- #  include <limits>   // std::numeric_limits
- #  include <new>      // std::bad_alloc
-@@ -744,12 +745,12 @@ template <typename T> struct allocator {
- 
-   T* allocate(size_t n) {
-     FMT_ASSERT(n <= max_value<size_t>() / sizeof(T), "");
--    T* p = static_cast<T*>(malloc(n * sizeof(T)));
-+    T* p = static_cast<T*>(std::malloc(n * sizeof(T)));
-     if (!p) FMT_THROW(std::bad_alloc());
-     return p;
-   }
- 
--  void deallocate(T* p, size_t) { free(p); }
-+  void deallocate(T* p, size_t) { std::free(p); }
- };
- 
- }  // namespace detail
meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch +4 -4
index 3fe85d51ee..442506f834 100644
@@ -1,4 +1,4 @@
-From 5a5637c306c617ddb3726c76d3f7490a2dc0a5cd Mon Sep 17 00:00:00 2001
+From 32f4a4a634c99d4e00cc6149786a9180ad651f76 Mon Sep 17 00:00:00 2001
 From: Victor Zverovich <[email protected]>
 Date: Sat, 22 Mar 2025 06:57:04 -0700
 Subject: [PATCH] Workaround an ABI issue in spdlog
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/include/fmt/format.h b/include/fmt/format.h
-index 287e7163..61cb2825 100644
+index 4a653007..82f80efd 100644
 --- a/include/fmt/format.h
 +++ b/include/fmt/format.h
-@@ -774,7 +774,9 @@ enum { inline_buffer_size = 500 };
+@@ -793,7 +793,9 @@ enum { inline_buffer_size = 500 };
   * converted to `std::string` with `to_string(out)`.
   */
  template <typename T, size_t SIZE = inline_buffer_size,
@@ -24,7 +24,7 @@ index 287e7163..61cb2825 100644
  class basic_memory_buffer : public detail::buffer<T> {
   private:
    T store_[SIZE];
-@@ -2594,7 +2596,7 @@ class bigint {
+@@ -2746,7 +2748,7 @@ class bigint {
    }
  
   public:
meta/recipes-devtools/fmt/fmt_12.1.0.bb renamed from meta/recipes-devtools/fmt/fmt_11.2.0.bb +2 -3
similarity index 84%
rename from meta/recipes-devtools/fmt/fmt_11.2.0.bb
rename to meta/recipes-devtools/fmt/fmt_12.1.0.bb
index 133e1ae77d..22cab6f138 100644
@@ -4,12 +4,11 @@ HOMEPAGE = "https://fmt.dev"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729"
 
-SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https;tag=${PV}\
+SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https;tag=${PV} \
            file://0001-Workaround-an-ABI-issue-in-spdlog.patch \
-           file://0001-Fix-compilation-on-clang-21-libc-21-4477.patch \
            file://run-ptest \
            "
-SRCREV = "40626af88bd7df9a5fb80be7b25ac85b122d6c21"
+SRCREV = "407c905e45ad75fc29bf0f9bb7c5c2fd3475976f"
 
 inherit cmake ptest
 
Signature · 1 line
2.49.0
#3 lore raw

PATCH 3/4 git: 2.51.0 -> 2.51.2

In reply to [email protected]

From: Robert Yang <[email protected]>

---
 ...config.mak.uname-do-not-force-RHEL-7-specific-build-.patch | 4 ++--
 meta/recipes-devtools/git/git/fixsort.patch                   | 2 +-
 meta/recipes-devtools/git/{git_2.51.0.bb => git_2.51.2.bb}    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/git/{git_2.51.0.bb => git_2.51.2.bb} (98%)
meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch +2 -2
index 61bf0e12dc..f55282fcca 100644
@@ -1,4 +1,4 @@
-From 325c30dac4eafdd463c8ffcfe1215858d642ab91 Mon Sep 17 00:00:00 2001
+From e8aebf375140b67fb48baea10af2ac0088fe6768 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 7 Feb 2022 10:13:15 +0100
 Subject: [PATCH] config.mak.uname: do not force RHEL-7 specific build settings
@@ -17,7 +17,7 @@ Signed-off-by: Robert Yang <[email protected]>
  1 file changed, 4 deletions(-)
 
 diff --git a/config.mak.uname b/config.mak.uname
-index b12d4e1..b5b8d82 100644
+index 1691c6a..00d0f93 100644
 --- a/config.mak.uname
 +++ b/config.mak.uname
 @@ -63,10 +63,6 @@ ifeq ($(uname_S),Linux)
meta/recipes-devtools/git/git/fixsort.patch +1 -1
index 7066e1808d..8c60bd5c21 100644
@@ -1,4 +1,4 @@
-From 65fa5c0f849fe4a1e3cb8e6af0086ef0748c28de Mon Sep 17 00:00:00 2001
+From 7b509d1e3f9acbbe0c35ef62f54cfa2ed8f9a740 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <[email protected]>
 Date: Wed, 17 Feb 2021 17:57:13 +0000
 Subject: [PATCH] generate-configlist.sh: Fix determinism issue
meta/recipes-devtools/git/git_2.51.2.bb renamed from meta/recipes-devtools/git/git_2.51.0.bb +1 -1
similarity index 98%
rename from meta/recipes-devtools/git/git_2.51.0.bb
rename to meta/recipes-devtools/git/git_2.51.2.bb
index aeb8c54aa0..14d5a3d60e 100644
@@ -170,4 +170,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
                  "
 EXTRA_OEMAKE += "NO_GETTEXT=1"
 
-SRC_URI[tarball.sha256sum] = "3d531799d2cf2cac8e294ec6e3229e07bfca60dc6c783fe69e7712738bef7283"
+SRC_URI[tarball.sha256sum] = "9b44c2b337ec838e10aad42439d390963904449710d30c9e7e4ba449f45da98f"
Signature · 1 line
2.49.0
#4 lore raw

PATCH 4/4 ccache: 4.12 -> 4.12.1

In reply to [email protected]

From: Robert Yang <[email protected]>

---
 .../ccache/{ccache_4.12.bb => ccache_4.12.1.bb}                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/ccache/{ccache_4.12.bb => ccache_4.12.1.bb} (93%)
meta/recipes-devtools/ccache/ccache_4.12.1.bb renamed from meta/recipes-devtools/ccache/ccache_4.12.bb +1 -1
similarity index 93%
rename from meta/recipes-devtools/ccache/ccache_4.12.bb
rename to meta/recipes-devtools/ccache/ccache_4.12.1.bb
index 52643c4bff..2d0b83e244 100644
@@ -17,7 +17,7 @@ DEPENDS = "zstd fmt xxhash"
 
 SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz"
 
-SRC_URI[sha256sum] = "e884c62cbacae2e9488b8641a671a79fb7a1221db01310dacef61c9e55c2e55b"
+SRC_URI[sha256sum] = "a3da50ab0fb0d42f60c17d1450312e6ace9b681f6221cb77c8a09a845f9d760c"
 
 inherit cmake github-releases
 
Signature · 1 line
2.49.0