From 4209536176da602927bd94879eb53ce1ed3f057a Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 18 Apr 2005 22:40:59 +0000 Subject: Change libpcap, uniformize package makefile, put control file in ./ipkg git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@683 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/tcpdump/Makefile | 11 ++++++----- package/tcpdump/ipkg/tcpdump.control | 7 +++++++ package/tcpdump/tcpdump.control | 7 ------- 3 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 package/tcpdump/ipkg/tcpdump.control delete mode 100644 package/tcpdump/tcpdump.control diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 2b854c828..cf74ea5f1 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -68,10 +68,10 @@ $(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured CCOPT="$(TARGET_CFLAGS)" INCLS="-I. -I$(STAGING_DIR)/usr/include" $(IPKG_TCPDUMP): $(PKG_BUILD_DIR)/$(PKG_NAME) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_TCPDUMP) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(IDIR_TCPDUMP)/usr/sbin - cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_TCPDUMP)/usr/sbin/ - $(STRIP) $(IDIR_TCPDUMP)/usr/sbin/* + $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_TCPDUMP) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + install -m0755 -d $(IDIR_TCPDUMP)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_TCPDUMP)/usr/sbin/ + $(RSTRIP) $(IDIR_TCPDUMP) mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_TCPDUMP) $(PACKAGE_DIR) @@ -84,4 +84,5 @@ compile: $(IPKG_TCPDUMP) install: $(INFO_TCPDUMP) clean: - rm -rf $(PKG_BUILD_DIR) $(IPKG_TCPDUMP) + rm -rf $(PKG_BUILD_DIR) + rm -rf $(IPKG_TCPDUMP) diff --git a/package/tcpdump/ipkg/tcpdump.control b/package/tcpdump/ipkg/tcpdump.control new file mode 100644 index 000000000..881738982 --- /dev/null +++ b/package/tcpdump/ipkg/tcpdump.control @@ -0,0 +1,7 @@ +Package: tcpdump +Priority: optional +Section: net +Maintainer: Felix Fietkau +Source: buildroot internal +Description: A tool for network monitoring and data acquisition. +Depends: libpcap diff --git a/package/tcpdump/tcpdump.control b/package/tcpdump/tcpdump.control deleted file mode 100644 index 881738982..000000000 --- a/package/tcpdump/tcpdump.control +++ /dev/null @@ -1,7 +0,0 @@ -Package: tcpdump -Priority: optional -Section: net -Maintainer: Felix Fietkau -Source: buildroot internal -Description: A tool for network monitoring and data acquisition. -Depends: libpcap -- cgit v1.2.3