Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

diff --git a/lfs/fireinfo b/lfs/fireinfo
index 97b5a87056ba33301eae841166be42cb2c0b98da..0c55e007cd9bdd05f12bd49f5313933830fa8203 100644 (file)
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.2
+VER        = 2.0.3
 
 THISAPP    = fireinfo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ed29f591ccfeeb6386a61eafcc5dc398
+$(DL_FILE)_MD5 = f9ce8b96350dd5af1e5c095806128cd0
 
 install : $(TARGET)
 
@@ -70,10 +70,6 @@ $(subst %,%_MD5,$(objects)) :
 $(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
 

diff --git a/src/patches/fireinfo-invalid-id.patch b/src/patches/fireinfo-invalid-id.patch
deleted file mode 100644 (file)
index 669deb6..0000000
--- a/src/patches/fireinfo-invalid-id.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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):