X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ec8fa5540e88f076526bfaa388c8a4d406e37bff..0053f0585c9410373250186c51dbc57e71eff005:/openwrt/package/ppp/Makefile?ds=inline diff --git a/openwrt/package/ppp/Makefile b/openwrt/package/ppp/Makefile index 92dceecd0..e42a37a76 100644 --- a/openwrt/package/ppp/Makefile +++ b/openwrt/package/ppp/Makefile @@ -4,7 +4,7 @@ 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/ @@ -95,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/* @@ -105,6 +107,7 @@ $(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) @@ -112,12 +115,14 @@ $(IPKG_STATE_DIR)/info/ppp.list: $(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) @@ -125,10 +130,11 @@ $(IPKG_STATE_DIR)/info/ppp-pppoe-plugin.list: $(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) @@ -139,6 +145,7 @@ $(PKG_PPPDUMP): $(PKG_PPP) 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) @@ -149,6 +156,7 @@ $(PKG_PPPSTATS): $(PKG_PPP) 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)