Added missing dependency which broke LuCI

Removed unneeded Broadcom sanity check

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 5bab3b7cbd3592a2ae93a231b5efa63c063dd79f..a4441de5b6ff96c5a3daa657bc26c12f22bb47bd 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -100,7 +100,7 @@ endef
 
 define Package/luci-core
   $(call Package/luci/libtemplate)
-  DEPENDS:=+lua +luaposix
+  DEPENDS:=+lua +luaposix +bitlib
   TITLE:=LuCI core libraries
 endef
 

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 3ebaebcee616f3745995f78b4b58d8acd3e9e2b9..fec652699125ca052d39ce7ff52167c23d5684a0 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -243,10 +243,9 @@ function action_upgrade()
 
        local ret  = nil
        local plat = luci.fs.mtime("/lib/upgrade/platform.sh")
-       local broadcom = os.execute('grep brcm_ /lib/upgrade/platform.sh >/dev/null 2>&1') == 0
        local tmpfile = "/tmp/firmware.img"
        
-       local keep_avail = not broadcom
+       local keep_avail = true
 
        local file
        luci.http.setfilehandler(

diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua
index 0df4f8cc47e25040e867841d2eac448356449400..60f29323d891e8ed541fa6c427acf5ad8ae744b7 100644 (file)
--- a/modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -81,10 +81,9 @@ function action_upgrade()
 
        local ret  = nil
        local plat = luci.fs.mtime("/lib/upgrade/platform.sh")
-       local broadcom = os.execute('grep brcm_ /lib/upgrade/platform.sh >/dev/null 2>&1') == 0
        local tmpfile = "/tmp/firmware.img"
        
-       local keep_avail = not broadcom
+       local keep_avail = true
 
        local file
        luci.http.setfilehandler(