Update to latest upstream release
This commit is contained in:
Richard Hughes
parent
20337907d3
commit
a955d251a1
@ -1,43 +0,0 @@
|
||||
From b820207aeff98b5ccf21649036259333fd0e0175 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Hughes <richard@hughsie.com>
|
||||
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 <richard@hughsie.com>
|
||||
---
|
||||
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
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
From: Marc Schink <dev@zapb.de>
|
||||
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 <dev@zapb.de>
|
||||
Change-Id: I476c649f9db7342688560aac9ee5df056517a028
|
||||
Reviewed-on: https://review.coreboot.org/c/flashrom/+/48478
|
||||
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
|
||||
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
|
||||
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
|
||||
|
||||
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')
|
||||
@ -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) <david.hendricks@gmail.
|
||||
|
||||
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
|
||||
7dgzEwgx3WfYu3V1d/Vv3jT7Xd24c+nl
|
||||
=pcMx
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
@ -1,18 +1,11 @@
|
||||
Name: flashrom
|
||||
Version: 1.2
|
||||
Release: 10%{?dist}
|
||||
Version: 1.3.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Simple program for reading/writing flash chips content
|
||||
License: GPLv2
|
||||
URL: https://flashrom.org
|
||||
|
||||
Source0: https://download.flashrom.org/releases/%{name}-v%{version}.tar.bz2
|
||||
Source1: https://download.flashrom.org/releases/%{name}-v%{version}.tar.bz2.asc
|
||||
Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/58A4868B25C7CFD662FB0132A3EB95B8D9780F68
|
||||
|
||||
# upstream already: https://review.coreboot.org/c/flashrom/+/38939
|
||||
Patch0: 0001-Install-the-man-file-when-using-meson-as-a-buildsyst.patch
|
||||
# upstreamed: https://review.coreboot.org/c/flashrom/+/48478
|
||||
Patch1: 0002-meson-Add-missing-config-option-for-J-Link-SPI.patch
|
||||
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: gcc
|
||||
@ -52,48 +45,19 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Files for development with %{name}.
|
||||
|
||||
%prep
|
||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||
%autosetup -p1 -n %{name}-v%{version}
|
||||
# Replace GROUP="plugdev" specifiers with TAG+="uaccess"
|
||||
sed -e 's/MODE="[0-9]*", GROUP="plugdev"/TAG+="uaccess"/g' util/z60_flashrom.rules -i
|
||||
sed -e 's/MODE="[0-9]*", GROUP="plugdev"/TAG+="uaccess"/g' util/flashrom_udev.rules -i
|
||||
|
||||
%build
|
||||
%meson \
|
||||
%ifarch %{ix86} x86_64
|
||||
-Dconfig_jlink_spi=true \
|
||||
-Dconfig_internal=true
|
||||
%else
|
||||
-Dconfig_atahpt=false \
|
||||
-Dconfig_atapromise=false \
|
||||
-Dconfig_atavia=false \
|
||||
-Dconfig_drkaiser=false \
|
||||
-Dconfig_gfxnvidia=false \
|
||||
-Dconfig_it8212=false \
|
||||
-Dconfig_jlink_spi=false \
|
||||
-Dconfig_nic3com=false \
|
||||
-Dconfig_nicintel_eeprom=false \
|
||||
-Dconfig_nicintel=false \
|
||||
-Dconfig_nicintel_spi=false \
|
||||
-Dconfig_nicnatsemi=false \
|
||||
-Dconfig_nicrealtek=false \
|
||||
-Dconfig_ogp_spi=false \
|
||||
-Dconfig_rayer_spi=false \
|
||||
-Dconfig_satamv=false \
|
||||
-Dconfig_satasii=false \
|
||||
-Dconfig_internal=false
|
||||
%endif
|
||||
|
||||
%meson -Dtests=disabled
|
||||
%meson_build
|
||||
|
||||
%if 0%{?enable_tests}
|
||||
%check
|
||||
%meson_test
|
||||
%endif
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
install -D -p -m 0644 util/z60_flashrom.rules %{buildroot}/%{_udevrulesdir}/60_flashrom.rules
|
||||
install -D -p -m 0644 util/flashrom_udev.rules %{buildroot}/%{_udevrulesdir}/60_flashrom.rules
|
||||
rm %{buildroot}/%{_libdir}/libflashrom.a
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
@ -110,6 +74,9 @@ install -D -p -m 0644 util/z60_flashrom.rules %{buildroot}/%{_udevrulesdir}/60_f
|
||||
%{_libdir}/pkgconfig/flashrom.pc
|
||||
|
||||
%changelog
|
||||
* Thu Feb 09 2023 Richard Hughes <richard@hughsie.com> - 1.3.0-1
|
||||
- Update to latest upstream release
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
|
||||
3
sources
3
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user