rpms/flashrom
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to flashrom 1.2

Browse Source
This commit is contained in:
Alexandru Gagniuc 2020-02-10 19:47:56 -06:00
parent ff6713a0fe
commit eb00fe7115
3 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
flashrom-1.1-gcc10.patch
View File

@ -1,28 +0,0 @@
Parts of https://github.com/flashrom/flashrom/commit/afc3ad64300bbcc14266e645beec897ef06df13d
diff --git a/dediprog.c b/dediprog.c
index 8029b64f4..5af1eec66 100644
--- a/dediprog.c
+++ b/dediprog.c
@@ -43,7 +43,7 @@
#define REQTYPE_OTHER_IN (LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_OTHER) /* 0xC3 */
#define REQTYPE_EP_OUT (LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_ENDPOINT) /* 0x42 */
#define REQTYPE_EP_IN (LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_ENDPOINT) /* 0xC2 */
-struct libusb_context *usb_ctx;
+static struct libusb_context *usb_ctx;
static libusb_device_handle *dediprog_handle;
static int dediprog_in_endpoint;
static int dediprog_out_endpoint;
diff --git a/developerbox_spi.c b/developerbox_spi.c
index c80a79449..4ff2fb609 100644
--- a/developerbox_spi.c
+++ b/developerbox_spi.c
@@ -60,7 +60,7 @@ const struct dev_entry devs_developerbox_spi[] = {
{0},
};
-struct libusb_context *usb_ctx;
+static struct libusb_context *usb_ctx;
static libusb_device_handle *cp210x_handle;
static int cp210x_gpio_get(void)

10
flashrom.spec
View File

@ -1,13 +1,11 @@
Name: flashrom
Version: 1.1
Release: 4%{?dist}
Version: 1.2
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
# https://github.com/flashrom/flashrom/commit/0b59b0dafc219ba73ee2af5404ce626575d74c6f
Patch0: flashrom-1.1-gcc10.patch
BuildRequires: gcc
BuildRequires: pciutils-devel
@ -35,7 +33,6 @@ other programmer devices.
%prep
%setup -q -n %{name}-v%{version}
%patch0 -p1 -b .gcc10
# Replace GROUP="plugdev" specifiers with TAG+="uaccess"
sed -e 's/MODE="[0-9]*", GROUP="plugdev"/TAG+="uaccess"/g' util/z60_flashrom.rules -i
@ -66,6 +63,9 @@ install -D -p -m 0644 util/z60_flashrom.rules %{buildroot}/%{_udevrulesdir}/60_f
%changelog
* Tue Feb 11 2020 mrnuke <mr.nuke.me@gmail.com> - 1.2-1
- Update to flashrom 1.2 (Release was intended to fix #1799344)
* Tue Feb 11 2020 Robert Scheck <robert@fedoraproject.org> - 1.1-4
- Added upstream patch to declare usb_ctx as static (#1799344)

2
sources
View File

@ -1 +1 @@
SHA512 (flashrom-v1.1.tar.bz2) = 8cb75a7223490fa9dbd65a85d24a87beab68ee03120891a3d8ebf4e8bc3d2a2ee640e254ccff657eaf5175e6c2477288337369fa1b1dac110a0903b0c95c1e56
SHA512 (flashrom-v1.2.tar.bz2) = 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8