Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 5B6401A923A for ; Thu, 28 Oct 2021 20:18:39 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 0085484FE1; Thu, 28 Oct 2021 20:18:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1DA6C84FE8 for ; Thu, 28 Oct 2021 20:18:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id L-Pb-jVhbOPu for ; Thu, 28 Oct 2021 20:18:22 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3511984FC0 for ; Thu, 28 Oct 2021 20:18:21 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 32035FA97; Thu, 28 Oct 2021 20:18:21 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_163545230187700" MIME-Version: 1.0 Date: Thu, 28 Oct 2021 20:18:21 +0000 From: "Paul Goyette" Subject: CVS commit: pkgsrc/sysutils/decode-dimms To: pkgsrc-changes@NetBSD.org Reply-To: pgoyette@netbsd.org X-Mailer: log_accum Message-Id: <20211028201821.32035FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_163545230187700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pgoyette Date: Thu Oct 28 20:18:21 UTC 2021 Modified Files: pkgsrc/sysutils/decode-dimms: Makefile distinfo pkgsrc/sysutils/decode-dimms/patches: patch-decode-dimms Log Message: decode-dimms: Update to upstream v4.3 Change log: decode-dimms: Actually decode LPDDR3 modules In commit 78ed68308b58 ("decode-dimms: Decode manufacturing data for LPDDR3") we said we would handle LPDDR3 the same as DDR3, however it was actually only done for the manufacturing data. Extend the idea to the rest of the script. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/decode-dimms/Makefile cvs rdiff -u -r1.23 -r1.24 pkgsrc/sysutils/decode-dimms/distinfo cvs rdiff -u -r1.18 -r1.19 \ 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. --_----------=_163545230187700 Content-Disposition: inline Content-Length: 5790 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/decode-dimms/Makefile diff -u pkgsrc/sysutils/decode-dimms/Makefile:1.30 pkgsrc/sysutils/decode-dimms/Makefile:1.31 --- pkgsrc/sysutils/decode-dimms/Makefile:1.30 Mon May 24 19:54:10 2021 +++ pkgsrc/sysutils/decode-dimms/Makefile Thu Oct 28 20:18:20 2021 @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.30 2021/05/24 19:54:10 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2021/10/28 20:18:20 pgoyette Exp $ # Track upstream's HEAD -PKG_DATE= 20201004 -GIT_COMMIT= 9cba52b9626413307b994af44695b8a9c0e058be +PKG_DATE= 20210722 +GIT_COMMIT= d8bc1f1ff4b00a6bd988aa114100ae9b787f50d8 DISTNAME= i2c-tools-${GIT_COMMIT} -PKGNAME= decode-dimms-4.2.${PKG_DATE} -PKGREVISION= 1 +PKGNAME= decode-dimms-4.3.${PKG_DATE} CATEGORIES= sysutils MASTER_SITES= https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/snapshot/ @@ -18,9 +17,9 @@ USE_TOOLS+= perl:run REPLACE_PERL= eeprom/decode-dimms SUBST_CLASSES+= rev -SUBST_STAGE.rev= post-extract +SUBST_STAGE.rev= post-patch SUBST_FILES.rev= eeprom/decode-dimms -SUBST_SED.rev= -e '/I2C_TOOLS_VER/s/4.2/4.2-${PKG_DATE}/' +SUBST_SED.rev= -e '/I2C_TOOLS_VER/s/4.3/4.3-${PKG_DATE}/' NO_BUILD= yes Index: pkgsrc/sysutils/decode-dimms/distinfo diff -u pkgsrc/sysutils/decode-dimms/distinfo:1.23 pkgsrc/sysutils/decode-dimms/distinfo:1.24 --- pkgsrc/sysutils/decode-dimms/distinfo:1.23 Tue Oct 26 11:19:29 2021 +++ pkgsrc/sysutils/decode-dimms/distinfo Thu Oct 28 20:18:20 2021 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.23 2021/10/26 11:19:29 nia Exp $ +$NetBSD: distinfo,v 1.24 2021/10/28 20:18:20 pgoyette Exp $ -BLAKE2s (i2c-tools-9cba52b9626413307b994af44695b8a9c0e058be.tar.gz) = bcd5b5f2563c4d3447dac5bccba8175073c2c94bb4eb1089d66cc859855eb87f -SHA512 (i2c-tools-9cba52b9626413307b994af44695b8a9c0e058be.tar.gz) = 1008fbf6135fa1e1ed53c679cb76b3f4d6d2cfe1ed8f79516625c80b57c5b9b03e6cec391402f43d1cfd35cd75d642e13413a0f52cb1c164d3525a3493860fc1 -Size (i2c-tools-9cba52b9626413307b994af44695b8a9c0e058be.tar.gz) = 102950 bytes -SHA1 (patch-decode-dimms) = 8f8f03cb1bae03a5572bb65f88dfce216f98549f +BLAKE2s (i2c-tools-d8bc1f1ff4b00a6bd988aa114100ae9b787f50d8.tar.gz) = 874d17dd335c827df520f4617c4becb612a9b252fdab5a6d734d718cc7661d94 +SHA512 (i2c-tools-d8bc1f1ff4b00a6bd988aa114100ae9b787f50d8.tar.gz) = 37a8fb5b517bc91595e2faf04c76d95ccaa17ef1e3d1e2ca6feb55130361ea27242997c743201269abba493b0ba495f477a19ffe21061a7181b4be149cf85912 +Size (i2c-tools-d8bc1f1ff4b00a6bd988aa114100ae9b787f50d8.tar.gz) = 95051 bytes +SHA1 (patch-decode-dimms) = b964e5df41acb192d04cea01c21ec95222aefc99 SHA1 (patch-decode-dimms.1) = 349c0af6c639f7752e03f78d089bbb414bc1a2e7 Index: pkgsrc/sysutils/decode-dimms/patches/patch-decode-dimms diff -u pkgsrc/sysutils/decode-dimms/patches/patch-decode-dimms:1.18 pkgsrc/sysutils/decode-dimms/patches/patch-decode-dimms:1.19 --- pkgsrc/sysutils/decode-dimms/patches/patch-decode-dimms:1.18 Mon Sep 7 14:50:25 2020 +++ pkgsrc/sysutils/decode-dimms/patches/patch-decode-dimms Thu Oct 28 20:18:21 2021 @@ -1,10 +1,10 @@ -$NetBSD: patch-decode-dimms,v 1.18 2020/09/07 14:50:25 pgoyette Exp $ +$NetBSD: patch-decode-dimms,v 1.19 2021/10/28 20:18:21 pgoyette Exp $ Add NetBSD-specific ability to use spdmem(4)'s sysctl values as input. Remove attempts to use linux-specific data sources. ---- eeprom/decode-dimms.orig 2020-09-07 07:41:27.782730720 -0700 -+++ eeprom/decode-dimms 2020-09-07 07:42:58.255264706 -0700 +--- eeprom/decode-dimms.orig 2021-07-22 04:10:34.000000000 -0700 ++++ eeprom/decode-dimms 2021-10-28 13:01:32.530284359 -0700 @@ -45,8 +45,9 @@ use Fcntl qw(:DEFAULT :seek); use File::Basename; @@ -26,7 +26,7 @@ input. Remove attempts to use linux-spe # We consider that no data was written to this area of the SPD EEPROM if # all bytes read 0x00 or all bytes read 0xff -@@ -2436,6 +2437,26 @@ +@@ -2437,6 +2438,26 @@ } } @@ -53,7 +53,7 @@ input. Remove attempts to use linux-spe # Read bytes from SPD-EEPROM # Note: offset must be a multiple of 16! sub readspd($$$) -@@ -2449,20 +2470,13 @@ +@@ -2450,20 +2471,13 @@ $size = @bytes - $offset; } return @bytes[$offset..($offset + $size - 1)]; @@ -80,7 +80,7 @@ input. Remove attempts to use linux-spe } else { # Kernel 2.4 with procfs for my $i (0 .. ($size-1)/16) { -@@ -2528,7 +2542,7 @@ +@@ -2529,7 +2543,7 @@ # Parse command-line foreach (@ARGV) { if ($_ eq '-h' || $_ eq '--help') { @@ -89,7 +89,7 @@ input. Remove attempts to use linux-spe " $0 -h\n\n", " -f, --format Print nice html output\n", " -b, --bodyonly Don't print html header\n", -@@ -2542,6 +2556,8 @@ +@@ -2543,6 +2557,8 @@ " -x, Read data from hexdump files\n", " -X, Same as -x except treat multibyte hex\n", " data as little endian\n", @@ -98,7 +98,7 @@ input. Remove attempts to use linux-spe " -h, --help Display this usage summary\n"; print <<"EOF"; -@@ -2586,85 +2602,25 @@ +@@ -2587,85 +2603,25 @@ $use_hexdump = LITTLEENDIAN; next; } @@ -192,7 +192,7 @@ input. Remove attempts to use linux-spe # @dimm is a list of hashes. There's one hash for each EEPROM we found. # Each hash has the following keys: # * eeprom: Name of the eeprom data file -@@ -2677,7 +2633,6 @@ +@@ -2678,7 +2634,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. @@ -200,7 +200,7 @@ input. Remove attempts to use linux-spe for my $i (0 .. $#dimm) { my @bytes = readspd(0, 128, $dimm[$i]->{file}); -@@ -2729,7 +2684,7 @@ +@@ -2730,7 +2685,7 @@ printl("Decoding EEPROM", $dimm[$current]->{eeprom}); } --_----------=_163545230187700--