summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--contrib/package/luci/Makefile16
-rw-r--r--libs/ipkg/luasrc/model/ipkg.lua (renamed from libs/core/luasrc/model/ipkg.lua)0
2 files changed, 15 insertions, 1 deletions
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 4dff5a7b51..edd8949d0a 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -177,6 +177,16 @@ define Package/luci-http/install
endef
+define Package/luci-ipkg
+ $(call Package/luci/libtemplate)
+ TITLE:=LuCI IPKG/OPKG call abstraction library
+endef
+
+define Package/luci-ipkg/install
+ $(call Package/luci/install/template,$(1),libs/ipkg)
+endef
+
+
define Package/luci-web
$(call Package/luci/libtemplate)
DEPENDS+=+luci-http +luci-addons +luci-uci +luci-sgi-cgi
@@ -314,7 +324,7 @@ endef
define Package/luci-admin-full
$(call Package/luci/webtemplate)
- DEPENDS+=+luci-admin-core
+ DEPENDS+=+luci-admin-core +luci-ipkg
TITLE:=LuCI Administration - power user's interface
endef
@@ -544,6 +554,9 @@ endif
ifneq ($(CONFIG_PACKAGE_luci-http),)
PKG_SELECTED_MODULES+=libs/http
endif
+ifneq ($(CONFIG_PACKAGE_luci-ipkg),)
+ PKG_SELECTED_MODULES+=libs/ipkg
+endif
ifneq ($(CONFIG_PACKAGE_luci-uci),)
PKG_SELECTED_MODULES+=libs/uci
endif
@@ -653,6 +666,7 @@ $(eval $(call BuildPackage,luci-core))
$(eval $(call BuildPackage,luci-cbi))
$(eval $(call BuildPackage,luci-fastindex))
$(eval $(call BuildPackage,luci-http))
+$(eval $(call BuildPackage,luci-ipkg))
$(eval $(call BuildPackage,luci-uci))
$(eval $(call BuildPackage,luci-web))
diff --git a/libs/core/luasrc/model/ipkg.lua b/libs/ipkg/luasrc/model/ipkg.lua
index 075acc4c3a..075acc4c3a 100644
--- a/libs/core/luasrc/model/ipkg.lua
+++ b/libs/ipkg/luasrc/model/ipkg.lua