diff --git a/.dmidecode.metadata b/.dmidecode.metadata new file mode 100644 index 0000000..fd64d63 --- /dev/null +++ b/.dmidecode.metadata @@ -0,0 +1 @@ +acf4b5c6e757066453fd06aa9060fceb257849bf SOURCES/dmidecode-3.2.tar.xz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3e13d57 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/dmidecode-3.2.tar.xz diff --git a/SOURCES/0001-dmidecode-Fix-Redfish-Hostname-print-length.patch b/SOURCES/0001-dmidecode-Fix-Redfish-Hostname-print-length.patch new file mode 100644 index 0000000..82d879a --- /dev/null +++ b/SOURCES/0001-dmidecode-Fix-Redfish-Hostname-print-length.patch @@ -0,0 +1,32 @@ +From fde47bb227b8fa817c88d7e10a8eb771c46de1df Mon Sep 17 00:00:00 2001 +From: Charles Rose +Date: Mon, 22 Oct 2018 09:48:02 +0200 +Subject: [PATCH] dmidecode: Fix Redfish Hostname print length + +Redfish Hostname prints beyond hlen characters. Fix it. + +Signed-off-by: Charles Rose +Fixes: 78539b06117c ("dmidecode: Parse Modern Management Controller blocks") +Acked-by: Neil Horman +Signed-off-by: Jean Delvare +Signed-off-by: Lianbo Jiang +--- + dmidecode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dmidecode.c b/dmidecode.c +index a3e9d6c..7ac6438 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -3609,7 +3609,7 @@ static void dmi_parse_protocol_record(const char *prefix, u8 *rec) + hname = out_of_spec; + hlen = strlen(out_of_spec); + } +- printf("%s\t\tRedfish Service Hostname: %*s\n", prefix, hlen, hname); ++ printf("%s\t\tRedfish Service Hostname: %.*s\n", prefix, hlen, hname); + } + + /* +-- +2.17.1 + diff --git a/SOURCES/0002-dmidecode-Don-t-use-memcpy-on-dev-mem-on-arm64.patch b/SOURCES/0002-dmidecode-Don-t-use-memcpy-on-dev-mem-on-arm64.patch new file mode 100644 index 0000000..d5ccc32 --- /dev/null +++ b/SOURCES/0002-dmidecode-Don-t-use-memcpy-on-dev-mem-on-arm64.patch @@ -0,0 +1,72 @@ +From 82497fa02d60757c2cfa645cf89a79abb1435273 Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Fri, 16 Nov 2018 11:18:25 +0100 +Subject: [PATCH 1/4] dmidecode: Don't use memcpy on /dev/mem on arm64 + +On arm64, calling memcpy on /dev/mem will cause a bus error if the +start and the end of the buffer are not aligned on a 64-bit boundary. +Using option --no-sysfs triggers this. + +Use a slow manual byte-by-byte copy in that case, to prevent the bus +error. This is only a fallback path (at least on Linux) and not +performance-critical anyway, as it is a one-time operation and DMI +tables are usually not too large. + +This fixes bug #55026: +https://savannah.nongnu.org/bugs/index.php?55026 + +Signed-off-by: Jean Delvare +--- + config.h | 5 +++++ + util.c | 14 +++++++++++++- + 2 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/config.h b/config.h +index e39091f..4237355 100644 +--- a/config.h ++++ b/config.h +@@ -26,4 +26,9 @@ + #define ALIGNMENT_WORKAROUND + #endif + ++/* Avoid unaligned memcpy on /dev/mem */ ++#ifdef __aarch64__ ++#define USE_SLOW_MEMCPY ++#endif ++ + #endif +diff --git a/util.c b/util.c +index eeffdae..04aaadd 100644 +--- a/util.c ++++ b/util.c +@@ -155,6 +155,18 @@ void *read_file(off_t base, size_t *max_len, const char *filename) + return p; + } + ++static void safe_memcpy(void *dest, const void *src, size_t n) ++{ ++#ifdef USE_SLOW_MEMCPY ++ size_t i; ++ ++ for (i = 0; i < n; i++) ++ *((u8 *)dest + i) = *((const u8 *)src + i); ++#else ++ memcpy(dest, src, n); ++#endif ++} ++ + /* + * Copy a physical memory chunk into a memory buffer. + * This function allocates memory. +@@ -214,7 +226,7 @@ void *mem_chunk(off_t base, size_t len, const char *devmem) + if (mmp == MAP_FAILED) + goto try_read; + +- memcpy(p, (u8 *)mmp + mmoffset, len); ++ safe_memcpy(p, (u8 *)mmp + mmoffset, len); + + if (munmap(mmp, mmoffset + len) == -1) + { +-- +2.17.1 + diff --git a/SOURCES/0003-dmidecode-Use-the-most-appropriate-unit-for-cache-si.patch b/SOURCES/0003-dmidecode-Use-the-most-appropriate-unit-for-cache-si.patch new file mode 100644 index 0000000..1e6f1cc --- /dev/null +++ b/SOURCES/0003-dmidecode-Use-the-most-appropriate-unit-for-cache-si.patch @@ -0,0 +1,53 @@ +From c43afb47fcbadabe2655fe7863a1e2ea9af1446c Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Tue, 15 Jan 2019 12:59:00 +0100 +Subject: [PATCH 2/4] dmidecode: Use the most appropriate unit for cache size + +As newer CPUs have larger and larger cache, using kB to represent the +cache size is getting less convenient. Reuse the same function we have +for system memory size so that large units will be used as +appropriate. For example, a cache size reported as "20 MB" looks nicer +than as "20480 kB". + +Signed-off-by: Jean Delvare +Acked-by: Neil Horman +--- + dmidecode.c | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/dmidecode.c b/dmidecode.c +index 7ac6438..162e0c5 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -1560,17 +1560,22 @@ static void dmi_cache_size(u16 code) + + static void dmi_cache_size_2(u32 code) + { ++ u64 size; ++ + if (code & 0x80000000) + { + code &= 0x7FFFFFFFLU; +- /* Use a more convenient unit for large cache size */ +- if (code >= 0x8000) +- printf(" %u MB", code >> 4); +- else +- printf(" %u kB", code << 6); ++ size.l = code << 6; ++ size.h = code >> 26; + } + else +- printf(" %u kB", code); ++ { ++ size.l = code; ++ size.h = 0; ++ } ++ ++ /* Use a more convenient unit for large cache size */ ++ dmi_print_memory_size(size, 1); + } + + static void dmi_cache_types(u16 code, const char *sep) +-- +2.17.1 + diff --git a/SOURCES/0004-dmidecode-Use-dmi_cache_size_2-in-dmi_cache_size.patch b/SOURCES/0004-dmidecode-Use-dmi_cache_size_2-in-dmi_cache_size.patch new file mode 100644 index 0000000..b34a414 --- /dev/null +++ b/SOURCES/0004-dmidecode-Use-dmi_cache_size_2-in-dmi_cache_size.patch @@ -0,0 +1,49 @@ +From 941591e24564e4c6d6584dbaa868976f9e80e925 Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Tue, 15 Jan 2019 12:59:08 +0100 +Subject: [PATCH 3/4] dmidecode: Use dmi_cache_size_2 in dmi_cache_size + +Redirect dmi_cache_size() to dmi_cache_size_2() so that the cache +size is always reported using the most appropriate unit, even if the +BIOS does not populate the 32-bit cache size fields. + +Signed-off-by: Jean Delvare +Acked-by: Neil Horman +--- + dmidecode.c | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/dmidecode.c b/dmidecode.c +index 162e0c5..903ef35 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -1550,14 +1550,6 @@ static const char *dmi_cache_location(u8 code) + return location[code]; + } + +-static void dmi_cache_size(u16 code) +-{ +- if (code & 0x8000) +- printf(" %u kB", (code & 0x7FFF) << 6); +- else +- printf(" %u kB", code); +-} +- + static void dmi_cache_size_2(u32 code) + { + u64 size; +@@ -1578,6 +1570,11 @@ static void dmi_cache_size_2(u32 code) + dmi_print_memory_size(size, 1); + } + ++static void dmi_cache_size(u16 code) ++{ ++ dmi_cache_size_2((((u32)code & 0x8000LU) << 16) | (code & 0x7FFFLU)); ++} ++ + static void dmi_cache_types(u16 code, const char *sep) + { + /* 7.8.2 */ +-- +2.17.1 + diff --git a/SOURCES/0005-dmidecode-Add-Logical-non-volatile-device-to-the-mem.patch b/SOURCES/0005-dmidecode-Add-Logical-non-volatile-device-to-the-mem.patch new file mode 100644 index 0000000..db7c053 --- /dev/null +++ b/SOURCES/0005-dmidecode-Add-Logical-non-volatile-device-to-the-mem.patch @@ -0,0 +1,38 @@ +From 74dfb854b8199ddb0a27e89296fa565f4706cb9d Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Wed, 16 Jan 2019 09:04:55 +0100 +Subject: [PATCH 4/4] dmidecode: Add "Logical non-volatile device" to the + memory device types + +When adding support for non-volative memory, we forgot to add +"Logical non-volatile device" to the list of memory types. This +causes NVDIMM modules to show up as . Fix the problem +by adding the missing enumerated value. + +Signed-off-by: Jean Delvare +Reviewed-by: Jerry Hoemann +--- + dmidecode.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/dmidecode.c b/dmidecode.c +index 903ef35..91c6f62 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -2471,10 +2471,11 @@ static const char *dmi_memory_device_type(u8 code) + "LPDDR", + "LPDDR2", + "LPDDR3", +- "LPDDR4" /* 0x1E */ ++ "LPDDR4", ++ "Logical non-volatile device" /* 0x1F */ + }; + +- if (code >= 0x01 && code <= 0x1E) ++ if (code >= 0x01 && code <= 0x1F) + return type[code - 0x01]; + return out_of_spec; + } +-- +2.17.1 + diff --git a/SPECS/dmidecode.spec b/SPECS/dmidecode.spec new file mode 100644 index 0000000..5efe7c2 --- /dev/null +++ b/SPECS/dmidecode.spec @@ -0,0 +1,245 @@ +Summary: Tool to analyse BIOS DMI data +Name: dmidecode +Version: 3.2 +Release: 3%{?dist} +Epoch: 1 +Group: System Environment/Base +License: GPLv2+ +Source0: %{name}-%{version}.tar.xz +URL: http://www.nongnu.org/dmidecode/ +Patch0: 0001-dmidecode-Fix-Redfish-Hostname-print-length.patch +Patch1: 0002-dmidecode-Don-t-use-memcpy-on-dev-mem-on-arm64.patch +Patch2: 0003-dmidecode-Use-the-most-appropriate-unit-for-cache-si.patch +Patch3: 0004-dmidecode-Use-dmi_cache_size_2-in-dmi_cache_size.patch +Patch4: 0005-dmidecode-Add-Logical-non-volatile-device-to-the-mem.patch + +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: automake autoconf +ExclusiveArch: %{ix86} x86_64 ia64 aarch64 + +%description +dmidecode reports information about x86 & ia64 hardware as described in the +system BIOS according to the SMBIOS/DMI standard. This information +typically includes system manufacturer, model name, serial number, +BIOS version, asset tag as well as a lot of other details of varying +level of interest and reliability depending on the manufacturer. + +This will often include usage status for the CPU sockets, expansion +slots (e.g. AGP, PCI, ISA) and memory module slots, and the list of +I/O ports (e.g. serial, parallel, USB). + +%prep +%setup -q +%patch0 -p1 -b .fix_Redfish_print +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + +%build +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="-pie -Wl,-z,now" + +%install +rm -rf ${buildroot} +make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install-man + +%clean +rm -rf ${buildroot} + +%files +%doc AUTHORS NEWS README +%{!?_licensedir:%global license %%doc} +%license LICENSE +%{_sbindir}/dmidecode +%ifnarch ia64 aarch64 +%{_sbindir}/vpddecode +%{_sbindir}/ownership +%{_sbindir}/biosdecode +%endif +%{_mandir}/man8/* + +%changelog +* Fri Apr 26 2019 Lianbo Jiang - 1:3.2-3 +- Add "Logical non-volatile device" to the memory device types +- Resolves: rhbz#1664921 + +* Tue Nov 6 2018 Lianbo Jiang - 1:3.2-1 +- Sync with upstream 3.2 +- Resolves: rhbz#1628992 + +* Thu Apr 26 2018 Lianbo Jiang - 1:3.1-1 +- Sync with upstream +- Resolves: rhbz#1568227 + +* Wed May 3 2017 Petr Oros - 1:3.0-5 +- Update compiler flags for hardened builds +- Resolves: #1420763 + +* Tue Feb 28 2017 Petr Oros - 1:3.0-4 +- Sync with upstream +- Resolves: #1385884 + +* Tue Nov 8 2016 Petr Oros - 1:3.0-3 +- Hide irrelevant fixup message +- Resolves: #1384195 + +* Wed Jun 29 2016 Petr Oros - 1:3.0-2 +- Unmask LRDIMM in memmory type detail +- Resolves: #1321342 + +* Wed May 4 2016 Petr Oros - 1:3.0-1 +- Update to upstream 3.0 release. +- Resolves: #1273487 + +* Mon Sep 21 2015 Petr Oros - 1:2.12-9 +- dmioem: Decode Acer-specific DMI type 170 +- dmioem: Decode HP-specific DMI types 212 and 219 +- dmioem: Decode HP-specific DMI type 233, and refactored 209 and 221 to use a common function +- Resolves: #1232501 + +* Thu Jul 23 2015 Petr Oros - 1:2.12-8 +- Support upstream sysfs filename for smbios entry point (Mark Salter) +- Resolves: #1232153 + +* Thu Jul 16 2015 Petr Oros - 1:2.12-7 +- only use SMBIOS3 on aarch64 systems (Jeffrey Bastian) +- Resolves: #1242409 + +* Wed May 13 2015 Petr Oros - 1:2.12-6 +- Add preliminary support for SMBIOS 64-bit entry point (Mark Salter) +- Add support for DDR4 memmory + +* Fri Feb 21 2014 Anton Arapov - 2.12-5 +- Spec file fixes for the Aarch64. (John Feeney ) + +* Fri Dec 27 2013 Daniel Mach - 1:2.12-4 +- Mass rebuild 2013-12-27 + +* Thu May 09 2013 Anton Arapov - 1:2.12-3 +- Accomodate few more necesary, to enable SMBIOS v2.8, changes from upstream. + +* Fri Apr 26 2013 Anton Arapov - 1:2.12-2 +- Fixup, so that it actually read SMBIOS 2.8.0 table. + +* Wed Apr 17 2013 Anton Arapov - 1:2.12-1 +- Update to upstream 2.12 release. + +* Wed Feb 13 2013 Fedora Release Engineering - 1:2.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1:2.11-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Mar 26 2012 Anton Arapov - 1:2.11-8 +- Update dmidecode.8 manpage + +* Mon Mar 12 2012 Anton Arapov - 1:2.11-7 +- Add "PXE" to HP OEM Type 209 record output +- Properly print the hexadecimal value of invalid string characters + +* Fri Jan 13 2012 Fedora Release Engineering - 1:2.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Nov 14 2011 Anton Arapov - 1:2.11-5 +- Fix the wrong call of the dmi_chassis_type function call. Thus fix + an issue on the systems with the chassis lock available, application + doesn't fall out with the out of spec error anymore. + +* Tue May 03 2011 Anton Arapov - 1:2.11-4 +- Update to SMBIOS 2.7.1 +- Fix the boundaries check in type16 + +* Tue Feb 08 2011 Fedora Release Engineering - 1:2.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jan 19 2011 Anton Arapov - 1:2.11-2 +- Update to upstream 2.11 release. (#623047) + +* Wed Jan 19 2011 Anton Arapov - 1:2.11-1 +- Fix the changelog's NVR. + +* Mon Nov 08 2010 Prarit Bhargava - 1:2.10-3 +- updated kernel.spec for review [BZ 225698] + +* Fri Oct 15 2010 Anton Arapov - 1:2.10-2 +- Does not build with gnu make v3.82+ (#631407) + +* Fri Dec 18 2009 Prarit Bhargava - 1:2.10-1.40 +- Fix rpmlint errors in specfile + +* Fri Aug 28 2009 Jarod Wilson - 1:2.10-1.39 +- Fix cache associativity mapping (was missing some commas) + +* Mon Aug 24 2009 Jarod Wilson - 1:2.10-1.38 +- Add support for newer sockets, processors and pcie slot types + +* Fri Jul 24 2009 Fedora Release Engineering - 1:2.10-1.36.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Feb 27 2009 Matthias Clasen +- Build for i586 + +* Tue Feb 24 2009 Fedora Release Engineering - 1:2.10-1.34.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 09 2009 Prarit Bhargava 1:2.10 +- rebuild with version 2.10 + +* Wed Jan 28 2009 Prarit Bhargava 1:2.9-1.32 +- fix Summary field (BZ 225698) + +* Wed Jul 16 2008 Tom "spot" Callaway 1:2.9-1.30 +- fix license tag + +* Fri Mar 14 2008 Doug Chapman 1:2.9-1.29.1 +- Do not package vpddecode, ownership and biosdecode on ia64 since those are x86 only + +* Tue Feb 19 2008 Fedora Release Engineering - 1:2.9-1.27.1 +- Autorebuild for GCC 4.3 + +* Mon Oct 22 2007 Prarit Bhargava - 1:2.9 +- rebuild with version 2.9 +* Wed Jul 12 2006 Jesse Keating - 1:2.7-1.25.1 +- rebuild + +* Thu Feb 09 2006 Dave Jones +- rebuild. + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Nov 28 2005 Dave Jones +- Integrate several specfile cleanups from Robert Scheck. (#172543) + +* Sat Sep 24 2005 Dave Jones +- Revert yesterdays patch, its unneeded in 2.7 + +* Fri Sep 23 2005 Dave Jones +- Don't try to modify areas mmap'd read-only. +- Don't build on ia64 any more. + (It breaks on some boxes very badly, and works on very few). + +* Mon Sep 12 2005 Dave Jones +- Update to upstream 2.7 + +* Fri Apr 15 2005 Florian La Roche +- remove empty scripts + +* Wed Mar 2 2005 Dave Jones +- Update to upstream 2.6 + +* Tue Mar 1 2005 Dave Jones +- Rebuild for gcc4 + +* Tue Feb 8 2005 Dave Jones +- Rebuild with -D_FORTIFY_SOURCE=2 + +* Tue Jan 11 2005 Dave Jones +- Add missing Obsoletes: kernel-utils + +* Mon Jan 10 2005 Dave Jones +- Update to upstream 2.5 release. + +* Sat Dec 18 2004 Dave Jones +- Initial packaging, based upon kernel-utils package. +