projects
/
openwrt
/
staging
/
dedeckeh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9e0b3a1
)
ppp: move multilink support into a separate build variant - saves around 30k for...
author
Felix Fietkau
<nbd@openwrt.org>
Sun, 13 Feb 2011 16:23:15 +0000
(16:23 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 13 Feb 2011 16:23:15 +0000
(16:23 +0000)
SVN-Revision: 25523
package/ppp/Makefile
patch
|
blob
|
history
diff --git
a/package/ppp/Makefile
b/package/ppp/Makefile
index 4c5cac39784250faae15333d530cef39cb372dd1..1f423789be5cd68f827d032f35e6c18fb5e0b1e3 100644
(file)
--- a/
package/ppp/Makefile
+++ b/
package/ppp/Makefile
@@
-16,6
+16,8
@@
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
PKG_MD5SUM:=183800762e266132218b204dfb428d29
PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
PKG_MD5SUM:=183800762e266132218b204dfb428d29
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
PKG_BUILD_DEPENDS:=libpcap
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=libpcap
PKG_INSTALL:=1
@@
-33,7
+35,14
@@
define Package/ppp
$(call Package/ppp/Default)
DEPENDS:=+kmod-ppp
TITLE:=PPP daemon
$(call Package/ppp/Default)
DEPENDS:=+kmod-ppp
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
define Package/ppp/description
endef
define Package/ppp/description
@@
-52,7
+61,7
@@
endef
define Package/ppp-mod-pppoa
$(call Package/ppp/Default)
define Package/ppp-mod-pppoa
$(call Package/ppp/Default)
- DEPENDS:=
ppp
+linux-atm +kmod-pppoa
+ DEPENDS:=
@(PACKAGE_ppp||PACKAGE_ppp-multilink)
+linux-atm +kmod-pppoa
TITLE:=PPPoA plugin
endef
TITLE:=PPPoA plugin
endef
@@
-62,7
+71,7
@@
endef
define Package/ppp-mod-pppoe
$(call Package/ppp/Default)
define Package/ppp-mod-pppoe
$(call Package/ppp/Default)
- DEPENDS:=
ppp
+kmod-pppoe
+ DEPENDS:=
@(PACKAGE_ppp||PACKAGE_ppp-multilink)
+kmod-pppoe
TITLE:=PPPoE plugin
endef
TITLE:=PPPoE plugin
endef
@@
-72,7
+81,7
@@
endef
define Package/ppp-mod-radius
$(call Package/ppp/Default)
define Package/ppp-mod-radius
$(call Package/ppp/Default)
- DEPENDS:=
ppp
+ DEPENDS:=
@(PACKAGE_ppp||PACKAGE_ppp-multilink)
TITLE:=RADIUS plugin
endef
TITLE:=RADIUS plugin
endef
@@
-88,7
+97,7
@@
endef
define Package/chat
$(call Package/ppp/Default)
define Package/chat
$(call Package/ppp/Default)
- DEPENDS:=
ppp
+ DEPENDS:=
@(PACKAGE_ppp||PACKAGE_ppp-multilink)
TITLE:=Establish conversation with a modem
endef
TITLE:=Establish conversation with a modem
endef
@@
-99,7
+108,7
@@
endef
define Package/pppdump
$(call Package/ppp/Default)
define Package/pppdump
$(call Package/ppp/Default)
- DEPENDS:=
ppp
+ DEPENDS:=
@(PACKAGE_ppp||PACKAGE_ppp-multilink)
TITLE:=Read PPP record file
endef
TITLE:=Read PPP record file
endef
@@
-109,7
+118,7
@@
endef
define Package/pppstats
$(call Package/ppp/Default)
define Package/pppstats
$(call Package/ppp/Default)
- DEPENDS:=
ppp
+ DEPENDS:=
@(PACKAGE_ppp||PACKAGE_ppp-multilink)
TITLE:=Report PPP statistics
endef
TITLE:=Report PPP statistics
endef
@@
-135,6
+144,13
@@
MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \
PRECOMPILED_FILTER=1 \
STAGING_DIR="$(STAGING_DIR)"
PRECOMPILED_FILTER=1 \
STAGING_DIR="$(STAGING_DIR)"
+ifeq ($(BUILD_VARIANT),multilink)
+ MAKE_FLAGS += HAVE_MULTILINK=y
+else
+ MAKE_FLAGS += HAVE_MULTILINK=
+endif
+
+
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/include/pppd $(1)/usr/include/
define Build/InstallDev
$(INSTALL_DIR) $(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/
ln -sf /tmp/resolv.conf.ppp $(1)/etc/ppp/resolv.conf
endef
$(INSTALL_DATA) ./files/etc/ppp/options $(1)/etc/ppp/
ln -sf /tmp/resolv.conf.ppp $(1)/etc/ppp/resolv.conf
endef
+Package/ppp-multilink/install=$(Package/ppp/install)
define Package/ppp-mod-pppoa/install
$(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
define Package/ppp-mod-pppoa/install
$(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
@@
-206,6
+223,7
@@
define Package/pppstats/install
endef
$(eval $(call BuildPackage,ppp))
endef
$(eval $(call BuildPackage,ppp))
+$(eval $(call BuildPackage,ppp-multilink))
$(eval $(call BuildPackage,ppp-mod-pppoa))
$(eval $(call BuildPackage,ppp-mod-pppoe))
$(eval $(call BuildPackage,ppp-mod-radius))
$(eval $(call BuildPackage,ppp-mod-pppoa))
$(eval $(call BuildPackage,ppp-mod-pppoe))
$(eval $(call BuildPackage,ppp-mod-radius))