summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/l2tpd/Config.in2
-rw-r--r--package/l2tpd/Makefile37
-rw-r--r--package/l2tpd/ipkg/l2tpd.control (renamed from package/l2tpd/l2tpd.control)0
3 files changed, 12 insertions, 27 deletions
diff --git a/package/l2tpd/Config.in b/package/l2tpd/Config.in
index 5dd4a74add..297bbcae08 100644
--- a/package/l2tpd/Config.in
+++ b/package/l2tpd/Config.in
@@ -1,5 +1,5 @@
config BR2_PACKAGE_L2TPD
- tristate "l2tpd"
+ tristate "l2tpd - L2TP (Layer 2 Tunneling Protocol) daemon"
default m if CONFIG_DEVEL
help
A layer 2 tunneling protocol implementation.
diff --git a/package/l2tpd/Makefile b/package/l2tpd/Makefile
index 4cae74e44a..ac80e0b09f 100644
--- a/package/l2tpd/Makefile
+++ b/package/l2tpd/Makefile
@@ -13,40 +13,25 @@ PKG_SOURCE:=$(PKG_NAME)_$(PKG_UPSTREAM_VERSION).orig.tar.gz
PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).orig
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-IPKG_L2TPD:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-IDIR_L2TPD:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
-INFO_L2TPD:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+include $(TOPDIR)/package/rules.mk
-$(DL_DIR)/$(PKG_SOURCE):
- $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+$(eval $(call PKG_template,L2TPD,l2tpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
- $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(PATCH) $(PKG_BUILD_DIR) ./patches
- touch $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
+ touch $@
-$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CC=$(TARGET_CC) \
CFLAGS="$(TARGET_CFLAGS) -I. -DLINUX -DSANITY -DIP_ALLOCATION"
+ touch $@
-$(IPKG_L2TPD): $(PKG_BUILD_DIR)/$(PKG_NAME)
- $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_L2TPD) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
- mkdir -p $(IDIR_L2TPD)/usr/sbin
- cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_L2TPD)/usr/sbin/
- $(STRIP) $(IDIR_L2TPD)/usr/sbin/*
- mkdir -p $(PACKAGE_DIR)
+$(IPKG_L2TPD):
+ install -d -m0755 $(IDIR_L2TPD)/usr/sbin
+ install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_L2TPD)/usr/sbin/
+ $(RSTRIP) $(IDIR_L2TPD)
$(IPKG_BUILD) $(IDIR_L2TPD) $(PACKAGE_DIR)
-$(INFO_L2TPD): $(IPKG_L2TPD)
- $(IPKG) install $(IPKG_L2TPD)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(IPKG_L2TPD)
-install: $(INFO_L2TPD)
-
-clean:
- rm -rf $(PKG_BUILD_DIR) $(IPKG_L2TPD)
diff --git a/package/l2tpd/l2tpd.control b/package/l2tpd/ipkg/l2tpd.control
index 57d60a15b2..57d60a15b2 100644
--- a/package/l2tpd/l2tpd.control
+++ b/package/l2tpd/ipkg/l2tpd.control