forked from pool/flashrom
Accepting request 1113158 from home:etamPL:branches:hardware
- Update to 1.3.0 - See changelog at https://www.flashrom.org/Flashrom/1.3 - Removed patches (merged upstream): - flashrom-install-man-file.patch - flashrom-j-link-spi.patch OBS-URL: https://build.opensuse.org/request/show/1113158 OBS-URL: https://build.opensuse.org/package/show/hardware/flashrom?expand=0&rev=47
This commit is contained in:
Git OBS Bridge
parent
69c6da06cc
commit
6362adcc1b
Binary file not shown.
6
flashrom-1.3.0.tar.bz2.sig
Normal file
6
flashrom-1.3.0.tar.bz2.sig
Normal file
@ -0,0 +1,6 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABECAB0WIQRubvmgukeABuJ3bkzAN7tBMTTREQUCY+MPrwAKCRDAN7tBMTTR
|
||||
EZX5AJ41n1UF6YaAnao6OWYfrE6nRyaL/gCeJxIgEKVf+YAROc6oe2C+jNu+6L8=
|
||||
=kICs
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -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,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b
|
||||
size 366995
|
||||
BIN
flashrom-v1.3.0.tar.bz2
(Stored with Git LFS)
Normal file
BIN
flashrom-v1.3.0.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 22 19:54:18 UTC 2023 - Adam Mizerski <adam@mizerski.pl>
|
||||
|
||||
- Update to 1.3.0
|
||||
- See changelog at https://www.flashrom.org/Flashrom/1.3
|
||||
- Removed patches (merged upstream):
|
||||
- flashrom-install-man-file.patch
|
||||
- flashrom-j-link-spi.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 24 14:57:24 UTC 2022 - Michael Gorse <mgorse@suse.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package flashrom
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: flashrom
|
||||
Version: 1.2
|
||||
Version: 1.3.0
|
||||
Release: 0
|
||||
Summary: A universal flash programming utility
|
||||
License: GPL-2.0-only
|
||||
@ -27,16 +27,11 @@ Source0: https://download.flashrom.org/releases/%{name}-v%{version}.tar.b
|
||||
Source1: https://download.flashrom.org/releases/%{name}-v%{version}.tar.bz2.asc#/%{name}-%{version}.tar.bz2.sig
|
||||
# Got the key from David Hendricks
|
||||
Source2: %{name}.keyring
|
||||
# PATCH-FIX-UPSTREAM https://github.com/flashrom/flashrom/commit/7aea04f7099ad4dde7b1f5900b54ef603eadf25e
|
||||
Patch1: flashrom-install-man-file.patch
|
||||
# PATCH-FIX-UPSTREAM https://github.com/flashrom/flashrom/commit/13a356815d2438103689a6ea1ac7e58d4d508ddb
|
||||
Patch2: flashrom-j-link-spi.patch
|
||||
BuildRequires: meson >= 0.47.0
|
||||
BuildRequires: meson >= 0.53.0
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(cmocka)
|
||||
BuildRequires: pkgconfig(libftdi1)
|
||||
%ifarch %{ix86} x86_64
|
||||
BuildRequires: pkgconfig(libjaylink)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(libpci)
|
||||
BuildRequires: pkgconfig(libusb)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
@ -83,35 +78,15 @@ This package contains the headers needed to compile against libflashrom.
|
||||
|
||||
%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
|
||||
%{nil}
|
||||
|
||||
-Dtests=disabled
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
rm %{buildroot}%{_libdir}/libflashrom.a
|
||||
|
||||
%post -n libflashrom1 -p /sbin/ldconfig
|
||||
%postun -n libflashrom1 -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
|
||||
Loading…
Reference in New Issue
Block a user