[Buildroot] [PATCH 1/1] package/flashrom: bump to version 1.4.0-rc2

[Buildroot] [PATCH 1/1] package/flashrom: bump to version 1.4.0-rc2

[Fabrice Fontaine]

- Drop patch (already in version)
- This bump will fix the following static build failure raised
  since switch to meson-package in commit
  37dded43ae681e8319d7b76f9a612c71991467a9 thanks to
  https://github.com/flashrom/flashrom/commit/67ca4a71c477320d4b726acd152b7536344e227f
  (which doesn't apply cleanly above version 1.3.0):

  ld (ld-elf2flt): -shared used without passing a shared library ID

- With above patch, classic_cli can't be built without a static library
  (i.e. with BR2_SHARED_LIBS)

Fixes: 37dded43ae681e8319d7b76f9a612c71991467a9
 - http://autobuild.buildroot.org/results/ee61dc30056b6c3335d64054c875bfb40526033d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...et_enable.c-Drop-_LARGEFILE64_SOURCE.patch | 38 -------------------
 package/flashrom/flashrom.hash                |  5 +--
 package/flashrom/flashrom.mk                  | 12 ++++--
 3 files changed, 10 insertions(+), 45 deletions(-)
 delete mode 100644 package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch

diff --git a/package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch b/package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch
deleted file mode 100644
index 1ee8d0f7e3..0000000000
--- a/package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 59287a0bd0e4d58a4d2b434bde3db9b2376ac7c1 Mon Sep 17 00:00:00 2001
-From: Angel Pons <th3fanbus@gmail.com>
-Date: Tue, 16 May 2023 11:13:17 +0200
-Subject: [PATCH] chipset_enable.c: Drop `_LARGEFILE64_SOURCE`
-
-This file does not access any large files, so there's no need to define
-this feature test macro.
-
-Change-Id: I866cfa2f996eeea5846e5d9189647ad7a4a4e3e4
-Signed-off-by: Angel Pons <th3fanbus@gmail.com>
-Reviewed-on: https://review.coreboot.org/c/flashrom/+/75271
-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-Reviewed-by: Nico Huber <nico.h@gmx.de>
-Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
-Reviewed-by: Alexander Goncharov <chat@joursoir.net>
-
-Upstream: https://github.com/flashrom/flashrom/commit/59287a0bd0e4d58a4d2b434bde3db9b2376ac7c1
-Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
----
- chipset_enable.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/chipset_enable.c b/chipset_enable.c
-index 9d3df5f8..3846ecfb 100644
---- a/chipset_enable.c
-+++ b/chipset_enable.c
-@@ -24,8 +24,6 @@
-  * Contains the chipset specific flash enables.
-  */
- 
--#define _LARGEFILE64_SOURCE
--
- #include <stdbool.h>
- #include <stdlib.h>
- #include <string.h>
--- 
-2.34.1
-
diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash
index d3bfbad781..cecec5273f 100644
--- a/package/flashrom/flashrom.hash
+++ b/package/flashrom/flashrom.hash
@@ -1,4 +1,3 @@
-# Locally computed after checking pgp signature
-# https://download.flashrom.org/releases/flashrom-v1.3.0.tar.bz2.asc
-sha256  a053234453ccd012e79f3443bdcc61625cf97b7fd7cb4cdd8bfbffbe8b149623  flashrom-v1.3.0.tar.bz2
+# Locally computed
+sha256  318c54a4143a1a05b30cecd64fbff41a0f5cd35a020622864c11fb44f8ed04d4  flashrom-1.4.0-rc2.tar.gz
 sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk
index 478b53e1ac..1e7d332dae 100644
--- a/package/flashrom/flashrom.mk
+++ b/package/flashrom/flashrom.mk
@@ -4,14 +4,12 @@
 #
 ################################################################################
 
-FLASHROM_VERSION = 1.3.0
-FLASHROM_SOURCE = flashrom-v$(FLASHROM_VERSION).tar.bz2
-FLASHROM_SITE = https://download.flashrom.org/releases
+FLASHROM_VERSION = 1.4.0-rc2
+FLASHROM_SITE = $(call github,flashrom,flashrom,v$(FLASHROM_VERSION))
 FLASHROM_LICENSE = GPL-2.0+
 FLASHROM_LICENSE_FILES = COPYING
 FLASHROM_INSTALL_STAGING = YES
 FLASHROM_CONF_OPTS = \
-	-Dclassic_cli=enabled \
 	-Dclassic_cli_print_wiki=disabled \
 	-Dich_descriptors_tool=enabled \
 	-Dtests=disabled \
@@ -80,4 +78,10 @@ endif
 
 FLASHROM_CONF_OPTS += -Dprogrammer=$(subst $(space),$(comma),$(strip $(FLASHROM_PROGRAMMERS)))
 
+ifeq ($(BR2_SHARED_LIBS),)
+FLASHROM_CONF_OPTS += -Dclassic_cli=enabled
+else
+FLASHROM_CONF_OPTS += -Dclassic_cli=disabled
+endif
+
 $(eval $(meson-package))
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/flashrom: bump to version 1.4.0-rc2

[Thomas Petazzoni via buildroot]

On Sat, 20 Jul 2024 23:18:41 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> - Drop patch (already in version)
> - This bump will fix the following static build failure raised
>   since switch to meson-package in commit
>   37dded43ae681e8319d7b76f9a612c71991467a9 thanks to
>   https://github.com/flashrom/flashrom/commit/67ca4a71c477320d4b726acd152b7536344e227f
>   (which doesn't apply cleanly above version 1.3.0):
> 
>   ld (ld-elf2flt): -shared used without passing a shared library ID
> 
> - With above patch, classic_cli can't be built without a static library
>   (i.e. with BR2_SHARED_LIBS)
> 
> Fixes: 37dded43ae681e8319d7b76f9a612c71991467a9
>  - http://autobuild.buildroot.org/results/ee61dc30056b6c3335d64054c875bfb40526033d
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...et_enable.c-Drop-_LARGEFILE64_SOURCE.patch | 38 -------------------
>  package/flashrom/flashrom.hash                |  5 +--
>  package/flashrom/flashrom.mk                  | 12 ++++--
>  3 files changed, 10 insertions(+), 45 deletions(-)
>  delete mode 100644 package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch

Not super nice to bump to a -rc version, but fair enough. Hopefully
they will release 1.4.0 soon.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot