Change libpcap, uniformize package makefile, put control file in ./ipkg

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@683 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/tcpdump/Makefile b/openwrt/package/tcpdump/Makefile
index 2b854c8..cf74ea5 100644 (file)
--- a/openwrt/package/tcpdump/Makefile
+++ b/openwrt/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)
                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)
 
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(IDIR_TCPDUMP) $(PACKAGE_DIR)
 


@@ -84,4 +84,5 @@ compile: $(IPKG_TCPDUMP)
 install: $(INFO_TCPDUMP)
 
 clean:
 install: $(INFO_TCPDUMP)
 
 clean:

-       rm -rf $(PKG_BUILD_DIR) $(IPKG_TCPDUMP)
+       rm -rf $(PKG_BUILD_DIR)
+       rm -rf $(IPKG_TCPDUMP)

diff --git a/openwrt/package/tcpdump/ipkg/tcpdump.control b/openwrt/package/tcpdump/ipkg/tcpdump.control
new file mode 100644 (file)
index 0000000..8817389
--- /dev/null
+++ b/openwrt/package/tcpdump/ipkg/tcpdump.control
@@ -0,0 +1,7 @@
+Package: tcpdump
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: A tool for network monitoring and data acquisition.
+Depends: libpcap

diff --git a/openwrt/package/tcpdump/tcpdump.control b/openwrt/package/tcpdump/tcpdump.control
deleted file mode 100644 (file)
index 8817389..0000000
--- a/openwrt/package/tcpdump/tcpdump.control
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: tcpdump
-Priority: optional
-Section: net
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: A tool for network monitoring and data acquisition.
-Depends: libpcap