summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-12 20:04:46 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-12 20:04:46 +0000
commit56a2c94bbc79ea3e16c4cf269dadfa200471f5a7 (patch)
tree0661ffc4302d7e5cbc0acc18f23d77fcc46be039 /package
parent2b858e776b6e9cc370d2f23896415c38591b77dd (diff)
update fprobe to new packaging style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@857 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/fprobe/Makefile47
-rw-r--r--package/fprobe/ipkg/fprobe.control (renamed from package/fprobe/fprobe.control)0
2 files changed, 14 insertions, 33 deletions
diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile
index ed8cf3655..91f0c05cc 100644
--- a/package/fprobe/Makefile
+++ b/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/package/fprobe/fprobe.control b/package/fprobe/ipkg/fprobe.control
index 5028dcb42..5028dcb42 100644
--- a/package/fprobe/fprobe.control
+++ b/package/fprobe/ipkg/fprobe.control