dmidecode: Add new package.

diff --git a/pkgs/core/dmidecode/dmidecode.nm b/pkgs/core/dmidecode/dmidecode.nm
new file mode 100644 (file)
index 0000000..f2fa79c
--- /dev/null
+++ b/pkgs/core/dmidecode/dmidecode.nm
@@ -0,0 +1,55 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt                 #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME       = dmidecode
+PKG_VER        = 2.10
+PKG_REL        = 0
+
+PKG_MAINTAINER =
+PKG_GROUP      = Applications/System
+PKG_URL        = http://www.nongnu.org/dmidecode/
+PKG_LICENSE    = GPLv2+
+PKG_SUMMARY    = Tool to analyse BIOS DMI data.
+
+define PKG_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. 
+endef
+
+PKG_TARBALL    = $(THISAPP).tar.bz2
+
+define STAGE_BUILD
+       $(DO_FIX_LIBTOOL)
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
+
+define STAGE_INSTALL
+       cd $(DIR_APP) && make install-bin install-man prefix=/usr DESTDIR=$(BUILDROOT)
+endef

diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch b/pkgs/core/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch
new file mode 100644 (file)
index 0000000..e1dab91
--- /dev/null
+++ b/pkgs/core/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch
@@ -0,0 +1,11 @@
+--- dmidecode/dmioem.c~        2008/10/28 09:41:07     1.9
++++ dmidecode/dmioem.c 2009/07/27 12:07:39     1.10
+@@ -41,7 +41,7 @@
+  */
+ void dmi_set_vendor(const char *s)
+ {
+-      if (strcmp(s, "HP") == 0)
++      if (strcmp(s, "HP") == 0 || strcmp(s, "Hewlett-Packard") == 0)
+               dmi_vendor = VENDOR_HP;
+ }
+ 

diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch b/pkgs/core/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch
new file mode 100644 (file)
index 0000000..ee86ddf
--- /dev/null
+++ b/pkgs/core/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch
@@ -0,0 +1,16 @@
+--- dmidecode/dmidecode.c~     2009/06/19 11:55:35     1.142
++++ dmidecode/dmidecode.c      2009/07/27 12:20:01     1.143
+@@ -1042,10 +1042,11 @@
+               "Socket LGA775",
+               "Socket S1",
+               "Socket AM2",
+-              "Socket F (1207)" /* 0x18 */
++              "Socket F (1207)",
++              "Socket LGA1366" /* 0x19 */
+       };
+ 
+-      if (code >= 0x01 && code <= 0x18)
++      if (code >= 0x01 && code <= 0x19)
+               return upgrade[code - 0x01];
+       return out_of_spec;
+ }

diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch b/pkgs/core/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch
new file mode 100644 (file)
index 0000000..19d18d7
--- /dev/null
+++ b/pkgs/core/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch
@@ -0,0 +1,11 @@
+--- dmidecode/dmidecode.c~     2009/04/30 08:19:37     1.141
++++ dmidecode/dmidecode.c      2009/06/19 11:55:35     1.142
+@@ -2007,7 +2007,7 @@
+ 
+ static void dmi_memory_array_capacity(u32 code)
+ {
+-      if (code == 0x8000000)
++      if (code == 0x80000000)
+               printf(" Unknown");
+       else
+       {

diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-smbios-updates.patch b/pkgs/core/dmidecode/patches/dmidecode-2.10-smbios-updates.patch
new file mode 100644 (file)
index 0000000..8c1e48f
--- /dev/null
+++ b/pkgs/core/dmidecode/patches/dmidecode-2.10-smbios-updates.patch
@@ -0,0 +1,120 @@
+dmidecode: additions from smbios 2.6.1 spec update
+
+Tested on an HP DL360G6 with LGA1366 socket cpus, PCI-E Gen 2 slots
+and DDR3 memory, no longer returns any <OUT OF SPEC> info.
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+
+---
+ dmidecode.c |   49 ++++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 42 insertions(+), 7 deletions(-)
+
+diff -Naurp dmidecode-2.10.orig/dmidecode.c dmidecode-2.10/dmidecode.c
+--- dmidecode-2.10.orig/dmidecode.c    2009-08-27 09:20:45.933991764 -0400
++++ dmidecode-2.10/dmidecode.c 2009-08-27 09:21:15.516869134 -0400
+@@ -361,7 +361,7 @@ static void dmi_system_uuid(const u8 *p,
+ 
+ static const char *dmi_system_wake_up_type(u8 code)
+ {
+-      /* 3.3.2.1 */
++      /* 3.3.2.2 */
+       static const char *type[] = {
+               "Reserved", /* 0x00 */
+               "Other",
+@@ -719,6 +719,12 @@ static const char *dmi_processor_family(
+               { 0xA9, "Quad-Core Xeon 5400" }, /* From CIM_Processor.Family */
+               { 0xAA, "Quad-Core Xeon" }, /* From CIM_Processor.Family */
+ 
++              { 0xAB, "Dual-Core Xeon 5200" },
++              { 0xAC, "Dual-Core Xeon 7200" },
++              { 0xAD, "Quad-Core Xeon 7300" },
++              { 0xAE, "Quad-Core Xeon 7400" },
++              { 0xAF, "Multi-Core Xeon 7400" },
++
+               { 0xB0, "Pentium III Xeon" },
+               { 0xB1, "Pentium III Speedstep" },
+               { 0xB2, "Pentium 4" },
+@@ -741,6 +747,8 @@ static const char *dmi_processor_family(
+               { 0xC3, "Core 2 Extreme Mobile" }, /* From CIM_Processor.Family */
+               { 0xC4, "Core 2 Duo Mobile" }, /* From CIM_Processor.Family */
+               { 0xC5, "Core 2 Solo Mobile" }, /* From CIM_Processor.Family */
++              { 0xC6, "Core i7" },
++              { 0xC7, "Dual-Core Celeron" },
+ 
+               { 0xC8, "IBM390" },
+               { 0xC9, "G4" },
+@@ -753,6 +761,17 @@ static const char *dmi_processor_family(
+               { 0xD4, "C7" },
+               { 0xD5, "Eden" },
+ 
++              { 0xD6, "Multi-Core Xeon" },
++              { 0xD7, "Dual-Core Xeon 3xxx" },
++              { 0xD8, "Quad-Core Xeon 3xxx" },
++
++              { 0xDA, "Dual-Core Xeon 5xxx" },
++              { 0xDB, "Quad-Core Xeon 5xxx" },
++
++              { 0xDD, "Dual-Core Xeon 7xxx" },
++              { 0xDD, "Quad-Core Xeon 7xxx" },
++              { 0xDD, "Multi-Core Xeon 7xxx" },
++
+               { 0xE6, "Embedded Opteron Quad-Core" }, /* From CIM_Processor.Family */
+               { 0xE7, "Phenom Triple-Core" }, /* From CIM_Processor.Family */
+               { 0xE8, "Turion Ultra Dual-Core Mobile" }, /* From CIM_Processor.Family */
+@@ -1383,10 +1402,15 @@ static const char *dmi_cache_associativi
+               "4-way Set-associative",
+               "Fully Associative",
+               "8-way Set-associative",
+-              "16-way Set-associative" /* 0x08 */
++              "16-way Set-associative",
++              "12-way Set-associative",
++              "24-way Set-associative",
++              "32-way Set-associative",
++              "48-way Set-associative",
++              "64-way Set-associative" /* 0x0D */
+       };
+ 
+-      if (code >= 0x01 && code <= 0x08)
++      if (code >= 0x01 && code <= 0x0D)
+               return type[code - 0x01];
+       return out_of_spec;
+ }
+@@ -1544,12 +1568,18 @@ static const char *dmi_slot_type(u8 code
+               "PCI Express x2",
+               "PCI Express x4",
+               "PCI Express x8",
+-              "PCI Express x16" /* 0xAA */
++              "PCI Express x16", /* 0xAA */
++              "PCI Express Gen 2",
++              "PCI Express Gen 2 x1",
++              "PCI Express Gen 2 x2",
++              "PCI Express Gen 2 x4",
++              "PCI Express Gen 2 x8",
++              "PCI Express Gen 2 x16", /* 0xB0 */
+       };
+ 
+       if (code >= 0x01 && code <= 0x13)
+               return type[code - 0x01];
+-      if (code >= 0xA0 && code <= 0xAA)
++      if (code >= 0xA0 && code <= 0xB0)
+               return type_0xA0[code - 0xA0];
+       return out_of_spec;
+ }
+@@ -2120,10 +2150,15 @@ static const char *dmi_memory_device_typ
+               "RDRAM",
+               "DDR",
+               "DDR2",
+-              "DDR2 FB-DIMM" /* 0x14 */
++              "DDR2 FB-DIMM",
++              "Reserved",
++              "Reserved",
++              "Reserved",
++              "DDR3",
++              "FBD2", /* 0x19 */
+       };
+ 
+-      if (code >= 0x01 && code <= 0x14)
++      if (code >= 0x01 && code <= 0x19)
+               return type[code - 0x01];
+       return out_of_spec;
+ }

diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch b/pkgs/core/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch
new file mode 100644 (file)
index 0000000..896c29f
--- /dev/null
+++ b/pkgs/core/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch
@@ -0,0 +1,25 @@
+--- dmidecode/dmidecode.c~     2008/11/14 10:27:31     1.140
++++ dmidecode/dmidecode.c      2009/04/30 08:19:37     1.141
+@@ -66,6 +66,8 @@
+ #define out_of_spec "<OUT OF SPEC>"
+ static const char *bad_index = "<BAD INDEX>";
+ 
++#define SUPPORTED_SMBIOS_VER 0x0206
++
+ /*
+  * Type-independant Stuff
+  */
+@@ -4005,6 +4007,13 @@
+       u8 *data;
+       int i = 0;
+ 
++      if (ver > SUPPORTED_SMBIOS_VER)
++      {
++              printf("# SMBIOS implementations newer than version %u.%u are not\n"
++                     "# fully supported by this version of dmidecode.\n",
++                     SUPPORTED_SMBIOS_VER >> 8, SUPPORTED_SMBIOS_VER & 0xFF);
++      }
++
+       if (opt.flags & FLAG_DUMP_BIN)
+       {
+               dmi_table_dump(base, len, devmem);