luci-lib-ipkg: move out of luci-base

Move the old luci.model.ipkg utility class into a separate package and
let the components using it depend on the new library package.

Signed-off-by: Jo-Philipp Wich <redacted>

diff --git a/applications/luci-app-aria2/Makefile b/applications/luci-app-aria2/Makefile
index f5b006c357437b46af35021c856730c98ec52e9a..e957c436f1a43852a0dff8d516fa951ca6c34864 100644 (file)
--- a/applications/luci-app-aria2/Makefile
+++ b/applications/luci-app-aria2/Makefile
@@ -21,7 +21,7 @@ PKG_MAINTAINER:=Hsing-Wang Liao <kuoruan@gmail.com>
 
 # LuCI specific settings
 LUCI_TITLE:=LuCI Support for Aria2
-LUCI_DEPENDS:=+aria2
+LUCI_DEPENDS:=+luci-lib-ipkg +aria2
 LUCI_PKGARCH:=all
 
 define Package/$(PKG_NAME)/config

diff --git a/applications/luci-app-ddns/Makefile b/applications/luci-app-ddns/Makefile
index 9262afcf840b2238d21e2a63a582d015bdf2cc60..eb3a77aee76d44773e77948c333bf9f271bd5048 100644 (file)
--- a/applications/luci-app-ddns/Makefile
+++ b/applications/luci-app-ddns/Makefile
@@ -23,7 +23,7 @@ PKG_MAINTAINER:=Ansuel Smith <ansuelsmth@gmail.com>
 
 # LuCI specific settings
 LUCI_TITLE:=LuCI Support for Dynamic DNS Client (ddns-scripts)
-LUCI_DEPENDS:=+luci-mod-admin-full +ddns-scripts
+LUCI_DEPENDS:=+luci-lib-ipkg +luci-mod-admin-full +ddns-scripts
 # LUCI_PKGARCH:=all
 
 define Package/$(PKG_NAME)/config

diff --git a/applications/luci-app-dynapoint/Makefile b/applications/luci-app-dynapoint/Makefile
index 83512dba5e337e0c98da45b8136f1ca55b3cb074..e405cc41f1ad363ed0e3a6c17ff02d25417f161f 100644 (file)
--- a/applications/luci-app-dynapoint/Makefile
+++ b/applications/luci-app-dynapoint/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for DynaPoint
-LUCI_DEPENDS:=+dynapoint
+LUCI_DEPENDS:=+luci-lib-ipkg +dynapoint
 
 PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Tobias Ilte <tobias.ilte@campus.tu-berlin.de>

diff --git a/applications/luci-app-privoxy/Makefile b/applications/luci-app-privoxy/Makefile
index 486cf0ee740707548a64e725caf2631afbefcb6b..67281728363256e52844895069e4f81196c21350 100644 (file)
--- a/applications/luci-app-privoxy/Makefile
+++ b/applications/luci-app-privoxy/Makefile
@@ -21,7 +21,7 @@ PKG_MAINTAINER:=
 
 # LuCI specific settings
 LUCI_TITLE:=LuCI Support for Privoxy WEB proxy
-LUCI_DEPENDS:=+luci-mod-admin-full +privoxy
+LUCI_DEPENDS:=+luci-lib-ipkg +luci-mod-admin-full +privoxy
 LUCI_PKGARCH:=all
 
 define Package/$(PKG_NAME)/config

diff --git a/applications/luci-app-radicale/Makefile b/applications/luci-app-radicale/Makefile
index 87180e77d67540bbb48ce9b5be55f3b4e115902b..90ef0deba61d2a4819590a73d3f2443c04ef6055 100644 (file)
--- a/applications/luci-app-radicale/Makefile
+++ b/applications/luci-app-radicale/Makefile
@@ -21,7 +21,7 @@ PKG_MAINTAINER:=
 
 # LuCI specific settings
 LUCI_TITLE:=LuCI Support for Radicale CardDAV/CalDAV
-LUCI_DEPENDS:=+luci-mod-admin-full
+LUCI_DEPENDS:=+luci-lib-ipkg +luci-mod-admin-full
 LUCI_PKGARCH:=all
 
 define Package/$(PKG_NAME)/config

diff --git a/applications/luci-app-transmission/Makefile b/applications/luci-app-transmission/Makefile
index 668c73185b38131cff575e9f7144ae9ff277e40b..42b29e9a4c8521b992c15edd8cf4855f54052c4e 100644 (file)
--- a/applications/luci-app-transmission/Makefile
+++ b/applications/luci-app-transmission/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for Transmission
-LUCI_DEPENDS:=
+LUCI_DEPENDS:=+luci-lib-ipkg
 
 include ../../luci.mk
 

diff --git a/libs/luci-lib-ipkg/Makefile b/libs/luci-lib-ipkg/Makefile
new file mode 100644 (file)
index 0000000..52fcf6f
--- /dev/null
+++ b/libs/luci-lib-ipkg/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2018 Jo-Philipp Wich <jo@mein.io>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Legacy opkg interface class
+LUCI_DEPENDS:=+luci-base
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature

diff --git a/modules/luci-base/luasrc/model/ipkg.lua b/libs/luci-lib-ipkg/luasrc/model/ipkg.lua
similarity index 100%
rename from modules/luci-base/luasrc/model/ipkg.lua
rename to libs/luci-lib-ipkg/luasrc/model/ipkg.lua

diff --git a/modules/luci-base/luasrc/model/ipkg.luadoc b/libs/luci-lib-ipkg/luasrc/model/ipkg.luadoc
similarity index 100%
rename from modules/luci-base/luasrc/model/ipkg.luadoc
rename to libs/luci-lib-ipkg/luasrc/model/ipkg.luadoc

diff --git a/modules/luci-mod-freifunk/Makefile b/modules/luci-mod-freifunk/Makefile
index 550db1df1562126af183f80784eba9c800619231..70de10879ce226b940c8cce9c999fa02baf0937f 100644 (file)
--- a/modules/luci-mod-freifunk/Makefile
+++ b/modules/luci-mod-freifunk/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Freifunk module
-LUCI_DEPENDS:=+luci-mod-admin-full +luci-lib-json +freifunk-firewall +freifunk-common
+LUCI_DEPENDS:=+luci-mod-admin-full +luci-lib-json +luci-lib-ipkg +freifunk-firewall +freifunk-common
 
 include ../../luci.mk