From: Jakub Bogusz Date: Sat, 1 Apr 2023 05:43:16 +0000 (+0200) Subject: - updated to 1.3.0 X-Git-Tag: auto/th/flashrom-1.3.0-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=a65c0526af68f1e0d3c1b6dfb572964cb4aec8d7;p=packages%2Fflashrom.git - updated to 1.3.0 --- diff --git a/flashrom-meson-jlink.patch b/flashrom-meson-jlink.patch deleted file mode 100644 index 27c68bb..0000000 --- a/flashrom-meson-jlink.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 13a356815d2438103689a6ea1ac7e58d4d508ddb Mon Sep 17 00:00:00 2001 -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 ---- - meson.build | 6 ++++++ - meson_options.txt | 1 + - 2 files changed, 7 insertions(+) - ---- flashrom-v1.2/meson.build.orig 2019-12-31 18:25:41.000000000 +0100 -+++ flashrom-v1.2/meson.build 2021-06-15 19:38:52.837851898 +0200 -@@ -44,6 +44,7 @@ config_ft2232_spi = get_option('config_f - config_gfxnvidia = get_option('config_gfxnvidia') - config_internal = get_option('config_internal') - config_it8212 = get_option('config_it8212') -+config_jlink_spi = get_option('config_jlink_spi') - config_linux_mtd = get_option('config_linux_mtd') - config_linux_spi = get_option('config_linux_spi') - config_mstarddc_spi = get_option('config_mstarddc_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' ---- flashrom-v1.2/meson_options.txt.orig 2021-06-15 19:36:51.274905627 +0200 -+++ flashrom-v1.2/meson_options.txt 2021-06-15 19:39:11.555485464 +0200 -@@ -16,6 +16,7 @@ option('config_gfxnvidia', type : 'boole - option('config_internal', type : 'boolean', value : true, description : 'internal/onboard') - option('config_internal_dmi', type : 'boolean', value : true, description : 'Use internal DMI parser') - option('config_it8212', type : 'boolean', value : true, description : 'ITE IT8212F PATA') -+option('config_jlink_spi', type : 'boolean', value : false, description : 'SEGGER J-Link and compatible devices') - option('config_linux_mtd', type : 'boolean', value : true, description : 'Linux MTD interfaces') - option('config_linux_spi', type : 'boolean', value : true, description : 'Linux spidev interfaces') - option('config_mstarddc_spi', type : 'boolean', value : false, description : 'MSTAR DDC support') diff --git a/flashrom.spec b/flashrom.spec index 63e6b2a..9de6ef6 100644 --- a/flashrom.spec +++ b/flashrom.spec @@ -7,13 +7,12 @@ Summary: Tool Flashing your BIOS from the Unix/Linux command line Summary(pl.UTF-8): Narzędzie do aktualizacji BIOS-u z linii poleceń Uniksa/Linuksa Name: flashrom -Version: 1.2 +Version: 1.3.0 Release: 1 License: GPL v2+ Group: Applications/System Source0: https://download.flashrom.org/releases/%{name}-v%{version}.tar.bz2 -# Source0-md5: 7f8e4b87087eb12ecee0fcc5445b4956 -Patch0: %{name}-meson-jlink.patch +# Source0-md5: dd2727f8fa05a4517689ca4f9d87e600 URL: https://www.flashrom.org/Flashrom %{?with_apidocs:BuildRequires: doxygen} %{?with_ftdi:BuildRequires: libftdi1-devel >= 1.0} @@ -112,6 +111,18 @@ Header files for libflashrom library. %description -n libflashrom-devel -l pl.UTF-8 Pliki nagłówkowe biblioteki libflashrom. +%package -n libflashrom-static +Summary: Static libflashrom library +Summary(pl.UTF-8): Statyczna biblioteka libflashrom +Group: Development/Libraries +Requires: libflashrom-devel = %{version}-%{release} + +%description -n libflashrom-static +Static libflashrom library. + +%description -n libflashrom-static -l pl.UTF-8 +Statyczna biblioteka libflashrom. + %package -n libflashrom-apidocs Summary: API documentation for libflashrom library Summary(pl.UTF-8): Dokumentacja API biblioteki libflashrom @@ -126,22 +137,13 @@ Dokumentacja API biblioteki libflashrom. %prep %setup -q -n %{name}-v%{version} -%patch0 -p1 %build %meson build \ - -Dconfig_atahpt=true \ - -Dconfig_atapromise=true \ - %{!?with_ftdi:-Dconfig_ft2232_spi=false} \ - %{?with_jaylink:-Dconfig_jlink_spi=true} \ - -Dconfig_mstarddc_spi=true \ - -Dconfig_nicnatsemi=true \ + -Dprogrammer=group_i2c,group_pci,group_serial,group_usb%{?with_ftdi:,group_ftdi}%{?with_jaylink:,group_jlink},internal,linux_mtd,linux_spi,rayer_spi %ninja_build -C build -# missing from meson -%{__make} flashrom.8 - %if %{with apidocs} doxygen %endif @@ -152,8 +154,6 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man8 %ninja_install -C build -cp -p flashrom.8 $RPM_BUILD_ROOT%{_mandir}/man8 - %clean rm -rf $RPM_BUILD_ROOT @@ -177,6 +177,10 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libflashrom.h %{_pkgconfigdir}/flashrom.pc +%files -n libflashrom-static +%defattr(644,root,root,755) +%{_libdir}/libflashrom.a + %if %{with apidocs} %files -n libflashrom-apidocs %defattr(644,root,root,755)