update to flashrom-1.1

This commit is contained in:
sthen 2019-07-05 16:01:57 +00:00
parent 60cd7534f1
commit 8bea60f825
7 changed files with 20 additions and 19 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.10 2019/06/07 10:37:45 kn Exp $
# $OpenBSD: Makefile,v 1.11 2019/07/05 16:01:57 sthen Exp $
ONLY_FOR_ARCHS= i386 amd64
COMMENT= flash ROM programmer for BIOS etc
V = 1.0.1
V = 1.1
DISTNAME= flashrom-v${V}
PKGNAME= flashrom-${V}
EXTRACT_SUFX= .tar.bz2

View File

@ -1,2 +1,2 @@
SHA256 (flashrom-v1.0.1.tar.bz2) = 1Xn43aW2nuq1WmWNWf++GFRD5OhHfnUarzjDZGjO3kQ=
SIZE (flashrom-v1.0.1.tar.bz2) = 325720
SHA256 (flashrom-v1.1.tar.bz2) = rq2pxwwiQhIXxmk1YYDA3t3Qtgh25j0iJOMmC5DBThk=
SIZE (flashrom-v1.1.tar.bz2) = 348458

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile,v 1.3 2018/01/16 22:16:41 sthen Exp $
$OpenBSD: patch-Makefile,v 1.4 2019/07/05 16:01:57 sthen Exp $
use patched pciutils.
@ -7,7 +7,7 @@ fix clock_gettime detection.
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -1004,7 +1004,6 @@ FEATURE_CFLAGS += $(call debug_shell,grep -q "UTSNAME
@@ -1075,7 +1075,6 @@ FEATURE_CFLAGS += $(call debug_shell,grep -q "UTSNAME
FEATURE_LIBS += $(call debug_shell,grep -q "NEEDLIBZ := yes" .libdeps && printf "%s" "-lz")
FEATURE_CFLAGS += $(call debug_shell,grep -q "CLOCK_GETTIME := yes" .features && printf "%s" "-D'HAVE_CLOCK_GETTIME=1'")
@ -15,7 +15,7 @@ Index: Makefile
LIBFLASHROM_OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS)
OBJS = $(CLI_OBJS) $(LIBFLASHROM_OBJS)
@@ -1082,11 +1081,7 @@ endif
@@ -1153,11 +1152,7 @@ endif
define LIBPCI_TEST
/* Avoid a failing test due to libpci header symbol shadowing breakage */
#define index shadow_workaround_index
@ -28,7 +28,7 @@ Index: Makefile
struct pci_access *pacc;
int main(int argc, char **argv)
{
@@ -1101,11 +1096,7 @@ export LIBPCI_TEST
@@ -1172,11 +1167,7 @@ export LIBPCI_TEST
define PCI_GET_DEV_TEST
/* Avoid a failing test due to libpci header symbol shadowing breakage */
#define index shadow_workaround_index
@ -41,7 +41,7 @@ Index: Makefile
struct pci_access *pacc;
struct pci_dev *dev = {0};
int main(int argc, char **argv)
@@ -1358,8 +1349,8 @@ endif
@@ -1490,8 +1481,8 @@ endif
( echo "not found."; echo "UTSNAME := no" >> .features.tmp ) } 2>>$(BUILD_DETAILS_FILE) | tee -a $(BUILD_DETAILS_FILE)
@printf "Checking for clock_gettime support... " | tee -a $(BUILD_DETAILS_FILE)
@echo "$$CLOCK_GETTIME_TEST" >.featuretest.c

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-flashrom_8_tmpl,v 1.1 2018/01/16 22:16:41 sthen Exp $
$OpenBSD: patch-flashrom_8_tmpl,v 1.2 2019/07/05 16:01:57 sthen Exp $
Index: flashrom.8.tmpl
--- flashrom.8.tmpl.orig
+++ flashrom.8.tmpl
@@ -1144,7 +1144,7 @@ On OpenBSD, you can obtain raw access permission by se
@@ -1268,7 +1268,7 @@ On OpenBSD, you can obtain raw access permission by se
.B "securelevel=-1"
in
.B "/etc/rc.securelevel"

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-hwaccess_c,v 1.3 2018/01/16 22:16:41 sthen Exp $
$OpenBSD: patch-hwaccess_c,v 1.4 2019/07/05 16:01:57 sthen Exp $
Index: hwaccess.c
--- hwaccess.c.orig
+++ hwaccess.c
@@ -124,8 +124,8 @@ int rget_io_perms(void)
@@ -120,8 +120,8 @@ int rget_io_perms(void)
msg_perr("ERROR: Could not get I/O privileges (%s).\n", strerror(errno));
msg_perr("You need to be root.\n");
#if defined (__OpenBSD__)

View File

@ -1,10 +1,11 @@
$OpenBSD: patch-hwaccess_h,v 1.1.1.1 2016/06/01 16:42:23 sthen Exp $
$OpenBSD: patch-hwaccess_h,v 1.2 2019/07/05 16:01:57 sthen Exp $
use patched pciutils.
--- hwaccess.h.orig Sat Feb 20 21:43:56 2016
+++ hwaccess.h Mon May 30 23:26:58 2016
@@ -34,7 +34,9 @@
Index: hwaccess.h
--- hwaccess.h.orig
+++ hwaccess.h
@@ -30,7 +30,9 @@
*/
#define index shadow_workaround_index

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-physmap_c,v 1.2 2018/01/16 22:16:41 sthen Exp $
$OpenBSD: patch-physmap_c,v 1.3 2019/07/05 16:01:57 sthen Exp $
Index: physmap.c
--- physmap.c.orig
+++ physmap.c
@@ -288,9 +288,8 @@ static void *physmap_common(const char *descr, uintptr
@@ -284,9 +284,8 @@ static void *physmap_common(const char *descr, uintptr
msg_perr("disabling the other option unfortunately requires a kernel recompile. Sorry!\n");
}
#elif defined (__OpenBSD__)