From 09e4ebfa59f18da0e9cd12cb7d623f71b3ee1d08 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 25 Nov 2025 13:46:12 +0000 Subject: [PATCH] grub/glibc: Bump versions to resolve hashequiv/reproducibility issues After the gawk dependency change, we need to change PR/hashequiv version to replace the corrupted sstate/hashequiv data. (From OE-Core rev: a455b21f9170b3f2d74763b5bf99625dbda81ff9) Signed-off-by: Richard Purdie (cherry picked from commit f0f7632595792a73ea0a935b924e8bdf9954ec7b) Signed-off-by: Yoann Congal Signed-off-by: Paul Barker --- meta/recipes-bsp/grub/grub2.inc | 4 ++++ meta/recipes-core/glibc/glibc.inc | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index a2173bee04..dfc87eaa94 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc @@ -44,6 +44,10 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ file://CVE-2025-61663_61664.patch \ " +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" + SRC_URI[sha256sum] = "b30919fa5be280417c17ac561bb1650f60cfb80cc6237fa1e2b6f56154cb9c91" CVE_STATUS[CVE-2019-14865] = "not-applicable-platform: applies only to RHEL" diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 60e3daaf32..a3d0bb4071 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -3,6 +3,10 @@ require glibc-ld.inc DEPENDS = "virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}binutils libgcc-initial linux-libc-headers gawk-replacement-native" +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" + PROVIDES = "virtual/libc" PROVIDES += "virtual/libintl virtual/libiconv" inherit autotools texinfo systemd