From mboxrd@z Thu Jan 1 00:00:00 1970 From: Danny Milosavljevic Subject: [PATCH] gnu: Update flashrom to 0.9.9 Date: Wed, 14 Sep 2016 22:09:06 +0200 Message-ID: <20160914200906.10292-1-dannym@scratchpost.org> References: <87d1kc55xm.fsf@we.make.ritual.n0.is> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.9.1" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkGUo-0001rZ-EV for guix-devel@gnu.org; Wed, 14 Sep 2016 16:09:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkGUk-0005m8-3D for guix-devel@gnu.org; Wed, 14 Sep 2016 16:09:25 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:42891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkGUj-0005lb-OK for guix-devel@gnu.org; Wed, 14 Sep 2016 16:09:22 -0400 In-Reply-To: <87d1kc55xm.fsf@we.make.ritual.n0.is> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org This is a multi-part message in MIME format. --------------2.9.1 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: quoted-printable gnu: Update flashrom to 0.9.9 * gnu/packages/flashing-tools.scm (flashrom): Changed. * gnu/packages/patches/flashrom-use-libftdi1.patch: Removed. * gnu/local.mk: Remove mention of "flashrom-use-libftdi1.patch". --- gnu/local.mk | 1 - gnu/packages/flashing-tools.scm | 11 ++-- gnu/packages/patches/flashrom-use-libftdi1.patch | 70 ------------------= ------ 3 files changed, 6 insertions(+), 76 deletions(-) delete mode 100644 gnu/packages/patches/flashrom-use-libftdi1.patch --------------2.9.1 Content-Type: text/x-patch; name="0001-gnu-Update-flashrom-to-0.9.9.patch" Content-Disposition: attachment; filename="0001-gnu-Update-flashrom-to-0.9.9.patch" Content-Transfer-Encoding: quoted-printable diff --git a/gnu/local.mk b/gnu/local.mk index 550897e..0308f67 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -511,7 +511,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/fasthenry-spFactor.patch \ %D%/packages/patches/findutils-localstatedir.patch \ %D%/packages/patches/findutils-test-xargs.patch \ - %D%/packages/patches/flashrom-use-libftdi1.patch \ %D%/packages/patches/flint-ldconfig.patch \ %D%/packages/patches/fltk-shared-lib-defines.patch \ %D%/packages/patches/fltk-xfont-on-demand.patch \ diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tool= s.scm index d0c164e..a55ed96 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -38,16 +38,15 @@ (define-public flashrom (package (name "flashrom") - (version "0.9.7") + (version "0.9.9") (source (origin (method url-fetch) (uri (string-append - "http://download.flashrom.org/releases/flashrom-" + "https://download.flashrom.org/releases/flashrom-" version ".tar.bz2")) (sha256 (base32 - "1s9pc4yls2s1gcg2ar4q75nym2z5v6lxq36bl6lq26br00nj2mas")) - (patches (search-patches "flashrom-use-libftdi1.patch")))) + "0i9wg1lyfg99bld7d00zqjm9f0lk6m0q3h3n9c195c9yysq5ccfb"))= )) (build-system gnu-build-system) (inputs `(("dmidecode" ,dmidecode) ("pciutils" ,pciutils) @@ -55,7 +54,9 @@ ("libftdi" ,libftdi))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments - '(#:make-flags (list "CC=3Dgcc" (string-append "PREFIX=3D" %output)= ) + '(#:make-flags (list "CC=3Dgcc" + (string-append "PREFIX=3D" %output) + "CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=3Dno") #:tests? #f ; no 'check' target #:phases (alist-delete diff --git a/gnu/packages/patches/flashrom-use-libftdi1.patch b/gnu/packa= ges/patches/flashrom-use-libftdi1.patch deleted file mode 100644 index a6051df..0000000 --- a/gnu/packages/patches/flashrom-use-libftdi1.patch +++ /dev/null @@ -1,70 +0,0 @@ -Update to libftdi-1.0 is advertised as a drop-in replacement for libftdi= , -running on top of libusb-1.0. This also removes indirect dependency to -libusb-0.1. - -Patch by Ky=C3=B6sti M=C3=A4lkki . -See . - ---- flashrom/Makefile.orig 2013-08-13 18:00:00.000000000 -0400 -+++ flashrom/Makefile 2014-08-05 03:10:40.217145375 -0400 -@@ -492,19 +492,21 @@ - ifeq ($(CONFIG_FT2232_SPI), yes) - # This is a totally ugly hack. - FEATURE_CFLAGS +=3D $(shell LC_ALL=3DC grep -q "FTDISUPPORT :=3D yes" .= features && printf "%s" "-D'CONFIG_FT2232_SPI=3D1'") --NEED_FTDI :=3D yes -+NEED_FTDI1 :=3D yes - PROGRAMMER_OBJS +=3D ft2232_spi.o - endif -=20 - ifeq ($(CONFIG_USBBLASTER_SPI), yes) - # This is a totally ugly hack. - FEATURE_CFLAGS +=3D $(shell LC_ALL=3DC grep -q "FTDISUPPORT :=3D yes" .= features && printf "%s" "-D'CONFIG_USBBLASTER_SPI=3D1'") --NEED_FTDI :=3D yes -+NEED_LIBUSB1 :=3D yes -+NEED_FTDI1 :=3D yes - PROGRAMMER_OBJS +=3D usbblaster_spi.o - endif -=20 --ifeq ($(NEED_FTDI), yes) --FTDILIBS :=3D $(shell pkg-config --libs libftdi 2>/dev/null || printf "= %s" "-lftdi -lusb") -+ifeq ($(NEED_FTDI1), yes) -+FTDILIBS :=3D $(shell pkg-config --libs libftdi1 2>/dev/null || printf = "%s" "-lftdi1 -lusb-1.0") -+FEATURE_CFLAGS +=3D $(shell pkg-config --cflags libftdi1 2>/dev/null) - FEATURE_CFLAGS +=3D $(shell LC_ALL=3DC grep -q "FT232H :=3D yes" .featu= res && printf "%s" "-D'HAVE_FT232H=3D1'") - FEATURE_LIBS +=3D $(shell LC_ALL=3DC grep -q "FTDISUPPORT :=3D yes" .fe= atures && printf "%s" "$(FTDILIBS)") - # We can't set NEED_USB here because that would transform libftdi auto-= enabling -@@ -781,6 +783,7 @@ - endif -=20 - define FTDI_TEST -+#include - #include - struct ftdi_context *ftdic =3D NULL; - int main(int argc, char **argv) -@@ -793,6 +796,7 @@ - export FTDI_TEST -=20 - define FTDI_232H_TEST -+#include - #include - enum ftdi_chip_type type =3D TYPE_232H; - endef -@@ -826,15 +830,15 @@ -=20 - features: compiler - @echo "FEATURES :=3D yes" > .features.tmp --ifeq ($(NEED_FTDI), yes) -+ifeq ($(NEED_FTDI1), yes) - @printf "Checking for FTDI support... " - @echo "$$FTDI_TEST" > .featuretest.c -- @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest= $(EXEC_SUFFIX) $(FTDILIBS) $(LIBS) >/dev/null 2>&1 && \ -+ @$(CC) $(CPPFLAGS) $(CFLAGS) $(FEATURE_CFLAGS) $(LDFLAGS) .featuretest= .c -o .featuretest$(EXEC_SUFFIX) $(FTDILIBS) $(LIBS) >/dev/null 2>&1 && \ - ( echo "found."; echo "FTDISUPPORT :=3D yes" >> .features.tmp ) || \ - ( echo "not found."; echo "FTDISUPPORT :=3D no" >> .features.tmp ) - @printf "Checking for FT232H support in libftdi... " - @echo "$$FTDI_232H_TEST" >> .featuretest.c -- @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest= $(EXEC_SUFFIX) $(FTDILIBS) $(LIBS) >/dev/null 2>&1 && \ -+ @$(CC) $(CPPFLAGS) $(CFLAGS) $(FEATURE_CFLAGS) $(LDFLAGS) .featuretest= .c -o .featuretest$(EXEC_SUFFIX) $(FTDILIBS) $(LIBS) >/dev/null 2>&1 && \ - ( echo "found."; echo "FT232H :=3D yes" >> .features.tmp ) || \ - ( echo "not found."; echo "FT232H :=3D no" >> .features.tmp ) - endif --------------2.9.1--