diff options
| -rw-r--r-- | package/pptp/Config.in | 6 | ||||
| -rw-r--r-- | package/pptp/Makefile | 56 | ||||
| -rw-r--r-- | package/pptp/files/options.pptp (renamed from package/pptp/ipkg/etc/ppp/options.pptp) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | package/pptp/files/pptp.init (renamed from package/pptp/ipkg/etc/init.d/S50pptp) | 0 | ||||
| -rw-r--r-- | package/pptp/ipkg/pptp.conffiles | 1 | ||||
| -rw-r--r-- | package/pptp/ipkg/pptp.control (renamed from package/pptp/pptp.control) | 0 |
6 files changed, 28 insertions, 35 deletions
diff --git a/package/pptp/Config.in b/package/pptp/Config.in index 8ffeff264f..ad41744cef 100644 --- a/package/pptp/Config.in +++ b/package/pptp/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_PPTP - tristate "PPTP Client" + prompt "pptp - a PPTP (Point-to-Point Tunneling Protocol) client" + tristate default m if CONFIG_DEVEL select BR2_PACKAGE_KMOD_GRE select BR2_PACKAGE_PPP help A Point-to-Point Tunneling Protocol Client + + http://pptpclient.sourceforge.net/ + diff --git a/package/pptp/Makefile b/package/pptp/Makefile index a07d6bdf64..b54b9d31d9 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -9,42 +9,30 @@ PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 PKG_SOURCE_URL:=@SF/pptpclient PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_CAT:=zcat -PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg -$(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +include $(TOPDIR)/package/rules.mk + +$(eval $(call PKG_template,PPTP,pptp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(PKG_BUILD_DIR)/.unpacked +$(PKG_BUILD_DIR)/.configured: + touch $(PKG_BUILD_DIR)/.configured -$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.unpacked +$(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ - CC=$(TARGET_CC) \ - CFLAGS="$(TARGET_CFLAGS)" \ - all - -$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME) - mkdir -p $(PKG_IPK_DIR)/usr/sbin - cp -a ./ipkg/* $(PKG_IPK_DIR)/ - $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - cp $(PKG_BUILD_DIR)/pptp $(PKG_IPK_DIR)/usr/sbin/ - $(STRIP) $(PKG_IPK_DIR)/usr/sbin/* - mkdir -p $(PACKAGE_DIR) - find $(PKG_IPK_DIR) -name CVS | xargs rm -rf - $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) - -$(IPKG_STATE_DIR)/info/pptp.list: $(PKG_IPK) - $(IPKG) install $(PKG_IPK) - -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.unpacked -compile: $(PKG_IPK) -install: $(IPKG_STATE_DIR)/info/pptp.list - -clean: - rm -rf $(PKG_BUILD_DIR) - rm -f $(PKG_IPK) + CC=$(TARGET_CC) \ + CFLAGS="$(TARGET_CFLAGS)" \ + all + touch $(PKG_BUILD_DIR)/.built + +$(IPKG_PPTP): + install -d -m0755 $(IDIR_PPTP)/etc/init.d + install -m0755 ./files/pptp.init $(IDIR_PPTP)/etc/init.d/S50pptp + install -d -m0755 $(IDIR_PPTP)/etc/ppp + install -m0644 ./files/options.pptp $(IDIR_PPTP)/etc/ppp/ + install -d -m0755 $(IDIR_PPTP)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/pptp $(IDIR_PPTP)/usr/sbin/ + $(RSTRIP) $(IDIR_PPTP) + $(IPKG_BUILD) $(IDIR_PPTP) $(PACKAGE_DIR) diff --git a/package/pptp/ipkg/etc/ppp/options.pptp b/package/pptp/files/options.pptp index 0eb1e87e83..0eb1e87e83 100644 --- a/package/pptp/ipkg/etc/ppp/options.pptp +++ b/package/pptp/files/options.pptp diff --git a/package/pptp/ipkg/etc/init.d/S50pptp b/package/pptp/files/pptp.init index 34ff8a63b5..34ff8a63b5 100755..100644 --- a/package/pptp/ipkg/etc/init.d/S50pptp +++ b/package/pptp/files/pptp.init diff --git a/package/pptp/ipkg/pptp.conffiles b/package/pptp/ipkg/pptp.conffiles new file mode 100644 index 0000000000..136db31f1c --- /dev/null +++ b/package/pptp/ipkg/pptp.conffiles @@ -0,0 +1 @@ +/etc/ppp/options.pptp
\ No newline at end of file diff --git a/package/pptp/pptp.control b/package/pptp/ipkg/pptp.control index 67dbd26944..67dbd26944 100644 --- a/package/pptp/pptp.control +++ b/package/pptp/ipkg/pptp.control |