Accepting request 239581 from home:juwolf:branches:Base:System

Added: 0001-Continue-without-dmi-when-no-SMBIOS-or-SMBIOS-0x0-in.patch
Continue without dmi when no SMBIOS or SMBIOS=0x0 in /sys/firmware/efi/systab, bnc#829862

OBS-URL: https://build.opensuse.org/request/show/239581
OBS-URL: https://build.opensuse.org/package/show/Base:System/mcelog?expand=0&rev=37
This commit is contained in:
Thomas Renninger 2014-07-04 14:20:51 +00:00 committed by Git OBS Bridge
parent 1c1607eb66
commit b407b97696
3 changed files with 47 additions and 1 deletions

View File

@ -0,0 +1,39 @@
From c55a40ab8a2bef21c2cf00ffca1a1f4883192ca9 Mon Sep 17 00:00:00 2001
From: Julian Wolf <juwolf@suse.com>
Date: Fri, 4 Jul 2014 13:04:52 +0200
Subject: [PATCH] Continue without dmi when no SMBIOS or SMBIOS=0x0 in
/sys/firmware/efi/systab, bnc#829862
---
dmi.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dmi.c b/dmi.c
index 373837e..402459a 100644
--- a/dmi.c
+++ b/dmi.c
@@ -174,8 +174,10 @@ check_symbol:
if (fclose(efi_systab) != 0)
perror(filename);
- if (!ret)
- Eprintf("%s: SMBIOS entry point missing", filename);
+ if (!ret || !*address){
+ Lprintf("No valid SMBIOS entry point: Continue without DMI decoding");
+ return 0;
+ }
if (verbose)
printf("%s: SMBIOS entry point at 0x%08lx\n", filename,
@@ -224,6 +226,8 @@ int opendmi(void)
}
a = (struct anchor*)((char*)abase + (entry_point_addr - addr_start));
goto fill_entries;
+ }else{
+ return -1;
}
legacy:
--
1.8.1.4

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 27 13:54:52 UTC 2014 - juwolf@suse.com
- Added: 0001-Continue-without-dmi-when-no-SMBIOS-or-SMBIOS-0x0-in.patch
Continue without dmi when no SMBIOS or SMBIOS=0x0 in /sys/firmware/efi/systab, bnc#829862
-------------------------------------------------------------------
Fri May 16 15:47:18 UTC 2014 - trenn@suse.de

View File

@ -16,7 +16,6 @@
#
Name: mcelog
Summary: Log Machine Check Events
License: GPL-2.0+
@ -43,6 +42,7 @@ Patch7: patches/add-f12h-support.patch
Patch8: patches/add-f14h-support.patch
Patch9: patches/add-f15h-support.patch
Patch10: patches/add-f16h-support.patch
Patch11: 0001-Continue-without-dmi-when-no-SMBIOS-or-SMBIOS-0x0-in.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq
Url: https://git.kernel.org/cgit/utils/cpu/mce/mcelog.git
@ -78,6 +78,7 @@ Authors:
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%build
export SUSE_ASNEEDED=0