KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "ppp: make ppp-multilink provide ppp"

Browse source 
opkg currently has some issues with Provides and this change makes the
image builder fail because of that. Revert the change for now until opkg
is fixed

This reverts commit 092d75aa3e.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2018-03-29 11:57:08 +02:00
parent d7ca4c6d3e
commit 4bcf6acb14
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
package/network/services/ppp/Makefile
View file

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