From patchwork Tue Feb 16 12:50:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 1440903 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=cwczkHyW; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dg16t75ffz9sVF for ; Tue, 16 Feb 2021 23:50:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6F96884961; Tue, 16 Feb 2021 12:50:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hQhE27TBZw4c; Tue, 16 Feb 2021 12:50:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E258C85277; Tue, 16 Feb 2021 12:50:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B30771BF278 for ; Tue, 16 Feb 2021 12:50:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AFA5084961 for ; Tue, 16 Feb 2021 12:50:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fnCl5DTucdzf for ; Tue, 16 Feb 2021 12:50:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by fraxinus.osuosl.org (Postfix) with ESMTPS id ED5C785815 for ; Tue, 16 Feb 2021 12:50:39 +0000 (UTC) Received: by mail-ej1-f50.google.com with SMTP id w1so7184293ejk.6 for ; Tue, 16 Feb 2021 04:50:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9HhXRZy6fO5rjo6o7GD5ccIip+/xlFm2kXEu+FMtUFM=; b=cwczkHyWEv2QK+JPEh9z6sp6D7OnYzJgZZbXosFROnvliiDOPASpDp4lQJwjSsEfn0 ndx1L0IV8ECSAO2TKojlcexvYIs2e9FDDgdsM2ZUmg/PnkGK2ncwaSq/4/NXhvEmKYoX ao8ZCHwZ0G5IBAXeTRYvHKalPW9cse1tHuiM1Eijrzy5YRRyTeeesb3P8JK7UtmgeXrA etSrm8XufoREWpS/ItW2hPWG42DkIgfJ+g7lLNqmtbl0rACqOD4ZJ39L06ZgxR7v+f0Z oRJnCTx90AvOc7U32mbPPltU7GQ6ZI5dRFeTbDybjGsITVcXIZjL5pz/gJkaIX5sne4O +bNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9HhXRZy6fO5rjo6o7GD5ccIip+/xlFm2kXEu+FMtUFM=; b=gi/AJmaXAb0ymbJ+zy+UAG1STck8fYIZluifr5TWtFgT4MkpQlmSxhBR7QroRKDg1J jgApjhrzpYRkMdZZihxcuu/EpG9Ti2xYRrNdmzD5GGjoSvjIBc/KGH3eZ/yUyac5dzmz Uj6j7TLfi/KfA7WF+SrpXK0MMh4/RrDur9SvmYTCcrltgrHjn8NUsfh6iVH1b4viEnB+ ZRL+wca2Yw2Cm+PiIesBjnLnO0LZRASZ4bYMKRTWVp3VeLRTHY0ajn1bZjBS+coUuozB KCVXD6ErcVrR5fgChvMEeqv50ISVmE+279RsjfcQ3RbR3hYHC+Yk69rCEaNGdI2YPW6p +k5g== X-Gm-Message-State: AOAM532Oxvzq2TKEBamvvTBXhixzGw9mHH2yGCOO0JYwQQaCBguk8fRE fDze/KSnTEFSif+ewQC+5AywVTAK8mBQD6SJ X-Google-Smtp-Source: ABdhPJxYrXE9AwQ3CkdglMWnKOkGqoAQ77IhJttuG+46dR7G6D43mQbnrUWQ8aa/nM7mBl5m70HsRQ== X-Received: by 2002:a17:907:98c3:: with SMTP id kd3mr20484778ejc.482.1613479838329; Tue, 16 Feb 2021 04:50:38 -0800 (PST) Received: from localhost (ptr-5gw9txf6g5tndjqqqz.18120a2.ip6.access.telenet.be. [2a02:1810:510:3800:1b15:18e4:57d1:eb]) by smtp.gmail.com with ESMTPSA id g3sm14144087edk.75.2021.02.16.04.50.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Feb 2021 04:50:37 -0800 (PST) From: Thomas De Schampheleire To: buildroot@buildroot.org Date: Tue, 16 Feb 2021 13:50:30 +0100 Message-Id: <20210216125031.2244-1-patrickdepinguin@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/tcpdump: remove duplicated binary X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Thomas De Schampheleire Since tcpdump 4.99.0, the 'tcpdump' binary is no longer installed in /usr/sbin but in /usr/bin. This change invalidates the Buildroot hook 'TCPDUMP_REMOVE_DUPLICATED_BINARY', causing a fairly large rootfs size increase as a result. Update the path inside this hook. Signed-off-by: Thomas De Schampheleire Acked-by: Baruch Siach --- package/tcpdump/tcpdump.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index f8ea6576ee..c562034a4e 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -22,7 +22,7 @@ TCPDUMP_SELINUX_MODULES = netutils # 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) + rm -f $(TARGET_DIR)/usr/bin/tcpdump.$(TCPDUMP_VERSION) endef TCPDUMP_POST_INSTALL_TARGET_HOOKS += TCPDUMP_REMOVE_DUPLICATED_BINARY