From patchwork Mon Apr 11 09:46:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 608720 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 3qk4vy6l9qz9sdn for ; Mon, 11 Apr 2016 19:46:38 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=boundarydevices-com.20150623.gappssmtp.com header.i=@boundarydevices-com.20150623.gappssmtp.com header.b=sWXljMef; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 24294A622C; Mon, 11 Apr 2016 09:46:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uR9ICY1a9WCn; Mon, 11 Apr 2016 09:46:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9E261A621F; Mon, 11 Apr 2016 09:46:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id AD6BF1C1654 for ; Mon, 11 Apr 2016 09:46:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A7EF991EB5 for ; Mon, 11 Apr 2016 09:46:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S-k0QbFDtUMA for ; Mon, 11 Apr 2016 09:46:33 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by whitealder.osuosl.org (Postfix) with ESMTPS id 65BF691E32 for ; Mon, 11 Apr 2016 09:46:33 +0000 (UTC) Received: by mail-wm0-f44.google.com with SMTP id n3so96641487wmn.0 for ; Mon, 11 Apr 2016 02:46:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=hmMtzzGptVcs37nkh7+wS5W/uwuy0IMSveqAL7pSP7M=; b=sWXljMefhh3fVDXZat/TE8ICjH5jpxPP5ZE+H4d6Hb9Fv9ZMzhc5bLJrc6NbHmtXNq zoKrmWoFrYtIOV91S8P1EaM5rt5oqeneOHoPulPfn7Hmw0ggFT2WUa8MBtpn3+UpzyCz XbbAAxK9EfzEK0evOueiUh9p3Sx3QbbFtiErGgFU1nm4Hpq3H7/Y5h7jcWLbqLbFVnl8 ho4aFzKteTvghsT7KsoRFKfnDRHwBq7dfmyxCZrSrSM/dmlSUoDlnVlZ2PMMEfKKlDzX B3Na/2vZuEclJxynTHEf+ChD3B1z7atNDRk2ssANvlN9NNdwnT0R/qXmiLVKNsC1MuXK EFVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=hmMtzzGptVcs37nkh7+wS5W/uwuy0IMSveqAL7pSP7M=; b=YxJcGs7UdiONhBXy5TblKN+OrcWzBp3joDzjTBn9VrsUiQxdpMrATspozjUz+1nORp JUBQUskkXdBK+bgKnQE4UcePtRz1YAKiQetobrqfxpvi9lwdx0MxDKPA5Bal6JvbiegT xUYApWcljJVsR9ngEab7xW/mgtxHA9Qb7qJMT/5B4tESwD7lFrlgS1VEgFBZFcvkvWLU qcu9uWJhyk/9Qgm2g0RrnERj9hf0vf2t2MMpkG35dgDc07B7i0xc2xBt42j/NEPD/UTG lMrijbtG18cc+OWtOPPZnlGDfe0pW4istfZuE4yHgk7tjlfcqbpSRSLEhg0lZs5BBObF r9Vw== X-Gm-Message-State: AD7BkJLWlu9WT+dX7XhFeQOnyXb4RcImUjnK3j+msxyD7uE6BGTCLhCNVxCttFSgD1+sBw== X-Received: by 10.194.92.107 with SMTP id cl11mr25236822wjb.21.1460367991668; Mon, 11 Apr 2016 02:46:31 -0700 (PDT) Received: from t450s.lan (89-92-156-188.hfc.dyn.abo.bbox.fr. [89.92.156.188]) by smtp.googlemail.com with ESMTPSA id d2sm26938895wjf.28.2016.04.11.02.46.30 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Apr 2016 02:46:31 -0700 (PDT) From: Gary Bisson To: buildroot@busybox.net Date: Mon, 11 Apr 2016 11:46:26 +0200 Message-Id: <1460367986-22594-1-git-send-email-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.7.0 Subject: [Buildroot] [PATCH] flashrom: bump to version 0.9.9 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Here are the release notes: https://www.flashrom.org/Flashrom/0.9.9 Note that this version brings many cross-platform and cross-architecture improvements like musl/uclibc support. Therefore the patches can be removed as now fixed upstream. Also remove the architecture limitation since MIPS, PPC, ARM, PPC64, ARM64, SPARC, SH, M68K are all supported now. Signed-off-by: Gary Bisson --- Hi all, I've had to use flashrom and realized the current package was limited to x86 architectures. Looking into it, it seems that most architectures are now supported so I simply removed the limitation. However I haven't tried to build against all the possible architectures. Is it possible to cherry-pick (without merging) that patch and make the build server try them all? One thing is for sure, it works great on ARM. Regards, Gary --- package/flashrom/0001-spi.patch | 25 ------------------------- package/flashrom/0002-sys-io.h.patch | 27 --------------------------- package/flashrom/Config.in | 2 -- package/flashrom/flashrom.hash | 2 +- package/flashrom/flashrom.mk | 2 +- 5 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 package/flashrom/0001-spi.patch delete mode 100644 package/flashrom/0002-sys-io.h.patch diff --git a/package/flashrom/0001-spi.patch b/package/flashrom/0001-spi.patch deleted file mode 100644 index 22ffcb5..0000000 --- a/package/flashrom/0001-spi.patch +++ /dev/null @@ -1,25 +0,0 @@ -linux_spi: add missing include - -Some defines (e.g. _IOC_SIZEBITS) are defined in linux/ioctl.h, -so it must be included before it is used, by SPI_IOC_MESSAGE -from linux/spi/spidev.h - -Fixes build errors with the musl C library, as seen in these -Buildroot autobuilder failures: - - http://autobuild.buildroot.org/results/2a3/2a3744007c630c267575a638ebcd83a4b97644f5/build-end.log - http://autobuild.buildroot.org/results/3de/3de936d9be79e151e66af15193084d82a0f2c04a/build-end.log - -Signed-off-by: "Yann E. MORIN" - -diff -durN flashrom-0.9.8.orig/linux_spi.c flashrom-0.9.8/linux_spi.c ---- flashrom-0.9.8.orig/linux_spi.c 2015-10-28 19:42:38.480285847 +0100 -+++ flashrom-0.9.8/linux_spi.c 2015-10-28 19:43:15.492994613 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include "flash.h" diff --git a/package/flashrom/0002-sys-io.h.patch b/package/flashrom/0002-sys-io.h.patch deleted file mode 100644 index 8d990c6..0000000 --- a/package/flashrom/0002-sys-io.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -hwaccess: sys/io.h is not specific to glibc - -Under Linux, sys/io.h provides inb and outb, so we really need it. -However, its inclusion is conditional to the _GLIBC_ define. This is -usually OK under Linux, since both glibc and uClibc define it (uclibc -fakes being glibc). - -But the musl C library does not impersonate glibc, so we're missing -including sys/io.h in this case. - -Change the include from checking _GLIBC_ to checking whether this is -Linux, looking for the __linux__ define. - -Signed-off-by: "Yann E. MORIN" - -diff -durN flashrom-0.9.8.orig/hwaccess.h flashrom-0.9.8/hwaccess.h ---- flashrom-0.9.8.orig/hwaccess.h 2015-02-10 09:03:10.000000000 +0100 -+++ flashrom-0.9.8/hwaccess.h 2015-10-28 20:01:54.259202484 +0100 -@@ -27,7 +27,7 @@ - #include "platform.h" - - #if IS_X86 --#if defined(__GLIBC__) -+#if defined(__linux__) - #include - #endif - #endif diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in index adc068c..46fa641 100644 --- a/package/flashrom/Config.in +++ b/package/flashrom/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_FLASHROM select BR2_PACKAGE_LIBFTDI # dmidecode is only a runtime dependency select BR2_PACKAGE_DMIDECODE - depends on BR2_i386 || BR2_x86_64 depends on BR2_TOOLCHAIN_HAS_THREADS # libusb help flashrom is a utility for identifying, reading, writing, @@ -18,5 +17,4 @@ config BR2_PACKAGE_FLASHROM http://flashrom.org/ comment "flashrom needs a toolchain w/ threads" - depends on BR2_i386 || BR2_x86_64 depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash index a216869..27328e4 100644 --- a/package/flashrom/flashrom.hash +++ b/package/flashrom/flashrom.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 13dc7c895e583111ecca370363a3527d237d178a134a94b20db7df177c05f934 flashrom-0.9.8.tar.bz2 +sha256 cb3156b0f63eb192024b76c0814135930297aac41f80761a5d293de769783c45 flashrom-0.9.9.tar.bz2 diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 7e0fcf2..7ebda33 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLASHROM_VERSION = 0.9.8 +FLASHROM_VERSION = 0.9.9 FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = http://download.flashrom.org/releases FLASHROM_DEPENDENCIES = pciutils libusb libusb-compat libftdi host-pkgconf