[oe] [meta-oe] [PATCH 1/4] flashrom: upgrade 1.4.0 -> 1.5.1

[oe] [meta-oe] [PATCH 1/4] flashrom: upgrade 1.4.0 -> 1.5.1

[wangmy]

From: Wang Mingyu <wangmy@fujitsu.com>

0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch
since it's not available in 1.5.1

0001-linux_mtd-fix-build-with-clang-19.patch
removed since it's included in 1.5.1

0002-meson-Add-options-pciutils-ftdi-usb.patch
refreshed for 1.5.1

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...SCV-as-non-memory-mapped-I-O-archite.patch | 30 --------------
 ...01-linux_mtd-fix-build-with-clang-19.patch | 39 -------------------
 ...-meson-Add-options-pciutils-ftdi-usb.patch | 13 ++++---
 .../{flashrom_1.4.0.bb => flashrom_1.5.1.bb}  |  4 +-
 4 files changed, 8 insertions(+), 78 deletions(-)
 delete mode 100644 meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch
 delete mode 100644 meta-oe/recipes-bsp/flashrom/flashrom/0001-linux_mtd-fix-build-with-clang-19.patch
 rename meta-oe/recipes-bsp/flashrom/{flashrom_1.4.0.bb => flashrom_1.5.1.bb} (75%)

diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch
deleted file mode 100644
index 58f1aa4d43..0000000000
--- a/meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From bf5a30ef30818973eb2cfac792b80c642df8a721 Mon Sep 17 00:00:00 2001
-From: Patrick Rudolph <patrick.rudolph@9elements.com>
-Date: Mon, 14 Oct 2024 11:01:37 +0200
-Subject: [oe] [meta-oe] [PATCH 1/2] flashrom: Mark RISCV as non memory-mapped I/O
- architecture
-
-Upstream-Status: Inactive-Upstream
-
-Change-Id: I46d7ede7af61e7fca631e1d465100e65c6ddeee9
-Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 97f56b83..08e4c595 100644
---- a/Makefile
-+++ b/Makefile
-@@ -372,7 +372,7 @@ endif
- # Additionally disable all drivers needing raw access (memory, PCI, port I/O)
- # on architectures with unknown raw access properties.
- # Right now those architectures are alpha hppa m68k sh s390
--ifneq ($(ARCH), $(filter $(ARCH), x86 mips ppc arm sparc arc e2k))
-+ifneq ($(ARCH), $(filter $(ARCH), x86 mips ppc arm sparc arc e2k riscv))
- $(call mark_unsupported,$(DEPENDS_ON_RAW_MEM_ACCESS))
- endif
- 
--- 
-2.46.2
-
diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-linux_mtd-fix-build-with-clang-19.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-linux_mtd-fix-build-with-clang-19.patch
deleted file mode 100644
index 46bd0bba44..0000000000
--- a/meta-oe/recipes-bsp/flashrom/flashrom/0001-linux_mtd-fix-build-with-clang-19.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 615fae91dafdb89f0f8418129918dbb7ff879cf6 Mon Sep 17 00:00:00 2001
-From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
-Date: Thu, 24 Oct 2024 17:51:29 +0200
-Subject: [PATCH] linux_mtd: fix build with clang >= 19
-
-Starting with version 19, clang issues a warning when using `strlen()`
-for initializing a static array's size. This causes the build to fail as
-the project also sets `-Werror`.
-
-This is fixed by using `sizeof()` instead, which is guaranteed to be
-evaluated at compilation time and therefore not triggering the
-problematic warning.
-
-Upstream-Status: Backport [https://github.com/flashrom/flashrom/commit/34b1a6aa57e910c0b5a518e8a0cab6841c7efaee]
-
-Change-Id: If470a65702e9ae08e4303123a0014e53a1fee56e
-Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
-Reviewed-on: https://review.coreboot.org/c/flashrom/+/84856
-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-Reviewed-by: Maximilian Brune <maximilian.brune@9elements.com>
-Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- linux_mtd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linux_mtd.c b/linux_mtd.c
-index eea0cf2..0cb2330 100644
---- a/linux_mtd.c
-+++ b/linux_mtd.c
-@@ -49,7 +49,7 @@ static int read_sysfs_string(const char *sysfs_path, const char *filename, char
- 	int i;
- 	size_t bytes_read;
- 	FILE *fp;
--	char path[strlen(LINUX_MTD_SYSFS_ROOT) + 32];
-+	char path[sizeof(LINUX_MTD_SYSFS_ROOT) + 31];
- 
- 	snprintf(path, sizeof(path), "%s/%s", sysfs_path, filename);
- 
diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch
index bc43f17e9a..8dfed855b4 100644
--- a/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch
+++ b/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch
@@ -16,10 +16,10 @@ Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
  2 files changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index ae56b26c..21093a7f 100644
+index 6c8d3d3..61b794d 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -151,9 +151,9 @@ systems_serial     = [ 'linux', 'openbsd', 'freebsd', 'dragonfly', 'netbsd', 'da
+@@ -150,9 +150,9 @@ systems_serial     = [ 'linux', 'openbsd', 'freebsd', 'dragonfly', 'netbsd', 'da
  
  cpus_port_io = [ 'x86', 'x86_64' ]
  
@@ -33,16 +33,17 @@ index ae56b26c..21093a7f 100644
  group_serial = get_option('programmer').contains('group_serial')
  group_jlink  = get_option('programmer').contains('group_jlink')
 diff --git a/meson_options.txt b/meson_options.txt
-index 8a04114d..ae722509 100644
+index 87456a9..570b152 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -25,3 +25,6 @@ option('ni845x_search_path', type : 'string', value : 'C:\Program Files (x86)\Na
- option('delay_minimum_sleep_us', type : 'integer', min : 0, value : 100000,
+@@ -24,4 +24,7 @@ option('ni845x_search_path', type : 'string', value : 'C:\Program Files (x86)\Na
+ option('delay_minimum_sleep_us', type : 'integer', min : 0, value : 100,
         description : 'Minimum time in microseconds to suspend execution for (rather than polling) when a delay is required.'
                     + ' Larger values may perform better on machines with low timer resolution, at the cost of increased power.')
 +option('pciutils', type : 'boolean', value : false, description : 'Select programmer group pci')
 +option('usb', type : 'boolean', value : false, description : 'Select programmer group usb')
 +option('ftdi', type : 'boolean', value : false, description : 'Select programmer group ftdi')
+ option('rpmc', type : 'feature', value : 'auto', description : 'Support for Replay Protected Monotonic Counter (RPMC) commands as specified by JESD260')
 -- 
-2.46.2
+2.43.0
 
diff --git a/meta-oe/recipes-bsp/flashrom/flashrom_1.4.0.bb b/meta-oe/recipes-bsp/flashrom/flashrom_1.5.1.bb
similarity index 75%
rename from meta-oe/recipes-bsp/flashrom/flashrom_1.4.0.bb
rename to meta-oe/recipes-bsp/flashrom/flashrom_1.5.1.bb
index 6c5d05f2d0..9a8e81bae3 100644
--- a/meta-oe/recipes-bsp/flashrom/flashrom_1.4.0.bb
+++ b/meta-oe/recipes-bsp/flashrom/flashrom_1.5.1.bb
@@ -4,12 +4,10 @@ HOMEPAGE = "http://flashrom.org"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.xz \
-           file://0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch \
            file://0002-meson-Add-options-pciutils-ftdi-usb.patch \
-           file://0001-linux_mtd-fix-build-with-clang-19.patch \
            "
 
-SRC_URI[sha256sum] = "eb0eb3e61a57fd1926c66f08664cf04a96f92cee23b600cf563087c2178d70d8"
+SRC_URI[sha256sum] = "1f934b076ed49eace203655ec249fc7861a6b8e87fe4aef732e47b6e485b6293"
 
 S = "${WORKDIR}/flashrom-v${PV}"
 
-- 
2.43.0

[oe] [meta-gnome] [PATCH 2/4] gjs: upgrade 1.82.1 -> 1.84.1

[wangmy]

From: Wang Mingyu <wangmy@fujitsu.com>

0001-Support-cross-builds-a-bit-better.patch
0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch
refreshed for 1.84.1

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../gjs/0001-Support-cross-builds-a-bit-better.patch  | 10 +++++-----
 ...ild-Do-not-add-dir-installed-tests-when-inst.patch | 11 +++++------
 .../gjs/{gjs_1.82.1.bb => gjs_1.84.1.bb}              |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)
 rename meta-gnome/recipes-gnome/gjs/{gjs_1.82.1.bb => gjs_1.84.1.bb} (94%)

diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch b/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch
index c66d42da62..ab3b85b606 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch
+++ b/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch
@@ -1,4 +1,4 @@
-From 8e7a25b0171eb60c802168593355354dff7806f5 Mon Sep 17 00:00:00 2001
+From b6996f3683f0a1428657636c372ef7af8d0b43ff Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Wed, 27 Oct 2021 20:18:47 +0200
 Subject: [PATCH] Support cross builds a bit better
@@ -17,7 +17,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index f3081fc..ac958d3 100644
+index a969ce2..1885afc 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -252,6 +252,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with
@@ -34,9 +34,9 @@ index f3081fc..ac958d3 100644
  endif
 +endif # not meson.is_cross_build()
  
- have_printf_alternative_int = cc.compiles('''
- #include <stdio.h>
-@@ -656,7 +658,7 @@ subdir('installed-tests')
+ ### Check for external programs ################################################
+ 
+@@ -651,7 +653,7 @@ subdir('installed-tests')
  
  # Note: The test program in test/ needs to be ported
  #       to Windows before we can build it on Windows.
diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch
index bca27c33d4..9558ad75e2 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch
+++ b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch
@@ -1,13 +1,12 @@
-From 6a70d3ac658988dda49d51ed8b46584b716a9c7c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+From d0424474da5d6b6a3360d081886c289852242378 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller=20installed=5Ftests=20is=20false?=
+ <schnitzeltony@gmail.com>
 Date: Wed, 27 Oct 2021 20:04:02 +0200
 Subject: [PATCH] meson.build: Do not add dir installed-tests when
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-From: =?UTF-8?q?Andreas=20M=C3=BCller=20installed=5Ftests=20is=20false?=
- <schnitzeltony@gmail.com>
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -24,10 +23,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index ac958d3..e773508 100644
+index 1885afc..6333c06 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -654,7 +654,9 @@ gi_tests = subproject('gobject-introspection-tests',
+@@ -649,7 +649,9 @@ gi_tests = subproject('gobject-introspection-tests',
      default_options: ['werror=false', 'cairo=true',
          'install_dir=@0@'.format(installed_tests_execdir)])
  
diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb
similarity index 94%
rename from meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb
rename to meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb
index fd4e9c6f8a..55bd38c97c 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb
+++ b/meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "mozjs-128 cairo"
 
 inherit gnomebase gobject-introspection gettext features_check upstream-version-is-even pkgconfig multilib_script
 
-SRC_URI[archive.sha256sum] = "fb39aa5636576de0e5a1171f56a1a5825e2bd1a69972fb120ba78bd109b5693c"
+SRC_URI[archive.sha256sum] = "44796b91318dbbe221a13909f00fd872ef92f38c68603e0e3574e46bc6bac32c"
 SRC_URI += " \
     file://0001-Support-cross-builds-a-bit-better.patch \
     file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \
-- 
2.43.0

[oe] [meta-gnome] [PATCH 3/4] gnome-backgrounds: upgrade 47.0 -> 48.0

[wangmy]

From: Wang Mingyu <wangmy@fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../{gnome-backgrounds_47.0.bb => gnome-backgrounds_48.0.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/gnome-backgrounds/{gnome-backgrounds_47.0.bb => gnome-backgrounds_48.0.bb} (76%)

diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_47.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_48.0.bb
similarity index 76%
rename from meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_47.0.bb
rename to meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_48.0.bb
index 8774750e95..d144cd0639 100644
--- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_47.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_48.0.bb
@@ -6,7 +6,7 @@ SECTION = "x11/gnome"
 
 inherit gnomebase gettext allarch
 
-SRC_URI[archive.sha256sum] = "874a4a39c4261736f6a854722833400b612441c4681aa5982d90b15abc9c91fd"
+SRC_URI[archive.sha256sum] = "2d6baa011ee97804c7561f7e1cbd8d4763e30b55b8818dda78f9f75afb8d8d05"
 
 FILES:${PN} += " \
     ${datadir}/backgrounds \
-- 
2.43.0

[oe] [meta-gnome] [PATCH 4/4] gnome-chess: upgrade 47.0 -> 48.0

[wangmy]

From: Wang Mingyu <wangmy@fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../gnome-chess/{gnome-chess_47.0.bb => gnome-chess_48.0.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/gnome-chess/{gnome-chess_47.0.bb => gnome-chess_48.0.bb} (94%)

diff --git a/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_47.0.bb b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_48.0.bb
similarity index 94%
rename from meta-gnome/recipes-gnome/gnome-chess/gnome-chess_47.0.bb
rename to meta-gnome/recipes-gnome/gnome-chess/gnome-chess_48.0.bb
index 47c412d75e..0e41626e6d 100644
--- a/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_47.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_48.0.bb
@@ -29,6 +29,6 @@ inherit meson pkgconfig gobject-introspection gtk-icon-cache vala features_check
 GIR_MESON_OPTION = ""
 
 S = "${WORKDIR}/git"
-SRCREV = "91476257c2404945bfa30238c38391343bf4737b"
+SRCREV = "b0bf5288438f74fcb455e1e49f855b4964a2c7cb"
 
 FILES:${PN} += "${datadir}"
-- 
2.43.0

Re: [oe] [meta-oe] [PATCH 1/4] flashrom: upgrade 1.4.0 -> 1.5.1

[Khem Raj]

Can you rebase this patch on top of master-next and resend ?

On Thu, Mar 20, 2025 at 8:39 PM wangmy via lists.openembedded.org
<wangmy=fujitsu.com@lists.openembedded.org> wrote:
>
> From: Wang Mingyu <wangmy@fujitsu.com>
>
> 0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch
> since it's not available in 1.5.1
>
> 0001-linux_mtd-fix-build-with-clang-19.patch
> removed since it's included in 1.5.1
>
> 0002-meson-Add-options-pciutils-ftdi-usb.patch
> refreshed for 1.5.1
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  ...SCV-as-non-memory-mapped-I-O-archite.patch | 30 --------------
>  ...01-linux_mtd-fix-build-with-clang-19.patch | 39 -------------------
>  ...-meson-Add-options-pciutils-ftdi-usb.patch | 13 ++++---
>  .../{flashrom_1.4.0.bb => flashrom_1.5.1.bb}  |  4 +-
>  4 files changed, 8 insertions(+), 78 deletions(-)
>  delete mode 100644 meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch
>  delete mode 100644 meta-oe/recipes-bsp/flashrom/flashrom/0001-linux_mtd-fix-build-with-clang-19.patch
>  rename meta-oe/recipes-bsp/flashrom/{flashrom_1.4.0.bb => flashrom_1.5.1.bb} (75%)
>
> diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch
> deleted file mode 100644
> index 58f1aa4d43..0000000000
> --- a/meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -From bf5a30ef30818973eb2cfac792b80c642df8a721 Mon Sep 17 00:00:00 2001
> -From: Patrick Rudolph <patrick.rudolph@9elements.com>
> -Date: Mon, 14 Oct 2024 11:01:37 +0200
> -Subject: [oe] [meta-oe] [PATCH 1/2] flashrom: Mark RISCV as non memory-mapped I/O
> - architecture
> -
> -Upstream-Status: Inactive-Upstream
> -
> -Change-Id: I46d7ede7af61e7fca631e1d465100e65c6ddeee9
> -Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
> ----
> - Makefile | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/Makefile b/Makefile
> -index 97f56b83..08e4c595 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -372,7 +372,7 @@ endif
> - # Additionally disable all drivers needing raw access (memory, PCI, port I/O)
> - # on architectures with unknown raw access properties.
> - # Right now those architectures are alpha hppa m68k sh s390
> --ifneq ($(ARCH), $(filter $(ARCH), x86 mips ppc arm sparc arc e2k))
> -+ifneq ($(ARCH), $(filter $(ARCH), x86 mips ppc arm sparc arc e2k riscv))
> - $(call mark_unsupported,$(DEPENDS_ON_RAW_MEM_ACCESS))
> - endif
> -
> ---
> -2.46.2
> -
> diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-linux_mtd-fix-build-with-clang-19.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-linux_mtd-fix-build-with-clang-19.patch
> deleted file mode 100644
> index 46bd0bba44..0000000000
> --- a/meta-oe/recipes-bsp/flashrom/flashrom/0001-linux_mtd-fix-build-with-clang-19.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From 615fae91dafdb89f0f8418129918dbb7ff879cf6 Mon Sep 17 00:00:00 2001
> -From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
> -Date: Thu, 24 Oct 2024 17:51:29 +0200
> -Subject: [PATCH] linux_mtd: fix build with clang >= 19
> -
> -Starting with version 19, clang issues a warning when using `strlen()`
> -for initializing a static array's size. This causes the build to fail as
> -the project also sets `-Werror`.
> -
> -This is fixed by using `sizeof()` instead, which is guaranteed to be
> -evaluated at compilation time and therefore not triggering the
> -problematic warning.
> -
> -Upstream-Status: Backport [https://github.com/flashrom/flashrom/commit/34b1a6aa57e910c0b5a518e8a0cab6841c7efaee]
> -
> -Change-Id: If470a65702e9ae08e4303123a0014e53a1fee56e
> -Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
> -Reviewed-on: https://review.coreboot.org/c/flashrom/+/84856
> -Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
> -Reviewed-by: Maximilian Brune <maximilian.brune@9elements.com>
> -Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - linux_mtd.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/linux_mtd.c b/linux_mtd.c
> -index eea0cf2..0cb2330 100644
> ---- a/linux_mtd.c
> -+++ b/linux_mtd.c
> -@@ -49,7 +49,7 @@ static int read_sysfs_string(const char *sysfs_path, const char *filename, char
> -       int i;
> -       size_t bytes_read;
> -       FILE *fp;
> --      char path[strlen(LINUX_MTD_SYSFS_ROOT) + 32];
> -+      char path[sizeof(LINUX_MTD_SYSFS_ROOT) + 31];
> -
> -       snprintf(path, sizeof(path), "%s/%s", sysfs_path, filename);
> -
> diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch
> index bc43f17e9a..8dfed855b4 100644
> --- a/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch
> +++ b/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch
> @@ -16,10 +16,10 @@ Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
>   2 files changed, 6 insertions(+), 3 deletions(-)
>
>  diff --git a/meson.build b/meson.build
> -index ae56b26c..21093a7f 100644
> +index 6c8d3d3..61b794d 100644
>  --- a/meson.build
>  +++ b/meson.build
> -@@ -151,9 +151,9 @@ systems_serial     = [ 'linux', 'openbsd', 'freebsd', 'dragonfly', 'netbsd', 'da
> +@@ -150,9 +150,9 @@ systems_serial     = [ 'linux', 'openbsd', 'freebsd', 'dragonfly', 'netbsd', 'da
>
>   cpus_port_io = [ 'x86', 'x86_64' ]
>
> @@ -33,16 +33,17 @@ index ae56b26c..21093a7f 100644
>   group_serial = get_option('programmer').contains('group_serial')
>   group_jlink  = get_option('programmer').contains('group_jlink')
>  diff --git a/meson_options.txt b/meson_options.txt
> -index 8a04114d..ae722509 100644
> +index 87456a9..570b152 100644
>  --- a/meson_options.txt
>  +++ b/meson_options.txt
> -@@ -25,3 +25,6 @@ option('ni845x_search_path', type : 'string', value : 'C:\Program Files (x86)\Na
> - option('delay_minimum_sleep_us', type : 'integer', min : 0, value : 100000,
> +@@ -24,4 +24,7 @@ option('ni845x_search_path', type : 'string', value : 'C:\Program Files (x86)\Na
> + option('delay_minimum_sleep_us', type : 'integer', min : 0, value : 100,
>          description : 'Minimum time in microseconds to suspend execution for (rather than polling) when a delay is required.'
>                      + ' Larger values may perform better on machines with low timer resolution, at the cost of increased power.')
>  +option('pciutils', type : 'boolean', value : false, description : 'Select programmer group pci')
>  +option('usb', type : 'boolean', value : false, description : 'Select programmer group usb')
>  +option('ftdi', type : 'boolean', value : false, description : 'Select programmer group ftdi')
> + option('rpmc', type : 'feature', value : 'auto', description : 'Support for Replay Protected Monotonic Counter (RPMC) commands as specified by JESD260')
>  --
> -2.46.2
> +2.43.0
>
> diff --git a/meta-oe/recipes-bsp/flashrom/flashrom_1.4.0.bb b/meta-oe/recipes-bsp/flashrom/flashrom_1.5.1.bb
> similarity index 75%
> rename from meta-oe/recipes-bsp/flashrom/flashrom_1.4.0.bb
> rename to meta-oe/recipes-bsp/flashrom/flashrom_1.5.1.bb
> index 6c5d05f2d0..9a8e81bae3 100644
> --- a/meta-oe/recipes-bsp/flashrom/flashrom_1.4.0.bb
> +++ b/meta-oe/recipes-bsp/flashrom/flashrom_1.5.1.bb
> @@ -4,12 +4,10 @@ HOMEPAGE = "http://flashrom.org"
>
>  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
>  SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.xz \
> -           file://0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch \
>             file://0002-meson-Add-options-pciutils-ftdi-usb.patch \
> -           file://0001-linux_mtd-fix-build-with-clang-19.patch \
>             "
>
> -SRC_URI[sha256sum] = "eb0eb3e61a57fd1926c66f08664cf04a96f92cee23b600cf563087c2178d70d8"
> +SRC_URI[sha256sum] = "1f934b076ed49eace203655ec249fc7861a6b8e87fe4aef732e47b6e485b6293"
>
>  S = "${WORKDIR}/flashrom-v${PV}"
>
> --
> 2.43.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#116157): https://lists.openembedded.org/g/openembedded-devel/message/116157
> Mute This Topic: https://lists.openembedded.org/mt/111822476/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>