webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fireinfo: Update to version 2.1.11

Browse Source
This commit is contained in:
Michael Tremer
2015-02-15 13:16:08 +01:00
parent 4fc61b9a09
commit 9e7099af47
4 changed files with 2 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lfs/fireinfo
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.1.10
VER = 2.1.11
THISAPP = fireinfo-v$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = cc7838cda22d7d4e9bb177aa1dc6f25a
$(DL_FILE)_MD5 = 093799207ab7397cc7f2d5eb45868c69
install : $(TARGET)
@@ -71,10 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
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) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/0003-Revert-vendor-model-for-ARM-to-old-behaviour.patch
cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)

61
src/patches/fireinfo/0001-bogomips-Don-t-crash-when-no-bogomips-are-available.patch
View File

@@ -1,61 +0,0 @@
From a9401d9542fae575d9ce2bb534cd4e598e9c7b8e Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 28 Oct 2014 21:14:41 +0100
Subject: [PATCH 1/3] bogomips: Don't crash when no bogomips are available
The RPi doesn't provide bogomips in /proc/cpuinfo any more
and fireinfo crashed when trying to read that file
---
src/fireinfo/cpu.py | 14 +++++++++-----
src/fireinfo/system.py | 4 +++-
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/fireinfo/cpu.py b/src/fireinfo/cpu.py
index 32d885db8124..541575af6bbb 100644
--- a/src/fireinfo/cpu.py
+++ b/src/fireinfo/cpu.py
@@ -80,12 +80,16 @@ class CPU(object):
"""
Return the bogomips of this CPU.
"""
- try:
- bogomips = self.__cpuinfo["bogomips"]
- except KeyError:
- bogomips = self.__cpuinfo["BogoMIPS"]
+ bogomips = None
+
+ for key in ("bogomips", "BogoMIPS"):
+ try:
+ bogomips = self.__cpuinfo[key]
+ except KeyError:
+ continue
- return float(bogomips)
+ if bogomips:
+ return float(bogomips)
@property
def model(self):
diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
index 8e903e8e3449..890f58c05027 100644
--- a/src/fireinfo/system.py
+++ b/src/fireinfo/system.py
@@ -144,12 +144,14 @@ class System(object):
"model_string" : self.cpu.model_string,
"stepping" : self.cpu.stepping,
"flags" : self.cpu.flags,
- "bogomips" : self.cpu.bogomips,
"speed" : self.cpu.speed,
"family" : self.cpu.family,
"count" : self.cpu.count
}
+ if self.cpu.bogomips:
+ p["bogomips"] = self.cpu.bogomips
+
p["network"] = {
"green" : self.network.has_green(),
"blue" : self.network.has_blue(),
--
1.9.3

72
src/patches/fireinfo/0002-ARM-Read-board-model-from-device-tree-in-proc.patch
View File

@@ -1,72 +0,0 @@
From b9a068e26261007d4a0592fcb47f82658af2c775 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 3 Nov 2014 21:33:45 +0100
Subject: [PATCH 2/3] ARM: Read board model from device-tree in /proc
---
src/fireinfo/system.py | 35 +++++++++--------------------------
1 file changed, 9 insertions(+), 26 deletions(-)
diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
index 890f58c05027..195832e9f7eb 100644
--- a/src/fireinfo/system.py
+++ b/src/fireinfo/system.py
@@ -304,27 +304,6 @@ class System(object):
"""
return read_from_file("/sys/class/dmi/id/bios_vendor")
- def vendor_model_tuple(self):
- try:
- s = self.__cpuinfo["Hardware"]
- except KeyError:
- return (None, None)
-
- if s.startswith("ARM-Versatile"):
- return ("ARM", s)
-
- try:
- v, m = s.split(" ", 1)
- except ValueError:
- if s.startswith("BCM"):
- v = "Broadcom"
- m = s
- else:
- v = None
- m = s
-
- return v, m
-
@property
def vendor(self):
"""
@@ -337,8 +316,10 @@ class System(object):
break
if ret is None:
- v, m = self.vendor_model_tuple()
- ret = v
+ try:
+ return self.__cpuinfo["Hardware"]
+ except KeyError:
+ pass
return ret
@@ -353,9 +334,11 @@ class System(object):
if ret:
break
- if ret is None:
- v, m = self.vendor_model_tuple()
- ret = m
+ # Read device-tree model if available
+ ret = read_from_file("/proc/device-tree/model")
+ if ret:
+ # replace the NULL byte with which the DT string ends
+ ret = ret.replace(u"\u0000", "")
return ret
--
1.9.3

70
src/patches/fireinfo/0003-Revert-vendor-model-for-ARM-to-old-behaviour.patch
View File

@@ -1,70 +0,0 @@
From 810fe43289f5b003cbf80ebb1d9a79f52a767cdb Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Dec 2014 22:48:26 +0100
Subject: [PATCH 3/3] Revert vendor/model for ARM to old behaviour
---
src/fireinfo/system.py | 33 +++++++++++++++++++++++++++++----
1 file changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
index 195832e9f7eb..ce33837af747 100644
--- a/src/fireinfo/system.py
+++ b/src/fireinfo/system.py
@@ -304,6 +304,27 @@ class System(object):
"""
return read_from_file("/sys/class/dmi/id/bios_vendor")
+ def vendor_model_tuple(self):
+ try:
+ s = self.__cpuinfo["Hardware"]
+ except KeyError:
+ return (None, None)
+
+ if s.startswith("ARM-Versatile"):
+ return ("ARM", s)
+
+ try:
+ v, m = s.split(" ", 1)
+ except ValueError:
+ if s.startswith("BCM"):
+ v = "Broadcom"
+ m = s
+ else:
+ v = None
+ m = s
+
+ return v, m
+
@property
def vendor(self):
"""
@@ -316,10 +337,10 @@ class System(object):
break
if ret is None:
- try:
- return self.__cpuinfo["Hardware"]
- except KeyError:
- pass
+ if os.path.exists("/proc/device-tree"):
+ ret = self.__cpuinfo.get("Hardware", None)
+ else:
+ ret, m = self.vendor_model_tuple()
return ret
@@ -340,6 +361,10 @@ class System(object):
# replace the NULL byte with which the DT string ends
ret = ret.replace(u"\u0000", "")
+ # Fall back to read /proc/cpuinfo
+ if not ret:
+ v, ret = self.vendor_model_tuple()
+
return ret
@property
--
1.9.3