From 71940784effa592786457453ea461fdcd47c4a88 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 1 Sep 2015 00:12:31 +0100 Subject: [PATCH] fireinfo: Import upstream patch Signed-off-by: Michael Tremer --- config/rootfiles/core/94/filelists/fireinfo | 1 + lfs/fireinfo | 1 + ...er-all-IDs-that-only-consist-of-0xff.patch | 28 +++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 120000 config/rootfiles/core/94/filelists/fireinfo create mode 100644 src/patches/fireinfo/0001-Filter-all-IDs-that-only-consist-of-0xff.patch diff --git a/config/rootfiles/core/94/filelists/fireinfo b/config/rootfiles/core/94/filelists/fireinfo new file mode 120000 index 0000000000..c46115521f --- /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 9d657653ec..eae6c99856 100644 --- 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 index 0000000000..0c6fe4305c --- /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 +Date: Wed, 12 Aug 2015 10:50:42 +0100 +Subject: [PATCH] Filter all IDs that only consist of 0xff + +Signed-off-by: Michael Tremer +--- + 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 + -- 2.39.2