From 022fc98acc4114186fcd137e20b6732c7306f879 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 12 May 2005 20:04:46 +0000 Subject: update fprobe to new packaging style git-svn-id: svn://svn.openwrt.org/openwrt/trunk@857 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/fprobe/Makefile | 47 +++++++++--------------------- openwrt/package/fprobe/fprobe.control | 9 ------ openwrt/package/fprobe/ipkg/fprobe.control | 9 ++++++ 3 files changed, 23 insertions(+), 42 deletions(-) delete mode 100644 openwrt/package/fprobe/fprobe.control create mode 100644 openwrt/package/fprobe/ipkg/fprobe.control diff --git a/openwrt/package/fprobe/Makefile b/openwrt/package/fprobe/Makefile index ed8cf36555..91f0c05ccd 100644 --- a/openwrt/package/fprobe/Makefile +++ b/openwrt/package/fprobe/Makefile @@ -7,22 +7,16 @@ PKG_VERSION := 1.1 PKG_RELEASE := 1 PKG_MD5SUM := 65850d0470078269b33eee58cba77ac2 -PKG_SOURCE_SITE := @SF/fprobe -PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) -PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL := @SF/fprobe +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_CAT := bzcat -PKG_IPK_DIR := $(PKG_BUILD_DIR)/ipkg -$(DL_DIR)/$(PKG_SOURCE_FILE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) +include $(TOPDIR)/package/rules.mk -$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE_FILE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(PKG_BUILD_DIR)/.prepared +$(eval $(call PKG_template,FPROBE,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared +$(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR) ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ @@ -47,27 +41,14 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --with-hash=xor8 \ $(DISABLE_NLS) \ ) - touch $(PKG_BUILD_DIR)/.configured + touch $@ -$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) + touch $@ -$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(PKG_IPK_DIR)/usr/bin - cp $(PKG_BUILD_DIR)/src/fprobe $(PKG_IPK_DIR)/usr/bin/ - $(STRIP) $(PKG_IPK_DIR)/usr/bin/* - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) - -$(IPKG_STATE_DIR)/info/tinc.list: $(PKG_IPK) - $(IPKG) install $(PKG_IPK) - -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.prepared -compile: $(PKG_IPK) -install: $(IPKG_STATE_DIR)/info/fprobe.list - -clean: - rm -rf $(PKG_BUILD_DIR) - rm -f $(PKG_IPK) +$(IPKG_FPROBE): + mkdir -p $(IDIR_FPROBE)/usr/bin + cp $(PKG_BUILD_DIR)/src/fprobe $(IDIR_FPROBE)/usr/bin/ + $(STRIP) $(IDIR_FPROBE)/usr/bin/* + $(IPKG_BUILD) $(IDIR_FPROBE) $(PACKAGE_DIR) diff --git a/openwrt/package/fprobe/fprobe.control b/openwrt/package/fprobe/fprobe.control deleted file mode 100644 index 5028dcb423..0000000000 --- a/openwrt/package/fprobe/fprobe.control +++ /dev/null @@ -1,9 +0,0 @@ -Package: fprobe -Priority: optional -Section: net -Maintainer: Felix Fietkau -Source: buildroot internal -Depends: libpcap, libpthread -Description: NetFlow probe - libpcap-based tool that collect network traffic data - and emit it as NetFlow flows towards the specified collector diff --git a/openwrt/package/fprobe/ipkg/fprobe.control b/openwrt/package/fprobe/ipkg/fprobe.control new file mode 100644 index 0000000000..5028dcb423 --- /dev/null +++ b/openwrt/package/fprobe/ipkg/fprobe.control @@ -0,0 +1,9 @@ +Package: fprobe +Priority: optional +Section: net +Maintainer: Felix Fietkau +Source: buildroot internal +Depends: libpcap, libpthread +Description: NetFlow probe + libpcap-based tool that collect network traffic data + and emit it as NetFlow flows towards the specified collector -- cgit v1.2.3