[package] ppp: use service_kill()

[openwrt/svn-archive/archive.git] / package / ppp / Makefile

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index b90fa4f2e67c475a4cbb357385e5b5abde4f6846..f24ddb6d9cffa3dd329b91bcf75a1bebe19f066c 100644 (file)
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -6,10 +6,11 @@
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.4
-PKG_RELEASE:=5
+PKG_RELEASE:=11
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
@@ -20,7 +21,6 @@ PKG_BUILD_DEPENDS:=libpcap
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 define Package/ppp/Default
   SECTION:=net
@@ -108,6 +108,11 @@ $(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
 
 MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \
@@ -135,7 +140,7 @@ define Package/ppp/install
        $(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
 endef
        
 define Package/ppp-mod-pppoa/install
@@ -144,6 +149,8 @@ define Package/ppp-mod-pppoa/install
                $(1)/usr/lib/pppd/$(PKG_VERSION)/
        $(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