Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package flashrom for openSUSE:Factory checked in at 2022-07-26 19:44:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flashrom (Old) and /work/SRC/openSUSE:Factory/.flashrom.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flashrom" Tue Jul 26 19:44:25 2022 rev:26 rq:990995 version:1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/flashrom/flashrom.changes 2021-09-20 23:36:33.743426283 +0200 +++ /work/SRC/openSUSE:Factory/.flashrom.new.1533/flashrom.changes 2022-07-26 19:44:49.844037833 +0200 @@ -1,0 +2,11 @@ +Sun Jul 24 14:57:24 UTC 2022 - Michael Gorse <mgo...@suse.com> + +- Switch to meson +- Add flashrom-install-man-file.patch: install the man file when + using meson. +- Add flashrom-j-link-spi.patch: Add missing meson option for + J-Link SPI. +- Drop fix_aarch64.patch: no longer relevant. +- Package the library and headers. + +------------------------------------------------------------------- Old: ---- fix_aarch64.patch New: ---- flashrom-install-man-file.patch flashrom-j-link-spi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flashrom.spec ++++++ --- /var/tmp/diff_new_pack.eUEnZX/_old 2022-07-26 19:44:50.295967999 +0200 +++ /var/tmp/diff_new_pack.eUEnZX/_new 2022-07-26 19:44:50.299967381 +0200 @@ -1,7 +1,7 @@ # # spec file for package flashrom # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,10 +27,16 @@ 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/da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d -Patch1: fix_aarch64.patch +# 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: pkgconfig BuildRequires: pkgconfig(libftdi1) +%ifarch %{ix86} x86_64 +BuildRequires: pkgconfig(libjaylink) +%endif BuildRequires: pkgconfig(libpci) BuildRequires: pkgconfig(libusb) BuildRequires: pkgconfig(zlib) @@ -47,23 +53,79 @@ TSOP40 chips, which use various protocols such as LPC, FWH, parallel flash, or SPI. +%package -n libflashrom1 +Summary: A universal flash programming utility +Group: Development/Tools/Other + +%description -n libflashrom1 +flashrom is a utility for reading, writing, verifying and erasing flash ROM +chips. It's often used to flash BIOS/EFI/coreboot/firmware images in-system +using a supported mainboard, but it also supports flashing of network +cards (NICs), SATA controller cards, and other external devices which can +program flash chips. + %prep -%setup -q -n %{name}-v%{version} -%patch1 -p1 +%autosetup -p1 -n %{name}-v%{version} + +%package devel +Summary: A universal flash programming utility +Group: Development/Tools/Other +Requires: libflashrom1 = %{version}-%{release} + +%description devel +flashrom is a utility for reading, writing, verifying and erasing flash ROM +chips. It's often used to flash BIOS/EFI/coreboot/firmware images in-system +using a supported mainboard, but it also supports flashing of network +cards (NICs), SATA controller cards, and other external devices which can +program flash chips. + +This package contains the headers needed to compile against libflashrom. %build -make %{?_smp_mflags} \ - CFLAGS="%{optflags}" +%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} + +%meson_build %install -install -d %{buildroot}/%{_sbindir} -install -d %{buildroot}/%{_mandir}/man8 -install -m 0755 flashrom %{buildroot}/%{_sbindir} -install -m 0644 flashrom.8 %{buildroot}/%{_mandir}/man8 +%meson_install %files -%doc COPYING README +%license COPYING +%doc README %{_sbindir}/flashrom %{_mandir}/man8/flashrom.8%{ext_man} +%files -n libflashrom1 +%{_libdir}/libflashrom.so.1 +%{_libdir}/libflashrom.so.1.0.0 + +%files devel +%{_includedir}/libflashrom.h +%{_libdir}/libflashrom.so +%{_libdir}/pkgconfig/flashrom.pc + %changelog ++++++ flashrom-install-man-file.patch ++++++ >From b820207aeff98b5ccf21649036259333fd0e0175 Mon Sep 17 00:00:00 2001 From: Richard Hughes <rich...@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 <rich...@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 ++++++ flashrom-j-link-spi.patch ++++++ From: Marc Schink <d...@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 <d...@zapb.de> Change-Id: I476c649f9db7342688560aac9ee5df056517a028 Reviewed-on: https://review.coreboot.org/c/flashrom/+/48478 Tested-by: build bot (Jenkins) <no-re...@coreboot.org> Reviewed-by: Angel Pons <th3fan...@gmail.com> Reviewed-by: Edward O'Callaghan <quasi...@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')
