fireinfo: Import latest fixes for ARM

[ipfire-2.x.git] / lfs / fireinfo

diff --git a/lfs/fireinfo b/lfs/fireinfo
index 6c502e1ff5fe29e26d471d03cc7e89b5613f52d3..0bc8d44dab30cf7a5d34acdcf6bf3f2b75c151d7 100644 (file)
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -24,11 +24,11 @@
 
 include Config
 
-VER        = 2.0.4
+VER        = 2.1.10
 
-THISAPP    = fireinfo-$(VER)
+THISAPP    = fireinfo-v$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
+DL_FROM    = http://source.ipfire.org/releases/fireinfo/
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7433e108cce180980189339886621539
+$(DL_FILE)_MD5 = cc7838cda22d7d4e9bb177aa1dc6f25a
 
 install : $(TARGET)
 
@@ -70,11 +70,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && python setup.py build
-       cd $(DIR_APP) && python setup.py install
 
-       # Remove egg-info
-       rm -rvf /usr/lib/python*/site-packages/fireinfo*.egg-info
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/0001-bogomips-Don-t-crash-when-no-bogomips-are-available.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/0002-ARM-Read-board-model-from-device-tree-in-proc.patch
+
+       cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
+       cd $(DIR_APP) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)