From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 8 Mar 2018 10:14:09 +0000 (+0100)
Subject: ppp: make ppp-multilink provide ppp
X-Git-Tag: v18.06.0-rc1~661
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=092d75aa3e86db8331fffdbd0a99987df9dc438b;p=openwrt%2Fstaging%2Fchunkeey.git

ppp: make ppp-multilink provide ppp

Fixes dependencies on ppp from other packages

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index beeaa53c22..ab8780b83d 100644
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@@ -46,6 +46,7 @@ $(call Package/ppp/Default)
   DEPENDS:=+kmod-ppp
   TITLE:=PPP daemon (with multilink support)
   VARIANT:=multilink
+  PROVIDES:=ppp
 endef
 
 define Package/ppp/description
@@ -64,7 +65,7 @@ endef
 
 define Package/ppp-mod-pppoa
 $(call Package/ppp/Default)
-  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +linux-atm +kmod-pppoa
+  DEPENDS:=ppp +linux-atm +kmod-pppoa
   TITLE:=PPPoA plugin
 endef
 
@@ -74,7 +75,7 @@ endef
 
 define Package/ppp-mod-pppoe
 $(call Package/ppp/Default)
-  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +kmod-pppoe
+  DEPENDS:=ppp +kmod-pppoe
   TITLE:=PPPoE plugin
 endef
 
@@ -84,7 +85,7 @@ endef
 
 define Package/ppp-mod-radius
 $(call Package/ppp/Default)
-  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)
+  DEPENDS:=ppp
   TITLE:=RADIUS plugin
 endef
 
@@ -100,7 +101,7 @@ endef
 
 define Package/ppp-mod-pppol2tp
 $(call Package/ppp/Default)
-  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +kmod-pppol2tp
+  DEPENDS:=ppp +kmod-pppol2tp
   TITLE:=PPPoL2TP plugin
 endef
 
@@ -110,7 +111,7 @@ endef
 
 define Package/ppp-mod-pptp
 $(call Package/ppp/Default)
-  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +kmod-pptp +kmod-mppe +resolveip
+  DEPENDS:=ppp +kmod-pptp +kmod-mppe +resolveip
   TITLE:=PPtP plugin
 endef
 
@@ -120,7 +121,7 @@ endef
 
 define Package/ppp-mod-passwordfd
 $(call Package/ppp/Default)
-  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)
+  DEPENDS:=ppp
   TITLE:=pap/chap secret from filedescriptor
 endef
 
@@ -141,7 +142,7 @@ endef
 
 define Package/pppdump
 $(call Package/ppp/Default)
-  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)
+  DEPENDS:=ppp
   TITLE:=Read PPP record file
 endef
 
@@ -151,7 +152,7 @@ endef
 
 define Package/pppstats
 $(call Package/ppp/Default)
-  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)
+  DEPENDS:=ppp
   TITLE:=Report PPP statistics
 endef
 
@@ -161,7 +162,7 @@ endef
 
 define Package/pppoe-discovery
 $(call Package/ppp/Default)
-  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +ppp-mod-pppoe
+  DEPENDS:=ppp +ppp-mod-pppoe
   TITLE:=Perform a PPPoE-discovery process
 endef