webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fireinfo: Import upstream patch

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2015-09-01 00:12:31 +01:00
parent e9358dccee
commit 71940784ef
3 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/94/filelists/fireinfo Symbolic link
View File

@@ -0,0 +1 @@
../../../common/fireinfo

1
lfs/fireinfo
View File

@@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-Add-an-other-forbidden-string-Serial.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/0001-Filter-all-IDs-that-only-consist-of-0xff.patch
cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
cd $(DIR_APP) && ./configure --prefix=/usr

28
src/patches/fireinfo/0001-Filter-all-IDs-that-only-consist-of-0xff.patch Normal file
View File

@@ -0,0 +1,28 @@
From d58f8ef75a29dd6f8968084b5383ce0f39c75666 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 12 Aug 2015 10:50:42 +0100
Subject: [PATCH] Filter all IDs that only consist of 0xff
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
src/fireinfo/system.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
index 4148c66..edf7359 100644
--- a/src/fireinfo/system.py
+++ b/src/fireinfo/system.py
@@ -255,6 +255,10 @@ class System(object):
id = None
break
+ # Check if the string only contains 0xff
+ if all((e == "\xff" for e in id)):
+ id = None
+
if id:
_ids.append(id)
--
2.4.3