commit mcelog for openSUSE:Factory
Hello community, here is the log from the commit of package mcelog for openSUSE:Factory checked in at 2014-07-15 16:25:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mcelog (Old) and /work/SRC/openSUSE:Factory/.mcelog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mcelog" Changes: -------- --- /work/SRC/openSUSE:Factory/mcelog/mcelog.changes 2014-05-18 06:50:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mcelog.new/mcelog.changes 2014-07-15 16:25:49.000000000 +0200 @@ -1,0 +2,6 @@ +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 + +------------------------------------------------------------------- New: ---- 0001-Continue-without-dmi-when-no-SMBIOS-or-SMBIOS-0x0-in.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mcelog.spec ++++++ --- /var/tmp/diff_new_pack.35htxA/_old 2014-07-15 16:25:50.000000000 +0200 +++ /var/tmp/diff_new_pack.35htxA/_new 2014-07-15 16:25:50.000000000 +0200 @@ -16,7 +16,6 @@ # - Name: mcelog Summary: Log Machine Check Events License: GPL-2.0+ @@ -43,6 +42,7 @@ 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 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build export SUSE_ASNEEDED=0 ++++++ 0001-Continue-without-dmi-when-no-SMBIOS-or-SMBIOS-0x0-in.patch ++++++
From c55a40ab8a2bef21c2cf00ffca1a1f4883192ca9 Mon Sep 17 00:00:00 2001 From: Julian Wolf
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 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de