Module Name: pkgsrc
Committed By: pgoyette
Date: Mon Jun 17 21:03:51 UTC 2019
Modified Files:
pkgsrc/sysutils/decode-dimms: Makefile distinfo
pkgsrc/sysutils/decode-dimms/patches: patch-decode-dimms
Log Message:
Remove attempts to access linux-specific SPD ROM data sources /sys/...
and /proc/sys/...
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/decode-dimms/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/decode-dimms/distinfo
cvs rdiff -u -r1.12 -r1.13 \
pkgsrc/sysutils/decode-dimms/patches/patch-decode-dimms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/decode-dimms/Makefile
diff -u pkgsrc/sysutils/decode-dimms/Makefile:1.14 pkgsrc/sysutils/decode-dimms/Makefile:1.15
--- pkgsrc/sysutils/decode-dimms/Makefile:1.14 Mon Apr 8 00:16:06 2019
+++ pkgsrc/sysutils/decode-dimms/Makefile Mon Jun 17 21:03:50 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2019/04/08 00:16:06 pgoyette Exp $
+# $NetBSD: Makefile,v 1.15 2019/06/17 21:03:50 pgoyette Exp $
# no Release yet
_DATE= 20190405
-PKGREVISION= 1
+PKGREVISION= 2
GIT_COMMIT= cea0000657a2dde506df91ecce6b18ac2d7224db
DISTNAME= i2c-tools-${GIT_COMMIT}
PKGNAME= decode-dimms-0.0.${_DATE}
Index: pkgsrc/sysutils/decode-dimms/distinfo
diff -u pkgsrc/sysutils/decode-dimms/distinfo:1.13 pkgsrc/sysutils/decode-dimms/distinfo:1.14
--- pkgsrc/sysutils/decode-dimms/distinfo:1.13 Mon Apr 8 00:16:06 2019
+++ pkgsrc/sysutils/decode-dimms/distinfo Mon Jun 17 21:03:50 2019
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2019/04/08 00:16:06 pgoyette Exp $
+$NetBSD: distinfo,v 1.14 2019/06/17 21:03:50 pgoyette Exp $
SHA1 (i2c-tools-cea0000657a2dde506df91ecce6b18ac2d7224db.tar.gz) = bcca6f8b031bd3797eb9db1cf241063b5e885cd4
RMD160 (i2c-tools-cea0000657a2dde506df91ecce6b18ac2d7224db.tar.gz) = b5b837bd277138ba334003c7143c9eacc41aae8f
SHA512 (i2c-tools-cea0000657a2dde506df91ecce6b18ac2d7224db.tar.gz) = 90f7af2521ee2984b5e107f1fedd12238e6d8fef66d15c9a21d422d40d530cf4f8993570251c40ff1f5bcd262f85cb188d63a7b70ab48d54dc5fc431b6784421
Size (i2c-tools-cea0000657a2dde506df91ecce6b18ac2d7224db.tar.gz) = 98243 bytes
-SHA1 (patch-decode-dimms) = 91a5d3fb31fc4b2b53dccdfac71c6aa806f22e4f
+SHA1 (patch-decode-dimms) = c586b20a7d29e6785043409c1599bfc94771f26d
SHA1 (patch-decode-dimms.1) = c1c1444a73fa848eda0223e2c176819d4ded6641
Index: pkgsrc/sysutils/decode-dimms/patches/patch-decode-dimms
diff -u pkgsrc/sysutils/decode-dimms/patches/patch-decode-dimms:1.12 pkgsrc/sysutils/decode-dimms/patches/patch-decode-dimms:1.13
--- pkgsrc/sysutils/decode-dimms/patches/patch-decode-dimms:1.12 Mon Apr 8 00:16:06 2019
+++ pkgsrc/sysutils/decode-dimms/patches/patch-decode-dimms Mon Jun 17 21:03:51 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-decode-dimms,v 1.12 2019/04/08 00:16:06 pgoyette Exp $
+$NetBSD: patch-decode-dimms,v 1.13 2019/06/17 21:03:51 pgoyette Exp $
Add NetBSD-specific ability to use spdmem(4)'s sysctl values as
-input.
+input. Remove attempts to use linux-specific data sources.
---- eeprom/decode-dimms.orig 2019-01-17 13:29:22.361611073 +0800
-+++ eeprom/decode-dimms 2019-01-17 13:35:48.518437248 +0800
+--- eeprom/decode-dimms.orig 2019-06-17 13:50:38.126887013 -0700
++++ eeprom/decode-dimms 2019-06-17 13:51:53.574600812 -0700
@@ -42,8 +42,9 @@
use Fcntl qw(:DEFAULT :seek);
use File::Basename;
@@ -102,16 +102,15 @@ input.
}
# Default values
-@@ -2564,7 +2598,7 @@
+@@ -2564,7 +2598,6 @@
# * chk_spd: The checksum or CRC value found in the EEPROM
# * chk_calc: The checksum or CRC computed from the EEPROM data
# Keys are added over time.
-@dimm = get_dimm_list() unless $use_hexdump;
-+@dimm = get_dimm_list() unless ($use_sysctl || $use_hexdump);
for my $i (0 .. $#dimm) {
my @bytes = readspd(0, 128, $dimm[$i]->{file});
-@@ -2616,7 +2650,7 @@
+@@ -2616,7 +2649,7 @@
printl("Decoding EEPROM", $dimm[$current]->{eeprom});
}