pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/flashrom Remove impossible check.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b199186dc8a4
branches:  trunk
changeset: 631475:b199186dc8a4
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Mar 06 15:46:39 2014 +0000

description:
Remove impossible check.

diffstat:

 sysutils/flashrom/distinfo                 |   3 ++-
 sysutils/flashrom/patches/patch-flashrom.c |  22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r d70abdd0d4cf -r b199186dc8a4 sysutils/flashrom/distinfo
--- a/sysutils/flashrom/distinfo        Thu Mar 06 15:45:45 2014 +0000
+++ b/sysutils/flashrom/distinfo        Thu Mar 06 15:46:39 2014 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2013/12/09 18:54:24 jakllsch Exp $
+$NetBSD: distinfo,v 1.8 2014/03/06 15:46:39 joerg Exp $
 
 SHA1 (flashrom-0.9.7.tar.bz2) = d08b4073ea3ebf63f03c3e502f4291f50ef348ee
 RMD160 (flashrom-0.9.7.tar.bz2) = e160e0ac1e0e138702f3f467707175df96b7e6b1
 Size (flashrom-0.9.7.tar.bz2) = 408883 bytes
+SHA1 (patch-flashrom.c) = 9867fa7ff7d0a55bff5fc0e6c8c6c901af6211f8
diff -r d70abdd0d4cf -r b199186dc8a4 sysutils/flashrom/patches/patch-flashrom.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/flashrom/patches/patch-flashrom.c        Thu Mar 06 15:46:39 2014 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-flashrom.c,v 1.1 2014/03/06 15:46:39 joerg Exp $
+
+--- flashrom.c.orig    2014-03-02 13:42:29.000000000 +0000
++++ flashrom.c
+@@ -1738,7 +1738,7 @@ int selfcheck(void)
+        * For 'flashchips' we check the first element to be non-null. In the
+        * other cases there exist use cases where the first element can be
+        * null. */
+-      if (flashchips == NULL || flashchips[0].vendor == NULL) {
++      if (flashchips[0].vendor == NULL) {
+               msg_gerr("Flashchips table miscompilation!\n");
+               ret = 1;
+       }
+@@ -1746,7 +1746,7 @@ int selfcheck(void)
+               if (selfcheck_eraseblocks(chip))
+                       ret = 1;
+ 
+-#if CONFIG_INTERNAL == 1
++#if 0 && CONFIG_INTERNAL == 1
+       if (chipset_enables == NULL) {
+               msg_gerr("Chipset enables table does not exist!\n");
+               ret = 1;



Home | Main Index | Thread Index | Old Index