brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / package / ppp / Makefile

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index b5a317b..6ee52ab 100644 (file)
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -1,179 +1,229 @@
-# 
-# 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.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 
 include $(TOPDIR)/rules.mk

+include $(INCLUDE_DIR)/kernel.mk

 
 PKG_NAME:=ppp
 
 PKG_NAME:=ppp

-PKG_VERSION:=2.4.3
-PKG_RELEASE:=7
+PKG_VERSION:=2.4.4
+PKG_RELEASE:=17

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
 
 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:=183800762e266132218b204dfb428d29

 
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

 
 

-PKG_BUILDDEP:=libpcap linux-atm
+PKG_BUILD_DEPENDS:=libpcap
+
+PKG_INSTALL:=1

 
 include $(INCLUDE_DIR)/package.mk
 
 include $(INCLUDE_DIR)/package.mk

-include $(INCLUDE_DIR)/kernel.mk

 
 define Package/ppp/Default
   SECTION:=net
   CATEGORY:=Network
 
 define Package/ppp/Default
   SECTION:=net
   CATEGORY:=Network

+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>

   URL:=http://ppp.samba.org/
 endef
 
 define Package/ppp
   URL:=http://ppp.samba.org/
 endef
 
 define Package/ppp

-  $(call Package/ppp/Default)
-  DEFAULT:=y
+$(call Package/ppp/Default)

   DEPENDS:=+kmod-ppp
   TITLE:=PPP daemon
   DEPENDS:=+kmod-ppp
   TITLE:=PPP daemon

-  DESCRIPTION:=\
-       This package contains the PPP (Point-to-Point Protocol) 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.
+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
 endef
 
 define Package/ppp-mod-pppoa

-  $(call Package/ppp/Default)
-  DEPENDS:=ppp +linux-atm +kmod-pppoa
+$(call Package/ppp/Default)
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +linux-atm +kmod-pppoa

   TITLE:=PPPoA plugin
   TITLE:=PPPoA plugin

-  DESCRIPTION:=\
-       This package contains a PPPoA (PPP over ATM) plugin for ppp.
+endef
+
+define Package/ppp-mod-pppoa/description
+This package contains a PPPoA (PPP over ATM) plugin for ppp.

 endef
 
 define Package/ppp-mod-pppoe
 endef
 
 define Package/ppp-mod-pppoe

-  $(call Package/ppp/Default)
-  DEFAULT:=y
-  DEPENDS:=ppp +kmod-pppoe
+$(call Package/ppp/Default)
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +kmod-pppoe

   TITLE:=PPPoE plugin
   TITLE:=PPPoE plugin

-  DESCRIPTION:=\
-       This package contains a PPPoE (PPP over Ethernet) plugin for ppp.
+endef
+
+define Package/ppp-mod-pppoe/description
+This package contains a PPPoE (PPP over Ethernet) plugin for ppp.

 endef
 
 define Package/ppp-mod-radius
 endef
 
 define Package/ppp-mod-radius

-  $(call Package/ppp/Default)
-  DEPENDS:=ppp
+$(call Package/ppp/Default)
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)

   TITLE:=RADIUS plugin
   TITLE:=RADIUS plugin

-  DESCRIPTION:=\
-       This package contains a RADIUS (Remote Authentication Dial-In User \\\
-       Service) plugin for ppp.
+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/chat
 endef
 
 define Package/chat

-  $(call Package/ppp/Default)
-  DEPENDS:=ppp
+$(call Package/ppp/Default)
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)

   TITLE:=Establish conversation with a modem
   TITLE:=Establish conversation with a modem

-  DESCRIPTION:=\
-       This package contains an utility to establish conversation with other \\\
-       PPP servers (via 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
 endef
 
 define Package/pppdump

-  $(call Package/ppp/Default)
-  DEPENDS:=ppp
+$(call Package/ppp/Default)
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)

   TITLE:=Read PPP record file
   TITLE:=Read PPP record file

-  DESCRIPTION:=\
-       This package contains an utility to read PPP record file.
+endef
+
+define Package/pppdump/description
+This package contains an utility to read PPP record file.

 endef
 
 define Package/pppstats
 endef
 
 define Package/pppstats

-  $(call Package/ppp/Default)
-  DEPENDS:=ppp
+$(call Package/ppp/Default)
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)

   TITLE:=Report PPP statistics
   TITLE:=Report PPP statistics

-  DESCRIPTION:=\
-       This package contains an utility to report PPP statistics.

 endef
 
 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)" \
 )
 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
 
 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 \
                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/install
 endef
 
 define Package/ppp/install

-       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/
-       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
-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)/lib/network
+       $(INSTALL_BIN) ./files/ppp.sh $(1)/lib/network/
+       $(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.ppp $(1)/etc/ppp/resolv.conf
+endef
+Package/ppp-multilink/install=$(Package/ppp/install)
+

 define Package/ppp-mod-pppoa/install
 define Package/ppp-mod-pppoa/install

-       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)/
                $(1)/usr/lib/pppd/$(PKG_VERSION)/

-       install -d -m0755 $(1)/lib/network
-       install -m0755 ./files/pppoa.sh $(1)/lib/network/
+       $(INSTALL_DIR) $(1)/lib/network
+       $(INSTALL_BIN) ./files/pppoa.sh $(1)/lib/network/
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/atm
+       $(INSTALL_DATA) ./files/etc/hotplug.d/atm/20-atm-modem $(1)/etc/hotplug.d/atm/

 endef
 
 define Package/ppp-mod-pppoe/install
 endef
 
 define Package/ppp-mod-pppoe/install

-       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)/
                $(1)/usr/lib/pppd/$(PKG_VERSION)/

-       install -d -m0755 $(1)/lib/network
-       install -m0755 ./files/pppoe.sh $(1)/lib/network/
+       $(INSTALL_DIR) $(1)/lib/network
+       $(INSTALL_BIN) ./files/pppoe.sh $(1)/lib/network/

 endef
 
 define Package/ppp-mod-radius/install
 endef
 
 define Package/ppp-mod-radius/install

-       install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
-       install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/radius.so \
+       $(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)/
                $(1)/usr/lib/pppd/$(PKG_VERSION)/

-       install -d -m0755 $(1)/etc/ppp
-       install -m0644 ./files/etc/ppp/radius.conf $(1)/etc/ppp/
-       install -d -m0755 $(1)/etc/ppp/radius
-       install -m0644 ./files/etc/ppp/radius/dictionary* \
+       $(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/
                $(1)/etc/ppp/radius/

-       install -m0600 ./files/etc/ppp/radius/servers \
+       $(INSTALL_CONF) ./files/etc/ppp/radius/servers \

                $(1)/etc/ppp/radius/
 endef
 
 define Package/chat/install
                $(1)/etc/ppp/radius/
 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
 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
 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))
 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))