mru and mtu need to be on separate lines

[openwrt.git] / openwrt / package / ppp / Makefile

diff --git a/openwrt/package/ppp/Makefile b/openwrt/package/ppp/Makefile
index b246a3d..e42a37a 100644 (file)
--- a/openwrt/package/ppp/Makefile
+++ b/openwrt/package/ppp/Makefile
@@ -1,14 +1,16 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME := ppp
 PKG_VERSION := 2.4.3
-PKG_RELEASE := 3
+PKG_RELEASE := 4
+PKG_MD5SUM := 848f6c3cafeb6074ffeb293c3af79b7c
 
 PKG_SOURCE_SITE := ftp://ftp.samba.org/pub/ppp/
 PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_CAT := zcat
 PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
-
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
 
 PKG_PPP := $(PACKAGE_DIR)/ppp_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
@@ -37,9 +39,23 @@ ifneq ($(BR2_PACKAGE_PPPSTATS),)
 TARGETS += $(PKG_PPPSTATS)
 endif
 
+INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/ppp.list
+ifeq ($(BR2_PACKAGE_PPP_PPPOE),y)
+INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ppp-pppoe-plugin.list
+endif
+ifeq ($(BR2_PACKAGE_PPP_RADIUS),y)
+INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ppp-radius-plugin.list
+endif
+ifeq ($(BR2_PACKAGE_PPPDUMP),y)
+INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/pppdump.list
+endif
+ifeq ($(BR2_PACKAGE_PPPSTATS),y)
+INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/pppstats.list
+endif
+
 $(DL_DIR)/$(PKG_SOURCE_FILE):
        mkdir -p $(DL_DIR)
-       $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
 
 $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
        mkdir -p $(TOOL_BUILD_DIR)
@@ -79,6 +95,8 @@ $(PKG_PPP): $(PKG_BUILD_DIR)/pppd/pppd
        mkdir -p $(I_PPP)
        cp -af ./ipkg/ppp/* $(I_PPP)
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP) control/ppp.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
+       mkdir -p $(I_PPP)/etc/ppp
+       ln -sf /tmp/resolv.conf $(I_PPP)/etc/ppp/resolv.conf
        mkdir -p $(I_PPP)/usr/sbin
        cp -af $(PKG_BUILD_DIR)/pppd/pppd $(I_PPP)/usr/sbin/
        $(STRIP) $(I_PPP)/usr/sbin/*
@@ -89,58 +107,65 @@ $(PKG_PPP): $(PKG_BUILD_DIR)/pppd/pppd
        cp $(MODULES_DIR)/kernel/drivers/net/ppp_async.o $(I_PPP)/$(MODULES_SUBDIR)
        cp $(MODULES_DIR)/kernel/drivers/net/ppp_deflate.o $(I_PPP)/$(MODULES_SUBDIR)
        cp $(MODULES_DIR)/kernel/drivers/net/bsd_comp.o $(I_PPP)/$(MODULES_SUBDIR)
+       find $(I_PPP) -name CVS | xargs rm -rf
        $(IPKG_BUILD) $(I_PPP) $(PACKAGE_DIR)
        
+$(IPKG_STATE_DIR)/info/ppp.list: $(PKG_PPP)
+       $(IPKG) install $(PKG_PPP)
+
 $(PKG_PPP_PPPOE_PLUGIN): $(PKG_PPP)
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_PPPOE_PLUGIN) control/ppp-pppoe-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       mkdir -p $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/rp-pppoe
+       cp -af ./ipkg/ppp-pppoe-plugin/* $(I_PPP_PPPOE_PLUGIN)
+       mkdir -p $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)
        cp -af $(PKG_BUILD_DIR)/pppd/plugins/rp-pppoe/rp-pppoe.so \
-               $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/rp-pppoe
-       $(STRIP) $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/*/*.so
+               $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)
+       $(STRIP) $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)/*.so
        mkdir -p $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR)
        cp $(MODULES_DIR)/kernel/drivers/net/pppo*.o $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR)
+       find $(I_PPP_PPPOE_PLUGIN) -name CVS | xargs rm -rf
        $(IPKG_BUILD) $(I_PPP_PPPOE_PLUGIN) $(PACKAGE_DIR)
 
+$(IPKG_STATE_DIR)/info/ppp-pppoe-plugin.list: $(PKG_PPP_PPPOE_PLUGIN)
+       $(IPKG) install $(PKG_PPP_PPPOE_PLUGIN)
+
 $(PKG_PPP_RADIUS_PLUGIN): $(PKG_PPP)
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_RADIUS_PLUGIN) control/ppp-radius-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       mkdir -p $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/radius
+       mkdir -p $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)
        cp -af $(PKG_BUILD_DIR)/pppd/plugins/radius/radius.so \
-         $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/radius/
-       $(STRIP) $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/*/*.so
+         $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)
+       $(STRIP) $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)/*.so
+       find $(I_PPP_RADIUS_PLUGIN) -name CVS | xargs rm -rf
        $(IPKG_BUILD) $(I_PPP_RADIUS_PLUGIN) $(PACKAGE_DIR)
 
+$(IPKG_STATE_DIR)/info/ppp-radius-plugin.list: $(PKG_PPP_RADIUS_PLUGIN)
+       $(IPKG) install $(PKG_PPP_RADIUS_PLUGIN)
+
 $(PKG_PPPDUMP): $(PKG_PPP)
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPDUMP) control/pppdump.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
        mkdir -p $(I_PPPDUMP)/usr/sbin
        cp -af $(PKG_BUILD_DIR)/pppdump/pppdump $(I_PPPDUMP)/usr/sbin/
        $(STRIP) $(I_PPPDUMP)/usr/sbin/*
+       find $(I_PPPDUMP) -name CVS | xargs rm -rf
        $(IPKG_BUILD) $(I_PPPDUMP) $(PACKAGE_DIR)
 
+$(IPKG_STATE_DIR)/info/pppdump.list: $(PKG_PPPDUMP)
+       $(IPKG) install $(PKG_PPPDUMP)
+
 $(PKG_PPPSTATS): $(PKG_PPP)
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPSTATS) control/pppstats.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
        mkdir -p $(I_PPPSTATS)/usr/sbin
        cp -af $(PKG_BUILD_DIR)/pppstats/pppstats $(I_PPPSTATS)/usr/sbin/
        $(STRIP) $(I_PPPSTATS)/usr/sbin/*
+       find $(I_PPPSTATS) -name CVS | xargs rm -rf
        $(IPKG_BUILD) $(I_PPPSTATS) $(PACKAGE_DIR)
 
+$(IPKG_STATE_DIR)/info/pppstats.list: $(PKG_PPPSTATS)
+       $(IPKG) install $(PKG_PPPSTATS)
 
 source: $(DL_DIR)/$(PKG_SOURCE_FILE)
 prepare: $(PKG_BUILD_DIR)/.patched
 compile: $(TARGETS)
-install: compile
-       $(IPKG) install $(PKG_PPP)
-ifeq ($(BR2_PACKAGE_PPP_PPPOE),y)
-       $(IPKG) install $(PKG_PPP_PPPOE_PLUGIN)
-endif
-ifeq ($(BR2_PACKAGE_PPP_RADIUS),y)
-       $(IPKG) install $(PKG_PPP_RADIUS_PLUGIN)
-endif
-ifeq ($(BR2_PACKAGE_PPPDUMP),y)
-       $(IPKG) install $(PKG_PPPDUMP)
-endif
-ifeq ($(BR2_PACKAGE_PPPSTATS),y)
-       $(IPKG) install $(PKG_PPPSTATS)
-endif
+install: $(INSTALL_TARGETS)
 
 clean:
        rm -rf $(PKG_BUILD_DIR)