diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2010-11-27 18:55:20 -0500 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-11-29 10:33:47 +0100 |
| commit | 3783d4a30140ae68e016677c125405cf77142e38 (patch) | |
| tree | 60b25ed6cc1584f5102d2471eb7e00fa4738a57f | |
| parent | 512bb3c6d4abd461376668fb2eac7e7e1f3a7ab2 (diff) | |
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>
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | package/tcpdump/tcpdump.mk | 7 |
2 files changed, 8 insertions, 1 deletions
@@ -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 e295e6902..81228169b 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)) |