ppp: move multilink support into a separate build variant - saves around 30k for the default build

SVN-Revision: 25523
This commit is contained in:
Felix Fietkau 2011-02-13 16:23:15 +00:00
parent 9e0b3a1b37
commit 63fef8ed5d

View file

@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
PKG_MD5SUM:=183800762e266132218b204dfb428d29 PKG_MD5SUM:=183800762e266132218b204dfb428d29
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=libpcap PKG_BUILD_DEPENDS:=libpcap
PKG_INSTALL:=1 PKG_INSTALL:=1
@ -33,7 +35,14 @@ define Package/ppp
$(call Package/ppp/Default) $(call Package/ppp/Default)
DEPENDS:=+kmod-ppp DEPENDS:=+kmod-ppp
TITLE:=PPP daemon TITLE:=PPP daemon
MENU:=1 VARIANT:=default
endef
define Package/ppp-multilink
$(call Package/ppp/Default)
DEPENDS:=+kmod-ppp
TITLE:=PPP daemon
VARIANT:=multilink
endef endef
define Package/ppp/description define Package/ppp/description
@ -52,7 +61,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
@ -62,7 +71,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
@ -72,7 +81,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
@ -88,7 +97,7 @@ endef
define Package/chat define Package/chat
$(call Package/ppp/Default) $(call Package/ppp/Default)
DEPENDS:=ppp DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)
TITLE:=Establish conversation with a modem TITLE:=Establish conversation with a modem
endef endef
@ -99,7 +108,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
@ -109,7 +118,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
@ -135,6 +144,13 @@ MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \
PRECOMPILED_FILTER=1 \ PRECOMPILED_FILTER=1 \
STAGING_DIR="$(STAGING_DIR)" STAGING_DIR="$(STAGING_DIR)"
ifeq ($(BUILD_VARIANT),multilink)
MAKE_FLAGS += HAVE_MULTILINK=y
else
MAKE_FLAGS += HAVE_MULTILINK=
endif
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/include/pppd $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/include/pppd $(1)/usr/include/
@ -158,6 +174,7 @@ define Package/ppp/install
$(INSTALL_DATA) ./files/etc/ppp/options $(1)/etc/ppp/ $(INSTALL_DATA) ./files/etc/ppp/options $(1)/etc/ppp/
ln -sf /tmp/resolv.conf.ppp $(1)/etc/ppp/resolv.conf ln -sf /tmp/resolv.conf.ppp $(1)/etc/ppp/resolv.conf
endef endef
Package/ppp-multilink/install=$(Package/ppp/install)
define Package/ppp-mod-pppoa/install define Package/ppp-mod-pppoa/install
$(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION) $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
@ -206,6 +223,7 @@ define Package/pppstats/install
endef endef
$(eval $(call BuildPackage,ppp)) $(eval $(call BuildPackage,ppp))
$(eval $(call BuildPackage,ppp-multilink))
$(eval $(call BuildPackage,ppp-mod-pppoa)) $(eval $(call BuildPackage,ppp-mod-pppoa))
$(eval $(call BuildPackage,ppp-mod-pppoe)) $(eval $(call BuildPackage,ppp-mod-pppoe))
$(eval $(call BuildPackage,ppp-mod-radius)) $(eval $(call BuildPackage,ppp-mod-radius))