fireinfo: Import upstream patch

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/94/filelists/fireinfo b/config/rootfiles/core/94/filelists/fireinfo
new file mode 120000 (symlink)
index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/core/94/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file

diff --git a/lfs/fireinfo b/lfs/fireinfo
index 9d657653ec1ac27f5d1853682f84729b0ceafc0c..eae6c998565ad2500a59a12337e9549512d5114d 100644 (file)
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -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

diff --git a/src/patches/fireinfo/0001-Filter-all-IDs-that-only-consist-of-0xff.patch b/src/patches/fireinfo/0001-Filter-all-IDs-that-only-consist-of-0xff.patch
new file mode 100644 (file)
index 0000000..0c6fe43
--- /dev/null
+++ b/src/patches/fireinfo/0001-Filter-all-IDs-that-only-consist-of-0xff.patch
@@ -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
+