diff --git a/.dmidecode.metadata b/.dmidecode.metadata new file mode 100644 index 0000000..c7a91eb --- /dev/null +++ b/.dmidecode.metadata @@ -0,0 +1 @@ +d264591f27cc0e918f299feb3ef990ef122c609b SOURCES/dmidecode-2.12.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/dmidecode-2.12-smbios_fix.patch b/SOURCES/dmidecode-2.12-smbios_fix.patch new file mode 100644 index 0000000..f39205d --- /dev/null +++ b/SOURCES/dmidecode-2.12-smbios_fix.patch @@ -0,0 +1,86 @@ +diff -up dmidecode-2.12/CHANGELOG.smbios_fix dmidecode-2.12/CHANGELOG +--- dmidecode-2.12/CHANGELOG.smbios_fix 2013-05-09 09:44:35.668592078 +0200 ++++ dmidecode-2.12/CHANGELOG 2013-05-09 09:44:44.742610559 +0200 +@@ -1,3 +1,10 @@ ++2013-04-24 Jean Delvare ++ ++ * dmidecode.c: Strip trailig zeroes from memory voltage values ++ (DMI type 17). ++ * dmidecode.c: Fix support for new processor upgrade types (DMI ++ type 4) and new memory device type (DMI type 17.) ++ + 2013-04-17 Anton Arapov + + Update to support SMBIOS specification version 2.8.0. +diff -up dmidecode-2.12/dmidecode.c.smbios_fix dmidecode-2.12/dmidecode.c +--- dmidecode-2.12/dmidecode.c.smbios_fix 2013-05-09 09:44:26.404573273 +0200 ++++ dmidecode-2.12/dmidecode.c 2013-05-09 09:44:44.745610565 +0200 +@@ -69,7 +69,7 @@ + #define out_of_spec "" + static const char *bad_index = ""; + +-#define SUPPORTED_SMBIOS_VER 0x0207 ++#define SUPPORTED_SMBIOS_VER 0x0208 + + /* + * Type-independant Stuff +@@ -712,7 +712,6 @@ static const char *dmi_processor_family( + { 0x3D, "Opteron 6200" }, + { 0x3E, "Opteron 4200" }, + { 0x3F, "FX" }, +- + { 0x40, "MIPS" }, + { 0x41, "MIPS R4000" }, + { 0x42, "MIPS R4200" }, +@@ -729,7 +728,6 @@ static const char *dmi_processor_family( + { 0x4D, "Opteron 6300" }, + { 0x4E, "Opteron 3300" }, + { 0x4F, "FirePro" }, +- + { 0x50, "SPARC" }, + { 0x51, "SuperSPARC" }, + { 0x52, "MicroSPARC II" }, +@@ -1176,7 +1174,7 @@ static const char *dmi_processor_upgrade + "Socket LGA1356-3" /* 0x2C */ + }; + +- if (code >= 0x01 && code <= 0x2A) ++ if (code >= 0x01 && code <= 0x2C) + return upgrade[code - 0x01]; + return out_of_spec; + } +@@ -2236,7 +2234,7 @@ static void dmi_memory_voltage_value(u16 + if (code == 0) + printf(" Unknown"); + else +- printf(" %.3f V", (float)(i16)code / 1000); ++ printf(code % 100 ? " %g V" : " %.1f V", (float)code / 1000); + } + + static const char *dmi_memory_device_form_factor(u8 code) +@@ -2338,7 +2336,7 @@ static void dmi_memory_device_type_detai + { + int i; + +- for (i = 1; i <= 14; i++) ++ for (i = 1; i <= 15; i++) + if (code & (1 << i)) + printf(" %s", detail[i - 1]); + } +@@ -3657,13 +3655,13 @@ static void dmi_decode(const struct dmi_ + dmi_memory_device_speed(WORD(data + 0x20)); + printf("\n"); + if (h->length < 0x28) break; +- printf("\tMinimum voltage: "); ++ printf("\tMinimum Voltage: "); + dmi_memory_voltage_value(WORD(data + 0x22)); + printf("\n"); +- printf("\tMaximum voltage: "); ++ printf("\tMaximum Voltage: "); + dmi_memory_voltage_value(WORD(data + 0x24)); + printf("\n"); +- printf("\tConfigured voltage: "); ++ printf("\tConfigured Voltage: "); + dmi_memory_voltage_value(WORD(data + 0x26)); + printf("\n"); + break; diff --git a/SPECS/dmidecode.spec b/SPECS/dmidecode.spec new file mode 100644 index 0000000..c0d9c0a --- /dev/null +++ b/SPECS/dmidecode.spec @@ -0,0 +1,179 @@ +Summary: Tool to analyse BIOS DMI data +Name: dmidecode +Version: 2.12 +Release: 3%{?dist} +Epoch: 1 +Group: System Environment/Base +License: GPLv2+ +Source0: %{name}-%{version}.tar.bz2 +URL: http://www.nongnu.org/dmidecode/ +Patch0: dmidecode-2.12-smbios_fix.patch +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: automake autoconf +ExclusiveArch: %{ix86} x86_64 ia64 + +%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 .smbios_fix + +%build +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" + +%install +rm -rf ${buildroot} +make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install-man + +%clean +rm -rf ${buildroot} + +%files +%defattr(-,root,root) +%doc AUTHORS CHANGELOG LICENSE README +%{_sbindir}/dmidecode +%ifnarch ia64 +%{_sbindir}/vpddecode +%{_sbindir}/ownership +%{_sbindir}/biosdecode +%endif +%{_mandir}/man8/* + +%changelog +* 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. +