diff options
| author | Mike Baker <mbm@openwrt.org> | 2006-05-09 23:21:48 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2006-05-09 23:21:48 +0000 |
| commit | 7c052238d5d57dc58cff4f935ede8590077d1248 (patch) | |
| tree | c21446886b4d4003fadb7dae3c4a7f1f55a9eaf2 | |
| parent | 1bfe23c0e1cfcaf4d725cf585a7b8c9ccfb8aa96 (diff) | |
| download | upstream-7c052238d5d57dc58cff4f935ede8590077d1248.tar.gz upstream-7c052238d5d57dc58cff4f935ede8590077d1248.tar.bz2 upstream-7c052238d5d57dc58cff4f935ede8590077d1248.zip | |
Convert to new template
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3746 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/ipset/Config.in | 9 | ||||
| -rw-r--r-- | package/ipset/Makefile | 30 | ||||
| -rw-r--r-- | package/ipset/ipkg/ipset.control | 5 |
3 files changed, 15 insertions, 29 deletions
diff --git a/package/ipset/Config.in b/package/ipset/Config.in deleted file mode 100644 index 293292cfea..0000000000 --- a/package/ipset/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_IPSET - prompt "ipset............................. Netfilter ip sets administration utility" - tristate - default m if CONFIG_DEVEL - help - Netfilter ip sets administration utility - - http://ipset.netfilter.org/ - diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 8369b29bfd..ffaabc6fe9 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -7,28 +7,28 @@ PKG_VERSION:=2.2.3 PKG_RELEASE:=1 PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26 -PKG_SOURCE_URL:=http://ipset.netfilter.org -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2 PKG_BUILD_DIR:=$(BUILD_DIR)/ipset-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2 +PKG_SOURCE_URL:=http://ipset.netfilter.org PKG_CAT:=bzcat include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,IPSET,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) \ - CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \ - CFLAGS="$(TARGET_CFLAGS) -Wall -I$(LINUX_DIR)/include -I." \ - KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr - touch $@ - -$(IPKG_IPSET): +define Package/ipset +SECTION:=base +CATEGORY:=Network +DEFAULT:=y +DEPENDS:=kmod-iptables-extra +TITLE:=Netfilter ip sets administration utility +DESCRIPTION:=Netfilter ip sets administration utility +URL:=http://ipset.netfilter.org/ +endef + +define Package/ipset/install $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR=$(IDIR_IPSET) PREFIX=/usr install rm -rf $(IDIR_IPSET)/usr/man $(IPKG_BUILD) $(IDIR_IPSET) $(PACKAGE_DIR) +endef +$(eval $(call BuildPackage,ipset)) diff --git a/package/ipset/ipkg/ipset.control b/package/ipset/ipkg/ipset.control deleted file mode 100644 index f7f6ae0e63..0000000000 --- a/package/ipset/ipkg/ipset.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ipset -Priority: optional -Section: net -Description: Netfilter ip sets administration utility -Depends: kmod-iptables-extra |