From 4bbe32548c407ec6ae104934b3f1fe53539de9f6 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 14 Nov 2018 14:35:01 +0100 Subject: [PATCH] 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 --- applications/luci-app-aria2/Makefile | 2 +- applications/luci-app-ddns/Makefile | 2 +- applications/luci-app-dynapoint/Makefile | 2 +- applications/luci-app-privoxy/Makefile | 2 +- applications/luci-app-radicale/Makefile | 2 +- applications/luci-app-transmission/Makefile | 2 +- libs/luci-lib-ipkg/Makefile | 14 ++++++++++++++ .../luci-lib-ipkg}/luasrc/model/ipkg.lua | 0 .../luci-lib-ipkg}/luasrc/model/ipkg.luadoc | 0 modules/luci-mod-freifunk/Makefile | 2 +- 10 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 libs/luci-lib-ipkg/Makefile rename {modules/luci-base => libs/luci-lib-ipkg}/luasrc/model/ipkg.lua (100%) rename {modules/luci-base => libs/luci-lib-ipkg}/luasrc/model/ipkg.luadoc (100%) diff --git a/applications/luci-app-aria2/Makefile b/applications/luci-app-aria2/Makefile index f5b006c357..e957c436f1 100644 --- a/applications/luci-app-aria2/Makefile +++ b/applications/luci-app-aria2/Makefile @@ -21,7 +21,7 @@ PKG_MAINTAINER:=Hsing-Wang Liao # 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 9262afcf84..eb3a77aee7 100644 --- a/applications/luci-app-ddns/Makefile +++ b/applications/luci-app-ddns/Makefile @@ -23,7 +23,7 @@ PKG_MAINTAINER:=Ansuel Smith # 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 83512dba5e..e405cc41f1 100644 --- 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 diff --git a/applications/luci-app-privoxy/Makefile b/applications/luci-app-privoxy/Makefile index 486cf0ee74..6728172836 100644 --- 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 87180e77d6..90ef0deba6 100644 --- 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 668c73185b..42b29e9a4c 100644 --- 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 index 0000000000..52fcf6fe82 --- /dev/null +++ b/libs/luci-lib-ipkg/Makefile @@ -0,0 +1,14 @@ +# +# Copyright (C) 2018 Jo-Philipp Wich +# +# 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 550db1df15..70de10879c 100644 --- 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 -- 2.30.2