fireinfo: Fix hash collision because of very weird UUID.
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 18 Jan 2011 18:18:41 +0000 (19:18 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 18 Jan 2011 18:18:41 +0000 (19:18 +0100)
lfs/fireinfo
src/patches/fireinfo-invalid-id.patch [new file with mode: 0644]

index abc9d848dd4ffee5489c8679563018775dd1e5b0..97b5a87056ba33301eae841166be42cb2c0b98da 100644 (file)
@@ -70,6 +70,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+       # Fix for braindead board vendors.
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-invalid-id.patch
+
        cd $(DIR_APP) && python setup.py build
        cd $(DIR_APP) && python setup.py install
 
        cd $(DIR_APP) && python setup.py build
        cd $(DIR_APP) && python setup.py install
 
diff --git a/src/patches/fireinfo-invalid-id.patch b/src/patches/fireinfo-invalid-id.patch
new file mode 100644 (file)
index 0000000..669deb6
--- /dev/null
@@ -0,0 +1,18 @@
+commit ac68f90a0229083d755e7e2e8980822405ac2da8
+Author: Michael Tremer <michael.tremer@ipfire.org>
+Date:   Tue Jan 18 19:11:06 2011 +0100
+
+    Add invalid ID: 00020003-0004-0005-0006-000700080009.
+
+diff --git a/fireinfo/system.py b/fireinfo/system.py
+index 135c29b..690eae2 100644
+--- a/fireinfo/system.py
++++ b/fireinfo/system.py
+@@ -41,6 +41,7 @@ INVALID_ID_STRINGS = (
+       "N/A", "n/a",
+       "12345", "54321", "202020",
+       "Chassis", "chassis",
++      "00020003-0004-0005-0006-000700080009",
+ )
+ class Singleton(type):