X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fppp%2FMakefile;h=3f7aa7bdb907236593bc0c8c84b261878a6edee0;hb=fdf6cea92ad6996ec02d122998f8de595c61a1d4;hp=e49b610c36b49e878e2d3323b3c98c47c879d890;hpb=c4f3575368c5aeef4134d82125df2814d688cc2a;p=openwrt.git diff --git a/package/ppp/Makefile b/package/ppp/Makefile index e49b610c36..3f7aa7bdb9 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -1,164 +1,262 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2012 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:=7 -PKG_BUILDDEP:=libpcap linux-atm +PKG_VERSION:=2.4.5 +PKG_RELEASE:=6 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ -PKG_MD5SUM:=848f6c3cafeb6074ffeb293c3af79b7c -PKG_CAT:=zcat +PKG_MD5SUM:=4621bc56167b6953ec4071043fe0ec57 + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_BUILD_DEPENDS:=libpcap + +PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +define Package/ppp/Default + SECTION:=net + CATEGORY:=Network + MAINTAINER:=Jo-Philipp Wich + URL:=http://ppp.samba.org/ +endef + define Package/ppp -SECTION:=net -CATEGORY:=Network -MENU:=1 -DEFAULT:=y -TITLE:=PPP daemon -DESCRIPTION:=PPP (Point-to-Point Protocol) daemon -URL:=http://ppp.samba.org/ +$(call Package/ppp/Default) + DEPENDS:=+kmod-ppp + TITLE:=PPP daemon + 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. +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 -SECTION:=net -CATEGORY:=Network -DEPENDS:=ppp +linux-atm -TITLE:=PPPoA plugin -DESCRIPTION:=PPPoA (PPP over ATM) plugin for ppp +$(call Package/ppp/Default) + 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. endef define Package/ppp-mod-pppoe -SECTION:=net -CATEGORY:=Network -DEFAULT:=y -DEPENDS:=ppp -TITLE:=PPPoE plugin -DESCRIPTION:=PPPoE (PPP over Ethernet) plugin for ppp +$(call Package/ppp/Default) + 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. endef define Package/ppp-mod-radius -SECTION:=net -CATEGORY:=Network -DEPENDS:=ppp -TITLE:=RADIUS plugin -DESCRIPTION:=RADIUS (Remote Authentication Dial-In User Service) plugin for ppp +$(call Package/ppp/Default) + 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. +endef + +define Package/ppp-mod-radius/conffiles +/etc/ppp/radius.conf +/etc/ppp/radius/ +endef + +define Package/ppp-mod-pppol2tp +$(call Package/ppp/Default) + DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +kmod-pppol2tp + TITLE:=PPPoL2TP plugin +endef + +define Package/ppp-mod-pppol2tp/description +This package contains a PPPoL2TP (PPP over L2TP) plugin for ppp. +endef + +define Package/ppp-mod-pptp +$(call Package/ppp/Default) + DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +kmod-pptp +kmod-mppe +resolveip + TITLE:=PPtP plugin +endef + +define Package/ppp-mod-pptp/description +This package contains a PPtP plugin for ppp. endef define Package/chat -SECTION:=net -CATEGORY:=Network -DEPENDS:=ppp -TITLE:=Establish conversation with a modem -DESCRIPTION:=Utility to establish conversation with other PPP servers (via a modem) +$(call Package/ppp/Default) + 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). endef define Package/pppdump -SECTION:=net -CATEGORY:=Network -DEPENDS:=ppp -TITLE:=Read PPP record file -DESCRIPTION:=Utility to read PPP record file +$(call Package/ppp/Default) + 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. endef define Package/pppstats -SECTION:=net -CATEGORY:=Network -DEPENDS:=ppp -TITLE:=Report PPP statistics -DESCRIPTION:=Utility to report PPP statistics -endef - -define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR)/usr - $(MAKE) -C $(PKG_BUILD_DIR) \ - CC=$(TARGET_CC) \ - COPTS="$(TARGET_CFLAGS)" \ +$(call Package/ppp/Default) + DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) + TITLE:=Report PPP statistics +endef + +define Package/pppstats/description +This package contains an utility to report PPP statistics. +endef + + +define Build/Configure +$(call Build/Configure/Default,, \ + UNAME_S="Linux" \ + 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 + +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 + +define Package/ppp/script_install endef define Package/ppp/install - install -d -m0755 $(1)/lib/network - install -m0755 ./files/ppp.sh $(1)/lib/network/ - install -d -m0755 $(1)/etc/ppp - install -m0600 ./files/etc/ppp/chap-secrets $(1)/etc/ppp/ - install -m0644 ./files/etc/ppp/filter $(1)/etc/ppp/ - install -m0755 ./files/etc/ppp/ip-up $(1)/etc/ppp/ - install -d -m0755 $(1)/etc/ppp/ip-up.d - install -m0755 ./files/etc/ppp/ip-down $(1)/etc/ppp/ - install -d -m0755 $(1)/etc/ppp/ip-down.d - install -m0644 ./files/etc/ppp/options $(1)/etc/ppp/ - ln -sf /tmp/resolv.conf $(1)/etc/ppp/resolv.conf - install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION) - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppd $(1)/usr/sbin/ -endef - + $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION) + $(INSTALL_DIR) $(1)/usr/sbin + $(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_DATA) ./files/etc/ppp/options $(1)/etc/ppp/ + ln -sf /tmp/resolv.conf.ppp $(1)/etc/ppp/resolv.conf + $(INSTALL_DIR) $(1)/lib/netifd/proto + $(INSTALL_BIN) ./files/ppp.sh $(1)/lib/netifd/proto/ + $(INSTALL_BIN) ./files/lib/netifd/ppp-up $(1)/lib/netifd/ + $(INSTALL_BIN) ./files/lib/netifd/ppp-down $(1)/lib/netifd/ +endef +Package/ppp-multilink/install=$(Package/ppp/install) + define Package/ppp-mod-pppoa/install - install -d -m0755 $(1)/lib/network - install -m0755 ./files/pppoa.sh $(1)/lib/network/ - install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION) - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/pppoatm.so \ + $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION) + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pppoatm.so \ $(1)/usr/lib/pppd/$(PKG_VERSION)/ endef define Package/ppp-mod-pppoe/install - install -d -m0755 $(1)/lib/network - install -m0755 ./files/pppoe.sh $(1)/lib/network/ - install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION) - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \ + $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION) + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \ $(1)/usr/lib/pppd/$(PKG_VERSION)/ endef define Package/ppp-mod-radius/install - install -d -m0755 $(1)/etc/ppp - install -m644 ./files/etc/ppp/radius.conf $(1)/etc/ppp/ - install -d -m0755 $(1)/etc/ppp/radius - install -m644 ./files/etc/ppp/radius/dictionary* \ + $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION) + $(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/ + $(INSTALL_DIR) $(1)/etc/ppp/radius + $(INSTALL_DATA) ./files/etc/ppp/radius/dictionary* \ $(1)/etc/ppp/radius/ - install -m600 ./files/etc/ppp/radius/servers \ + $(INSTALL_CONF) ./files/etc/ppp/radius/servers \ $(1)/etc/ppp/radius/ - install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION) - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/radius.so \ +endef + +define Package/ppp-mod-pppol2tp/install + $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION) + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pppol2tp.so \ + $(1)/usr/lib/pppd/$(PKG_VERSION)/ +endef + +define Package/ppp-mod-pptp/install + $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION) + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pptp.so \ $(1)/usr/lib/pppd/$(PKG_VERSION)/ + $(INSTALL_DIR) $(1)/etc/ppp + $(INSTALL_DATA) ./files/etc/ppp/options.pptp $(1)/etc/ppp/ endef define Package/chat/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/chat $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/chat $(1)/usr/sbin/ endef define Package/pppdump/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppdump $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppdump $(1)/usr/sbin/ endef define Package/pppstats/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppstats $(1)/usr/sbin/ + $(INSTALL_DIR) $(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)) +$(eval $(call BuildPackage,ppp-mod-pppol2tp)) +$(eval $(call BuildPackage,ppp-mod-pptp)) $(eval $(call BuildPackage,chat)) $(eval $(call BuildPackage,pppdump)) $(eval $(call BuildPackage,pppstats))