X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d62770f5492028d5543ac4fe2165d68dfbb31b63..002c3c665289b52eb20fd899fd3561e7f9d9e073:/package/ppp/Makefile?ds=sidebyside diff --git a/package/ppp/Makefile b/package/ppp/Makefile index b8b08d861..4ace4d936 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -1,29 +1,33 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ppp -PKG_VERSION:=2.4.3 -PKG_RELEASE:=8 +PKG_VERSION:=2.4.5 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ -PKG_MD5SUM:=848f6c3cafeb6074ffeb293c3af79b7c +PKG_MD5SUM:=4621bc56167b6953ec4071043fe0ec57 + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DEPENDS:=libpcap +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/kernel.mk define Package/ppp/Default SECTION:=net CATEGORY:=Network + MAINTAINER:=Jo-Philipp Wich URL:=http://ppp.samba.org/ endef @@ -31,73 +35,95 @@ define Package/ppp $(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 (with multilink support) + VARIANT:=multilink endef define Package/ppp/description - This package contains the PPP (Point-to-Point Protocol) daemon. +This package contains the PPP (Point-to-Point Protocol) daemon. +endef + +define Package/ppp/conffiles +/etc/ppp/chap-secrets +/etc/ppp/filter +/etc/ppp/ip-down +/etc/ppp/ip-up +/etc/ppp/ipv6-down +/etc/ppp/ipv6-up +/etc/ppp/options endef 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 define Package/ppp-mod-pppoa/description - This package contains a PPPoA (PPP over ATM) plugin for ppp. +This package contains a PPPoA (PPP over ATM) plugin for ppp. endef 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 define Package/ppp-mod-pppoe/description - This package contains a PPPoE (PPP over Ethernet) plugin for ppp. +This package contains a PPPoE (PPP over Ethernet) plugin for ppp. endef define Package/ppp-mod-radius $(call Package/ppp/Default) - DEPENDS:=ppp + DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) TITLE:=RADIUS plugin endef define Package/ppp-mod-radius/description - This package contains a RADIUS (Remote Authentication Dial-In User - Service) plugin for ppp. +This package contains a RADIUS (Remote Authentication Dial-In User Service) +plugin for ppp. +endef + +define Package/ppp-mod-radius/conffiles +/etc/ppp/radius.conf +/etc/ppp/radius/ endef define Package/chat $(call Package/ppp/Default) - DEPENDS:=ppp + DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) TITLE:=Establish conversation with a modem endef define Package/chat/description - This package contains an utility to establish conversation with other - PPP servers (via a modem). +This package contains an utility to establish conversation with other PPP servers +(via a modem). endef define Package/pppdump $(call Package/ppp/Default) - DEPENDS:=ppp + DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) TITLE:=Read PPP record file endef define Package/pppdump/description - This package contains an utility to read PPP record file. +This package contains an utility to read PPP record file. endef define Package/pppstats $(call Package/ppp/Default) - DEPENDS:=ppp + DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) TITLE:=Report PPP statistics endef define Package/pppstats/description - This package contains an utility to report PPP statistics. +This package contains an utility to report PPP statistics. endef @@ -107,58 +133,81 @@ $(call Build/Configure/Default,, \ UNAME_R="$(LINUX_VERSION)" \ UNAME_M="$(ARCH)" \ ) + mkdir -p $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux + cp \ + $(LINUX_DIR)/include/linux/compiler.h \ + $(LINUX_DIR)/include/linux/atm*.h \ + $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/ endef -define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR)/usr - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - COPTS="$(TARGET_CFLAGS)" \ +MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \ PRECOMPILED_FILTER=1 \ - STAGING_DIR="$(STAGING_DIR)" \ - DESTDIR="$(PKG_INSTALL_DIR)/usr" \ - all install + 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/ endef +ifneq ($(CONFIG_PACKAGE_netifd),) + define Package/ppp/script_install + $(INSTALL_DIR) $(1)/lib/netifd/proto + $(INSTALL_BIN) ./files/ppp.sh $(1)/lib/netifd/proto/ + endef +else + define Package/ppp/script_install + $(INSTALL_DIR) $(1)/lib/network + $(INSTALL_BIN) ./files.old/ppp.sh $(1)/lib/network/ + $(INSTALL_BIN) ./files.old/etc/ppp/ip-up $(1)/etc/ppp/ + $(INSTALL_DIR) $(1)/etc/ppp/ip-up.d + $(INSTALL_BIN) ./files.old/etc/ppp/ip-down $(1)/etc/ppp/ + $(INSTALL_DIR) $(1)/etc/ppp/ip-down.d + $(INSTALL_BIN) ./files.old/etc/ppp/ipv6-up $(1)/etc/ppp/ + $(INSTALL_BIN) ./files.old/etc/ppp/ipv6-down $(1)/etc/ppp/ + $(INSTALL_DIR) $(1)/lib/network + $(INSTALL_BIN) ./files.old/pppoe.sh $(1)/lib/network/ + $(INSTALL_DIR) $(1)/lib/network + $(INSTALL_BIN) ./files.old/pppoa.sh $(1)/lib/network/ + $(INSTALL_DIR) $(1)/etc/hotplug.d/atm + $(INSTALL_DATA) ./files.old/etc/hotplug.d/atm/20-atm-modem $(1)/etc/hotplug.d/atm/ + endef +endif + define Package/ppp/install $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION) $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pppd $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/lib/network - $(INSTALL_BIN) ./files/ppp.sh $(1)/lib/network/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/ppp $(INSTALL_CONF) ./files/etc/ppp/chap-secrets $(1)/etc/ppp/ $(INSTALL_DATA) ./files/etc/ppp/filter $(1)/etc/ppp/ - $(INSTALL_BIN) ./files/etc/ppp/ip-up $(1)/etc/ppp/ - $(INSTALL_DIR) $(1)/etc/ppp/ip-up.d - $(INSTALL_BIN) ./files/etc/ppp/ip-down $(1)/etc/ppp/ - $(INSTALL_DIR) $(1)/etc/ppp/ip-down.d - $(INSTALL_BIN) ./files/etc/ppp/ipv6-up $(1)/etc/ppp/ - $(INSTALL_BIN) ./files/etc/ppp/ipv6-down $(1)/etc/ppp/ $(INSTALL_DATA) ./files/etc/ppp/options $(1)/etc/ppp/ - ln -sf /tmp/resolv.conf.auto $(1)/etc/ppp/resolv.conf + ln -sf /tmp/resolv.conf.ppp $(1)/etc/ppp/resolv.conf + $(Package/ppp/script_install) endef - +Package/ppp-multilink/install=$(Package/ppp/install) + define Package/ppp-mod-pppoa/install $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION) - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/pppoatm.so \ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pppoatm.so \ $(1)/usr/lib/pppd/$(PKG_VERSION)/ - $(INSTALL_DIR) $(1)/lib/network - $(INSTALL_BIN) ./files/pppoa.sh $(1)/lib/network/ endef define Package/ppp-mod-pppoe/install $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION) - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \ $(1)/usr/lib/pppd/$(PKG_VERSION)/ - $(INSTALL_DIR) $(1)/lib/network - $(INSTALL_BIN) ./files/pppoe.sh $(1)/lib/network/ endef define Package/ppp-mod-radius/install $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION) - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/radius.so \ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/radius.so \ $(1)/usr/lib/pppd/$(PKG_VERSION)/ $(INSTALL_DIR) $(1)/etc/ppp $(INSTALL_DATA) ./files/etc/ppp/radius.conf $(1)/etc/ppp/ @@ -171,20 +220,21 @@ endef define Package/chat/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/chat $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/chat $(1)/usr/sbin/ endef define Package/pppdump/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pppdump $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppdump $(1)/usr/sbin/ endef define Package/pppstats/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pppstats $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppstats $(1)/usr/sbin/ 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))