Browse Source

tcpdump: punt duplicate versioned binary

The tcpdump package likes to install two binaries into /usr/sbin --
one named "tcpdump" and one named "tcpdump.<ver>".  But it does this
by installing the file twice rather than using links.  Since the alt
name is useless to us, just punt it.

[Peter: Rework to use POST_INSTALL_TARGET_HOOKS instead]
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Mike Frysinger 14 years ago
parent
commit
3783d4a301
2 changed files with 8 additions and 1 deletions
  1. 1 1
      CHANGES
  2. 7 0
      package/tcpdump/tcpdump.mk

+ 1 - 1
CHANGES

@@ -2,7 +2,7 @@
 
 
 	Fixes all over the tree.
 	Fixes all over the tree.
 
 
-	Updated/fixed packages: qt, xserver-xorg
+	Updated/fixed packages: qt, tcpdump, xserver-xorg
 
 
 	Issues resolved (http://bugs.uclibc.org):
 	Issues resolved (http://bugs.uclibc.org):
 
 

+ 7 - 0
package/tcpdump/tcpdump.mk

@@ -14,4 +14,11 @@ TCPDUMP_CONF_OPT:=--without-crypto \
 		$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
 		$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
 TCPDUMP_DEPENDENCIES:=zlib libpcap
 TCPDUMP_DEPENDENCIES:=zlib libpcap
 
 
+# make install installs an unneeded extra copy of the tcpdump binary
+define TCPDUMP_REMOVE_DUPLICATED_BINARY
+	rm -f $(TARGET_DIR)/usr/sbin/tcpdump.$(TCPDUMP_VERSION)
+endef
+
+TCPDUMP_POST_INSTALL_TARGET_HOOKS += TCPDUMP_REMOVE_DUPLICATED_BINARY
+
 $(eval $(call AUTOTARGETS,package,tcpdump))
 $(eval $(call AUTOTARGETS,package,tcpdump))