diff --git a/dmidecode-1.176-SMBIOS-2.8-is-supported.patch b/dmidecode-1.176-SMBIOS-2.8-is-supported.patch new file mode 100644 index 0000000..749129a --- /dev/null +++ b/dmidecode-1.176-SMBIOS-2.8-is-supported.patch @@ -0,0 +1,20 @@ +Subject: Bump SUPPORTED_SMBIOS_VER to 0x0208 +Upstream: yes, 1.176 + +Bump SUPPORTED_SMBIOS_VER so that SMBIOS 2.8 implementations don't trigger +a warning. +--- + dmidecode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -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 diff --git a/dmidecode-1.177-decode-pcie3-slot-id.patch b/dmidecode-1.177-decode-pcie3-slot-id.patch new file mode 100644 index 0000000..21b76d2 --- /dev/null +++ b/dmidecode-1.177-decode-pcie3-slot-id.patch @@ -0,0 +1,45 @@ +Subject: Decode ID of PCI Express 3 slots +Upstream: yes, 1.177 + +dmidecode.c: Decode ID of PCI Express 3 slots (DMI type 9). +This fixes Savannah bug #40178: +https://savannah.nongnu.org/bugs/?40178 +--- + dmidecode.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -2,7 +2,7 @@ + * DMI Decode + * + * Copyright (C) 2000-2002 Alan Cox +- * Copyright (C) 2002-2010 Jean Delvare ++ * Copyright (C) 2002-2014 Jean Delvare + * + * 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 +@@ -1697,6 +1697,10 @@ static const char *dmi_slot_type(u8 code + "PCI Express 3 x8", + "PCI Express 3 x16" /* 0xB6 */ + }; ++ /* ++ * Note to developers: when adding entries to these lists, check if ++ * function dmi_slot_id below needs updating too. ++ */ + + if (code >= 0x01 && code <= 0x13) + return type[code - 0x01]; +@@ -1790,6 +1794,12 @@ static void dmi_slot_id(u8 code1, u8 cod + case 0xAE: /* PCI Express 2 */ + case 0xAF: /* PCI Express 2 */ + case 0xB0: /* PCI Express 2 */ ++ case 0xB1: /* PCI Express 3 */ ++ case 0xB2: /* PCI Express 3 */ ++ case 0xB3: /* PCI Express 3 */ ++ case 0xB4: /* PCI Express 3 */ ++ case 0xB5: /* PCI Express 3 */ ++ case 0xB6: /* PCI Express 3 */ + printf("%sID: %u\n", prefix, code1); + break; + case 0x07: /* PCMCIA */ diff --git a/dmidecode.changes b/dmidecode.changes index 9f91f0d..864982e 100644 --- a/dmidecode.changes +++ b/dmidecode.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jan 13 17:31:16 CET 2014 - jdelvare@suse.de + +- dmidecode-1.176-SMBIOS-2.8-is-supported.patch: Bump + SUPPORTED_SMBIOS_VER so that SMBIOS 2.8 implementations don't + trigger a warning. +- dmidecode-1.177-decode-pcie3-slot-id.patch: Decode ID of PCI + Express 3 slots (DMI type 9.) + https://savannah.nongnu.org/bugs/?40178 + ------------------------------------------------------------------- Fri Apr 26 12:37:12 UTC 2013 - guillaume@opensuse.org diff --git a/dmidecode.spec b/dmidecode.spec index 8c3b1cb..94bfc4b 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -1,7 +1,7 @@ # # spec file for package dmidecode # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,8 @@ Group: System/Console Source: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.bz2 Patch1: dmidecode-1.173-drop-cast.patch Patch2: dmidecode-1.175-fix-SMBIOS-2.8.0.patch +Patch3: dmidecode-1.176-SMBIOS-2.8-is-supported.patch +Patch4: dmidecode-1.177-decode-pcie3-slot-id.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 x86_64 %arm aarch64 Obsoletes: pmtools < 20071117 @@ -49,6 +51,8 @@ the BIOS told it to. %setup %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}