diff --git a/0001-Install-the-man-file-when-using-meson-as-a-buildsyst.patch b/0001-Install-the-man-file-when-using-meson-as-a-buildsyst.patch deleted file mode 100644 index 39cd1a8..0000000 --- a/0001-Install-the-man-file-when-using-meson-as-a-buildsyst.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b820207aeff98b5ccf21649036259333fd0e0175 Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Mon, 17 Feb 2020 09:57:01 +0000 -Subject: [PATCH] Install the man file when using meson as a buildsystem - -This fixes a regression with the Fedora package. - -Change-Id: I881bd5002a842072ce9dadea033c51a2668f9e7c -Signed-off-by: Richard Hughes ---- - meson.build | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/meson.build b/meson.build -index 375089c3..df39290b 100644 ---- a/meson.build -+++ b/meson.build -@@ -299,6 +299,7 @@ endif - prefix = get_option('prefix') - sbindir = join_paths(prefix, get_option('sbindir')) - libdir = join_paths(prefix, get_option('libdir')) -+mandir = join_paths(prefix, get_option('mandir')) - - install_headers([ - 'libflashrom.h', -@@ -372,6 +373,14 @@ pkgg.generate( - description : 'library to interact with flashrom', - ) - -+configure_file( -+ input : 'flashrom.8.tmpl', -+ output : 'flashrom.8', -+ copy: true, -+ install: true, -+ install_dir: join_paths(mandir, 'man8'), -+) -+ - flashrom_dep = declare_dependency( - link_with : flashrom, - include_directories : include_directories('.'), --- -2.24.1 - diff --git a/0002-meson-Add-missing-config-option-for-J-Link-SPI.patch b/0002-meson-Add-missing-config-option-for-J-Link-SPI.patch deleted file mode 100644 index 4b52701..0000000 --- a/0002-meson-Add-missing-config-option-for-J-Link-SPI.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Marc Schink -Date: Tue, 8 Dec 2020 22:20:50 +0100 -Subject: [PATCH] meson: Add missing config option for J-Link SPI - -Signed-off-by: Marc Schink -Change-Id: I476c649f9db7342688560aac9ee5df056517a028 -Reviewed-on: https://review.coreboot.org/c/flashrom/+/48478 -Tested-by: build bot (Jenkins) -Reviewed-by: Angel Pons -Reviewed-by: Edward O'Callaghan - -diff --git a/meson.build b/meson.build -index cf91ef4..878cac3 100644 ---- a/meson.build -+++ b/meson.build -@@ -38,6 +38,7 @@ config_ch341a_spi = get_option('config_ch341a_spi') - config_dediprog = get_option('config_dediprog') - config_developerbox_spi = get_option('config_developerbox_spi') - config_digilent_spi = get_option('config_digilent_spi') -+config_jlink_spi = get_option('config_jlink_spi') - config_drkaiser = get_option('config_drkaiser') - config_dummy = get_option('config_dummy') - config_ft2232_spi = get_option('config_ft2232_spi') -@@ -152,6 +153,11 @@ if config_digilent_spi - srcs += 'digilent_spi.c' - cargs += '-DCONFIG_DIGILENT_SPI=1' - endif -+if config_jlink_spi -+ srcs += 'jlink_spi.c' -+ cargs += '-DCONFIG_JLINK_SPI=1' -+ deps += dependency('libjaylink') -+endif - if config_drkaiser - srcs += 'drkaiser.c' - cargs += '-DCONFIG_DRKAISER=1' -diff --git a/meson_options.txt b/meson_options.txt -index ea87311..f253f26 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -9,6 +9,7 @@ option('config_ch341a_spi', type : 'boolean', value : true, description : 'Winch - option('config_dediprog', type : 'boolean', value : true, description : 'Dediprog SF100') - option('config_developerbox_spi', type : 'boolean', value : true, description : 'Developerbox emergency recovery') - option('config_digilent_spi', type : 'boolean', value : true, description : 'Digilent Development board JTAG') -+option('config_jlink_spi', type : 'boolean', value : false, description : 'SEGGER J-Link and compatible devices') - option('config_drkaiser', type : 'boolean', value : true, description : 'Dr. Kaiser') - option('config_dummy', type : 'boolean', value : true, description : 'dummy tracing') - option('config_ft2232_spi', type : 'boolean', value : true, description : 'FT2232 SPI dongles') diff --git a/58A4868B25C7CFD662FB0132A3EB95B8D9780F68 b/58A4868B25C7CFD662FB0132A3EB95B8D9780F68 deleted file mode 100644 index 5efab45..0000000 --- a/58A4868B25C7CFD662FB0132A3EB95B8D9780F68 +++ /dev/null @@ -1,54 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Comment: 58A4 868B 25C7 CFD6 62FB 0132 A3EB 95B8 D978 0F68 -Comment: David Hendricks (packaging key) - 1.3.0-1 +- Update to latest upstream release + * Thu Jan 19 2023 Fedora Release Engineering - 1.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index ca44317..0cbd23d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (flashrom-v1.2.tar.bz2) = 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8 -SHA512 (flashrom-v1.2.tar.bz2.asc) = 8c50e3eec79bcd70add3a75b5f5493805734444de91f1635303e70642efa1e03239edb352d1a962f750552406020c18de3e39226a2dceb17142667561042cd09 +SHA512 (flashrom-v1.3.0.tar.bz2) = 73b6e00bd3bc66c98d4ad53966a65b19d3d92f07d7b210d69e041d6f5788605b9791a9bf7aec0a52e13d19fcb62c4bdaf4bab9f805fc31468393ca313129a77b