diff --git a/0012-dmidecode-Unmask-LRDIMM-in-memory-type-detail.patch b/0012-dmidecode-Unmask-LRDIMM-in-memory-type-detail.patch new file mode 100644 index 0000000..1522fba --- /dev/null +++ b/0012-dmidecode-Unmask-LRDIMM-in-memory-type-detail.patch @@ -0,0 +1,57 @@ +From 23aa50565a65c98fc452ed8ffdffb49b6504941d Mon Sep 17 00:00:00 2001 +From: Petr Oros +Date: Thu, 30 Jun 2016 11:50:30 +0200 +Subject: [PATCH 12/12] dmidecode: Unmask LRDIMM in memory type detail + +For memory with bit 15 only set, dmidecode would show "None" in type +detail. + +Fixes: 0740adaea98a ("Bump release verison to 2.12") +Signed-off-by: Petr Oros +Signed-off-by: Jean Delvare +--- + AUTHORS | 1 + + CHANGELOG | 4 ++++ + dmidecode.c | 2 +- + 3 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/AUTHORS b/AUTHORS +index ccf7fbb..748b985 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -20,6 +20,7 @@ Anton Arapov + Roy Franz + Tyler Bell + Xie XiuQi ++Petr Oros + + MANY THANKS TO (IN CHRONOLOGICAL ORDER) + Werner Heuser +diff --git a/CHANGELOG b/CHANGELOG +index ba61cab..ebae4b3 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,7 @@ ++2016-06-30 Petr Oros ++ ++ * dmidecode.c: Unmask LRDIMM in memory type detail (DMI type 17). ++ + 2015-11-02 Jean Delvare + + * dmidecode.c, util.c, util.h: Let read_file return the actual data +diff --git a/dmidecode.c b/dmidecode.c +index 84c18e1..48d9e66 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -2392,7 +2392,7 @@ static void dmi_memory_device_type_detail(u16 code) + "LRDIMM" /* 15 */ + }; + +- if ((code & 0x7FFE) == 0) ++ if ((code & 0xFFFE) == 0) + printf(" None"); + else + { +-- +2.7.4 + diff --git a/dmidecode.spec b/dmidecode.spec index 210702b..b7e6532 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -1,7 +1,7 @@ Summary: Tool to analyse BIOS DMI data Name: dmidecode Version: 3.0 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Group: System Environment/Base License: GPLv2+ @@ -18,7 +18,7 @@ Patch8: 0008-dmidecode-Use-read_file-to-read-the-DMI-table-from-s.patch Patch9: 0009-dmidecode-Check-sysfs-entry-point-length.patch Patch10: 0010-Use-DWORD-for-Structure-table-maximum-size-in-SMBIOS.patch Patch11: 0011-dmidecode-Hide-irrelevant-fixup-message.patch -Patch30: dmidecode-3.0-unmask_lrdimm.patch +Patch12: 0012-dmidecode-Unmask-LRDIMM-in-memory-type-detail.patch BuildRequires: automake autoconf ExclusiveArch: %{ix86} x86_64 ia64 aarch64 @@ -46,7 +46,7 @@ I/O ports (e.g. serial, parallel, USB). %patch9 -p1 -b .sysfs_entry_check %patch10 -p1 -b .dword %patch11 -p1 -b .hide_fixup_msg -%patch30 -p1 -b .unmask_lrdimm +%patch12 -p1 -b .unmask_lrdimm %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -67,6 +67,9 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install- %{_mandir}/man8/* %changelog +* Thu Jul 07 2016 Anton Arapov - 1:3.0-5 +- patched up to commit a50565a65c9 + * Wed Jun 29 2016 Anton Arapov - 1:3.0-4 - Applied out-a-tree patch from Petr Oros: dmidecode: Unmask LRDIMM in memory type detail diff --git a/sources b/sources index 4219e00..47771a5 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -44352410e9439ec9c852ee7df231c932 dmidecode-3.0-unmask_lrdimm.patch 281ee572d45c78eca73a14834c495ffd dmidecode-3.0.tar.xz