diff --git a/.gitignore b/.gitignore index 7e3bba2..5698542 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /dmidecode-2.11.tar.bz2 /dmidecode-2.12.tar.bz2 /dmidecode-3.0.tar.xz +/dmidecode-3.0-unmask_lrdimm.patch diff --git a/dmidecode-3.0-unmask_lrdimm.patch b/dmidecode-3.0-unmask_lrdimm.patch new file mode 100644 index 0000000..6f29635 --- /dev/null +++ b/dmidecode-3.0-unmask_lrdimm.patch @@ -0,0 +1,12 @@ +diff -up dmidecode-3.0/dmidecode.c.unmask_lrdimm dmidecode-3.0/dmidecode.c +--- dmidecode-3.0/dmidecode.c.unmask_lrdimm 2016-06-29 13:44:05.987255690 +0200 ++++ dmidecode-3.0/dmidecode.c 2016-06-29 13:44:15.003150517 +0200 +@@ -2392,7 +2392,7 @@ static void dmi_memory_device_type_detai + "LRDIMM" /* 15 */ + }; + +- if ((code & 0x7FFE) == 0) ++ if ((code & 0xFFFE) == 0) + printf(" None"); + else + { diff --git a/dmidecode.spec b/dmidecode.spec index 0219b55..210702b 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -1,7 +1,7 @@ Summary: Tool to analyse BIOS DMI data Name: dmidecode Version: 3.0 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Group: System Environment/Base License: GPLv2+ @@ -18,6 +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 BuildRequires: automake autoconf ExclusiveArch: %{ix86} x86_64 ia64 aarch64 @@ -45,6 +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 %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -65,6 +67,9 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install- %{_mandir}/man8/* %changelog +* 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 + * Mon May 30 2016 Anton Arapov - 1:3.0-3 - Hide irrelevant fixup message - patched up to commit cff11afa886 diff --git a/sources b/sources index 47771a5..4219e00 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +44352410e9439ec9c852ee7df231c932 dmidecode-3.0-unmask_lrdimm.patch 281ee572d45c78eca73a14834c495ffd dmidecode-3.0.tar.xz