flashrom: use upstream flashrom, hack Makefile to not build man pages

tlaurion · Apr 13, 2023 · 0d49979 · 0d49979
1 parent 385a055
commit 0d49979
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/modules/flashrom b/modules/flashrom
@@ -2,20 +2,18 @@ modules-$(CONFIG_FLASHROM) += flashrom
 
 flashrom_depends := pciutils libusb $(musl_dep)
 
-flashrom_version := 6b2061bc0699202f81aeb782f301f1bba9f8a826
+flashrom_version := f3c21c6439f8bbd2911f120c55f301982ecd35bc
 flashrom_dir := flashrom-$(flashrom_version)
 flashrom_tar := $(flashrom_dir).tar.gz
-flashrom_url := https://github.com/Dasharo/flashrom/archive/$(flashrom_version).tar.gz
-flashrom_hash := 1295be687e1d3806e1489671ad4e1abe1561e83010e43eff367a35dfb603ab51
+flashrom_url := https://github.com/flashrom/flashrom/archive/$(flashrom_version).tar.gz
+flashrom_hash := 7599da318add71510bd2ecd88f2007e35db21ba8d7bd8b38e42a9ac13f869a63
 
 # Default options for flashrom
 flashrom_cfg := \
 	WARNERROR=no \
 	CONFIG_NOTHING=yes \
 	CONFIG_INTERNAL=yes \
 	CONFIG_INTERNAL_X86=yes \
-	CONFIG_DUMMY=yes \
-	CONFIG_AST1100=yes \
 
 ifeq "$(CONFIG_TARGET_ARCH)" "ppc64"
 flashrom_cfg := \

diff --git a/patches/flashrom-f3c21c6439f8bbd2911f120c55f301982ecd35bc.patch b/patches/flashrom-f3c21c6439f8bbd2911f120c55f301982ecd35bc.patch
@@ -0,0 +1,11 @@
+--- flashrom-f3c21c6439f8bbd2911f120c55f301982ecd35bc/Makefile.orig	2023-04-13 10:06:26.384000000 -0400
++++ flashrom-f3c21c6439f8bbd2911f120c55f301982ecd35bc/Makefile	2023-04-13 10:06:37.032000000 -0400
+@@ -958,7 +958,7 @@
+ OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS)
+
+
+-all: $(PROGRAM)$(EXEC_SUFFIX) man8/$(PROGRAM).8
++all: $(PROGRAM)$(EXEC_SUFFIX)
+ ifeq ($(ARCH), x86)
+ 	@+$(MAKE) -C util/ich_descriptors_tool/ HOST_OS=$(HOST_OS) TARGET_OS=$(TARGET_OS)
+ endif