[Buildroot] [PATCH 1/2] package/flashrom: bump to final 1.4.0 release

[Buildroot] [PATCH 1/2] package/flashrom: bump to final 1.4.0 release

[Thomas Petazzoni via buildroot]

This commit is suitable for master because:

$ git log --format=oneline v1.4.0-rc2..v1.4.0
eace095b15eb034e42d97202cad70ce979d8ca38 VERSION: Update version to 1.4.0
30c85a62c1abe07d57d5a7b523ef62c2c5b825c9 doc: Release notes for version 1.4.0
e4e0fd0d8232260af052fde52a9fb636181b2e2e meson: Fix project name as flashrom

And it looks nicer to have a final 1.4.0 release than a 1.4.0-rc2
release candidate.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/flashrom/flashrom.hash | 2 +-
 package/flashrom/flashrom.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash
index cecec5273f..17ebdee3af 100644
--- a/package/flashrom/flashrom.hash
+++ b/package/flashrom/flashrom.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  318c54a4143a1a05b30cecd64fbff41a0f5cd35a020622864c11fb44f8ed04d4  flashrom-1.4.0-rc2.tar.gz
+sha256  b77ce458b3b874387270a71805e899ac63f057d7553dc320da7e4c58e750577c  flashrom-1.4.0.tar.gz
 sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk
index 1e7d332dae..46d42640e9 100644
--- a/package/flashrom/flashrom.mk
+++ b/package/flashrom/flashrom.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FLASHROM_VERSION = 1.4.0-rc2
+FLASHROM_VERSION = 1.4.0
 FLASHROM_SITE = $(call github,flashrom,flashrom,v$(FLASHROM_VERSION))
 FLASHROM_LICENSE = GPL-2.0+
 FLASHROM_LICENSE_FILES = COPYING
-- 
2.46.0

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

[Buildroot] [PATCH 2/2] package/flashrom: disable documentation and man-pages

[Thomas Petazzoni via buildroot]

The build of the manpage currently fails with:

ERROR: File 'doc/man8' could not be found
FAILED: meson-internal__install

As we don't care about man pages and documentation in Buildroot, let's
disable them. The issue has nevertheless been reported at
https://github.com/flashrom/flashrom/issues/329.

Fixes:

  http://autobuild.buildroot.net/results/885a957d1b5305d3b91339487cc2a0d64dc74f5e/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/flashrom/flashrom.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk
index 46d42640e9..8648965303 100644
--- a/package/flashrom/flashrom.mk
+++ b/package/flashrom/flashrom.mk
@@ -14,7 +14,9 @@ FLASHROM_CONF_OPTS = \
 	-Dich_descriptors_tool=enabled \
 	-Dtests=disabled \
 	-Duse_internal_dmi=true \
-	-Dwerror=false
+	-Dwerror=false \
+	-Dman-pages=disabled \
+	-Ddocumentation=disabled
 
 FLASHROM_PROGRAMMERS = \
 	buspirate_spi \
-- 
2.46.0

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

Re: [Buildroot] [PATCH 1/2] package/flashrom: bump to final 1.4.0 release

[Yann E. MORIN]

Thomas, All,

On 2024-08-18 23:56 +0200, Thomas Petazzoni via buildroot spake thusly:
> This commit is suitable for master because:
> 
> $ git log --format=oneline v1.4.0-rc2..v1.4.0
> eace095b15eb034e42d97202cad70ce979d8ca38 VERSION: Update version to 1.4.0
> 30c85a62c1abe07d57d5a7b523ef62c2c5b825c9 doc: Release notes for version 1.4.0
> e4e0fd0d8232260af052fde52a9fb636181b2e2e meson: Fix project name as flashrom
> 
> And it looks nicer to have a final 1.4.0 release than a 1.4.0-rc2
> release candidate.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Both patches applied to master, but in the reverse order: first the
build fix, then the version bump.

Regards,
Yann E. MORIN.

> ---
>  package/flashrom/flashrom.hash | 2 +-
>  package/flashrom/flashrom.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash
> index cecec5273f..17ebdee3af 100644
> --- a/package/flashrom/flashrom.hash
> +++ b/package/flashrom/flashrom.hash
> @@ -1,3 +1,3 @@
>  # Locally computed
> -sha256  318c54a4143a1a05b30cecd64fbff41a0f5cd35a020622864c11fb44f8ed04d4  flashrom-1.4.0-rc2.tar.gz
> +sha256  b77ce458b3b874387270a71805e899ac63f057d7553dc320da7e4c58e750577c  flashrom-1.4.0.tar.gz
>  sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
> diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk
> index 1e7d332dae..46d42640e9 100644
> --- a/package/flashrom/flashrom.mk
> +++ b/package/flashrom/flashrom.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -FLASHROM_VERSION = 1.4.0-rc2
> +FLASHROM_VERSION = 1.4.0
>  FLASHROM_SITE = $(call github,flashrom,flashrom,v$(FLASHROM_VERSION))
>  FLASHROM_LICENSE = GPL-2.0+
>  FLASHROM_LICENSE_FILES = COPYING
> -- 
> 2.46.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot