Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

flashrom: update to v0.9.9

Browse source 
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas 2016-03-14 19:03:22 +01:00
parent 9afd29558a
commit 1348057082
4 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
utils/flashrom/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2010-2015 OpenWrt.org # Copyright (C) 2010-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=flashrom PKG_NAME:=flashrom
PKG_VERSION:=0.9.8 PKG_VERSION:=0.9.9
PKG_RELEASE:=6 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://download.flashrom.org/releases PKG_SOURCE_URL:=http://download.flashrom.org/releases
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_MD5SUM:=ac513076b63ab7eb411a7694bb8f6fda PKG_MD5SUM:=aab9c98925d9cfb5ffb28b67a6112530
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com> PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
@ -44,10 +44,11 @@ define Package/flashrom
$(Package/flashrom/default) $(Package/flashrom/default)
TITLE+= (full) TITLE+= (full)
DEPENDS+= \ DEPENDS+= \
+(PACKAGE_flashrom&&(TARGET_x86||TARGET_x86_64)):dmidecode \ +(TARGET_x86||TARGET_x86_64):dmidecode \
+PACKAGE_flashrom:libftdi \ +libftdi1 \
+PACKAGE_flashrom:libusb-compat \ +libusb-1.0 \
+PACKAGE_flashrom:pciutils +libusb-compat \
+pciutils
VARIANT:=full VARIANT:=full
DEFAULT_VARIANT:=1 DEFAULT_VARIANT:=1
endef endef
@ -56,8 +57,8 @@ define Package/flashrom-pci
$(Package/flashrom/default) $(Package/flashrom/default)
TITLE+= (pci) TITLE+= (pci)
DEPENDS+= \ DEPENDS+= \
+(PACKAGE_flashrom-pci&&(TARGET_x86||TARGET_x86_64)):dmidecode \ +(TARGET_x86||TARGET_x86_64):dmidecode \
+PACKAGE_flashrom-pci:pciutils +pciutils
VARIANT:=pci VARIANT:=pci
endef endef
@ -71,8 +72,9 @@ define Package/flashrom-usb
$(Package/flashrom/default) $(Package/flashrom/default)
TITLE+= (usb) TITLE+= (usb)
DEPENDS+= \ DEPENDS+= \
+PACKAGE_flashrom-usb:libftdi \ +libftdi1 \
+PACKAGE_flashrom-usb:libusb-compat +libusb-1.0 \
+libusb-compat
VARIANT:=usb VARIANT:=usb
endef endef

10
utils/flashrom/flashrom.mk
View file

@ -82,7 +82,11 @@ $(eval $(call DefineProgrammer,SERPROG,$(FLASHROM_SERIAL)))
$(eval $(call DefineProgrammer,PONY_SPI,$(FLASHROM_SERIAL))) $(eval $(call DefineProgrammer,PONY_SPI,$(FLASHROM_SERIAL)))
$(eval $(call DefineProgrammer,BUSPIRATE_SPI,$(FLASHROM_SERIAL))) $(eval $(call DefineProgrammer,BUSPIRATE_SPI,$(FLASHROM_SERIAL)))
# USB # USB0
$(eval $(call DefineConfig,USB,$(FLASHROM_USB))) $(eval $(call DefineConfig,USB0,$(FLASHROM_USB)))
$(eval $(call DefineProgrammer,PICKIT2_SPI,$(FLASHROM_USB))) $(eval $(call DefineProgrammer,PICKIT2_SPI,$(FLASHROM_USB)))
#$(eval $(call DefineProgrammer,DEDIPROG,$(FLASHROM_USB)))
# USB1
$(eval $(call DefineConfig,USB1,$(FLASHROM_USB)))
$(eval $(call DefineProgrammer,CH341A_SPI,$(FLASHROM_USB)))
$(eval $(call DefineProgrammer,DEDIPROG,$(FLASHROM_USB)))

0
utils/flashrom/patches/0003-fix-io-h-include.patch → utils/flashrom/patches/0002-fix-io-h-include.patch
View file

12
utils/flashrom/patches/0002-fix-musl-compatibility.patch
View file

@ -1,12 +0,0 @@
diff -uprN a/linux_spi.c b/linux_spi.c
--- a/linux_spi.c 2015-06-17 20:50:36.492963100 +0200
+++ b/linux_spi.c 2015-06-17 20:50:00.444860800 +0200
@@ -22,7 +22,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
#include <errno.h>
#include <ctype.h>
#include <unistd.h>