From 3783d4a30140ae68e016677c125405cf77142e38 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 27 Nov 2010 18:55:20 -0500 Subject: [PATCH] tcpdump: punt duplicate versioned binary The tcpdump package likes to install two binaries into /usr/sbin -- one named "tcpdump" and one named "tcpdump.". 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 Signed-off-by: Peter Korsgaard --- CHANGES | 2 +- package/tcpdump/tcpdump.mk | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 87056ed276..f696164f4f 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,7 @@ Fixes all over the tree. - Updated/fixed packages: qt, xserver-xorg + Updated/fixed packages: qt, tcpdump, xserver-xorg Issues resolved (http://bugs.uclibc.org): diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index e295e69025..81228169b0 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -14,4 +14,11 @@ TCPDUMP_CONF_OPT:=--without-crypto \ $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb) 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))