projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rename the <boardname>-<kernelversion> directories of base-files to just <boardname...
[openwrt.git] / package / ppp / Makefile
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index e49b610..80c6f5a 100644 (file)
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -11,82 +11,101 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.3
 PKG_RELEASE:=7
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.3
 PKG_RELEASE:=7
-PKG_BUILDDEP:=libpcap linux-atm
 
 
-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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
 PKG_MD5SUM:=848f6c3cafeb6074ffeb293c3af79b7c
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
+PKG_BUILDDEP:=libpcap linux-atm
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+define Package/ppp/Default
+  SECTION:=net
+  CATEGORY:=Network
+  URL:=http://ppp.samba.org/
+endef
 
 define Package/ppp
 
 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)
+  DEFAULT:=y
+  DEPENDS:=+kmod-ppp
+  TITLE:=PPP daemon
+  DESCRIPTION:=\
+       This package contains the PPP (Point-to-Point Protocol) daemon.
+  MENU:=1
 endef
 
 define Package/ppp-mod-pppoa
 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:=ppp +linux-atm +kmod-pppoa
+  DEFAULT:=y if LINUX_2_4_AR7
+  TITLE:=PPPoA plugin
+  DESCRIPTION:=\
+       This package contains a PPPoA (PPP over ATM) plugin for ppp.
 endef
 
 define Package/ppp-mod-pppoe
 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)
+  DEFAULT:=y
+  DEPENDS:=ppp +kmod-pppoe
+  TITLE:=PPPoE plugin
+  DESCRIPTION:=\
+       This package contains a PPPoE (PPP over Ethernet) plugin for ppp.
 endef
 
 define Package/ppp-mod-radius
 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:=ppp
+  TITLE:=RADIUS plugin
+  DESCRIPTION:=\
+       This package contains a RADIUS (Remote Authentication Dial-In User \\\
+       Service) plugin for ppp.
 endef
 
 define Package/chat
 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:=ppp
+  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/pppdump
 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:=ppp
+  TITLE:=Read PPP record file
+  DESCRIPTION:=\
+       This package contains an utility to read PPP record file.
 endef
 
 define Package/pppstats
 endef
 
 define Package/pppstats
-SECTION:=net
-CATEGORY:=Network
-DEPENDS:=ppp
-TITLE:=Report PPP statistics
-DESCRIPTION:=Utility to report PPP statistics
+  $(call Package/ppp/Default)
+  DEPENDS:=ppp
+  TITLE:=Report PPP statistics
+  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)" \
+)
 endef
 
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)/usr
        $(MAKE) -C $(PKG_BUILD_DIR) \
 endef
 
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)/usr
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC=$(TARGET_CC) \
+               $(TARGET_CONFIGURE_OPTS) \
                COPTS="$(TARGET_CFLAGS)" \
                PRECOMPILED_FILTER=1 \
                STAGING_DIR="$(STAGING_DIR)" \
                COPTS="$(TARGET_CFLAGS)" \
                PRECOMPILED_FILTER=1 \
                STAGING_DIR="$(STAGING_DIR)" \
@@ -95,6 +114,9 @@ define Build/Compile
 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 -d -m0755 $(1)/lib/network
        install -m0755 ./files/ppp.sh $(1)/lib/network/
        install -d -m0755 $(1)/etc/ppp
@@ -106,38 +128,35 @@ define Package/ppp/install
        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)/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
        
 define Package/ppp-mod-pppoa/install
 endef
        
 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 \
                $(1)/usr/lib/pppd/$(PKG_VERSION)/
        install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
        install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/pppoatm.so \
                $(1)/usr/lib/pppd/$(PKG_VERSION)/
+       install -d -m0755 $(1)/lib/network
+       install -m0755 ./files/pppoa.sh $(1)/lib/network/
 endef
 
 define Package/ppp-mod-pppoe/install
 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 \
                $(1)/usr/lib/pppd/$(PKG_VERSION)/
        install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
        install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \
                $(1)/usr/lib/pppd/$(PKG_VERSION)/
+       install -d -m0755 $(1)/lib/network
+       install -m0755 ./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 \
+               $(1)/usr/lib/pppd/$(PKG_VERSION)/
        install -d -m0755 $(1)/etc/ppp
        install -d -m0755 $(1)/etc/ppp
-       install -m644 ./files/etc/ppp/radius.conf $(1)/etc/ppp/
+       install -m0644 ./files/etc/ppp/radius.conf $(1)/etc/ppp/
        install -d -m0755 $(1)/etc/ppp/radius
        install -d -m0755 $(1)/etc/ppp/radius
-       install -m644 ./files/etc/ppp/radius/dictionary* \
+       install -m0644 ./files/etc/ppp/radius/dictionary* \
                $(1)/etc/ppp/radius/
                $(1)/etc/ppp/radius/
-       install -m600 ./files/etc/ppp/radius/servers \
+       install -m0600 ./files/etc/ppp/radius/servers \
                $(1)/etc/ppp/radius/
                $(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 \
-               $(1)/usr/lib/pppd/$(PKG_VERSION)/
 endef
 
 define Package/chat/install
 endef
 
 define Package/chat/install
Personal OpenWRT clone
This page took 0.034608 seconds and 4 git commands to generate.