From patchwork Sun Jul 8 09:45:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 940977 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KSmFp6tH"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41NkC22qRSz9rxs for ; Sun, 8 Jul 2018 19:47:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 536F987A78; Sun, 8 Jul 2018 09:46:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ENtQRmAFY3qc; Sun, 8 Jul 2018 09:46:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1F1DB87A8A; Sun, 8 Jul 2018 09:46:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9D83E1C1FEB for ; Sun, 8 Jul 2018 09:46:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9851C86B82 for ; Sun, 8 Jul 2018 09:46:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m7R8Ca5bTu0x for ; Sun, 8 Jul 2018 09:46:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by whitealder.osuosl.org (Postfix) with ESMTPS id F00CA86A7D for ; Sun, 8 Jul 2018 09:46:36 +0000 (UTC) Received: by mail-wm0-f50.google.com with SMTP id v25-v6so18393168wmc.0 for ; Sun, 08 Jul 2018 02:46:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=OO6TMbyv1Rwd3z6nV39AZZrMfnqu0NJd5tYaoMWCZVc=; b=KSmFp6tHDWOILTbrFbeX4AVLuNeJ4HWXlhxnjoRoIG2TW+g1KLGSZMBfR6x3iYjbTt fKN/CNzi1LMX+mgx+rAT8Nb88uTBddqTu7vm99ctNNlCDfseawUZERGXS+o3pCG6SjZ5 Xnz6Bx1Pa9Z+iU9NbohDlEEhKmUbsU8cb3uU1V5isX+k5qMKMk6bJ3hhDSLlYPjXJfZt Raxlcpn46q6Y7Q3sH+gec2hOGIKRmuHZgmJHdeNLSfyoGF4Yd+RUD5Whj9Jny0/BhOVL +9W4M4BzozLZhcPwFpp9AAi99qMCf7gclmuPVkGK1XkpOw1HSftLR5ffbNavIVp/9N64 X7kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=OO6TMbyv1Rwd3z6nV39AZZrMfnqu0NJd5tYaoMWCZVc=; b=BZI7sYMfL9KwfOasoQrFYbZcXMeO4PMe8LRe87p7mv8Floa+cifkkaRIdgSU8X2z8q L6pgj9/SsGkh88qcKE0P+Cut1pZGGkwxbAIvWoyP6z7k9ifm9xx1J+ftY+5lRlq/qo8V osrY8q5IX+NC/tHyH2Was2AtjBBiVemY87h4Y497dxVZOB3Logkah6dtwiwP4NouuG3k SXNNKhtKO0vO375HGa2NS0zLctE53wy4Ac1yjq/EOXV0ezOe9lZBKiPbkT0BhzXAz27Y dT6Z86MDMWS3L4xDL9sTxUnBmCqL+k21AKwh578H4qfrBmTN0AOFOvceGCcmH2xsZE3d TrRg== X-Gm-Message-State: APt69E0z0rFuPdUAOmJ6qzRxDT/tcsAX8MjqiPmUDT26LXUcKoLBxqUm dgLFF5xD0vLTOHOipj/UJeXdaA== X-Google-Smtp-Source: AAOMgpfGUPYgtG9AXCwBaXCvEkyO0Q/jbIyQCOvJqY8Hpk3YUG+nGlEHQ9bXioPhNPmWBwB5wpWF9g== X-Received: by 2002:a1c:369c:: with SMTP id y28-v6mr9364020wmh.34.1531043195311; Sun, 08 Jul 2018 02:46:35 -0700 (PDT) Received: from scaer.bzh.lan (2a01cb0886107300319b40c3eadd4d0b.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:319b:40c3:eadd:4d0b]) by smtp.gmail.com with ESMTPSA id v190-v6sm751602wme.21.2018.07.08.02.46.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jul 2018 02:46:34 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 8 Jul 2018 11:45:48 +0200 Message-Id: <3e51c98ee1c3de7488e1a46cbc662221cd8e4958.1531043163.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 23/50 v2] package/busybox: invert dependency with netcat X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E. MORIN" MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since netcat would be installed before busybox, we don't need to remove a pre-installed 'nc' anymore. If another netcat implementation (e.g. netcat-openbsd) is also enabled, there is no way to tell which would win in the end, especially when we add TLPB, in which case that will be forbidden. So, we don't need to remove anything anymore. Signed-off-by: Yann E. MORIN --- package/busybox/busybox.mk | 1 + package/netcat/netcat.mk | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 003909806a..eeb9dc5bac 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_NETCAT),netcat) \ $(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \ $(if $(BR2_PACKAGE_NMAP),nmap) \ $(if $(BR2_PACKAGE_NTP),ntp) \ diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index d8b3c930b9..eb7ddcac27 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -9,17 +9,4 @@ NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VE NETCAT_LICENSE = GPL-2.0+ NETCAT_LICENSE_FILES = COPYING -# Ensure Busybox gets built/installed before, so that this package -# overrides Busybox nc. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -NETCAT_DEPENDENCIES += busybox -endif - -# Netcat doesn't overwrite a pre-existing 'nc' (e.g. from busybox) so -# force-remove it. -define NETCAT_RMOVE_NC_LINK - rm -f $(TARGET_DIR)/usr/bin/nc -endef -NETCAT_PRE_INSTALL_TARGET_HOOKS += NETCAT_RMOVE_NC_LINK - $(eval $(autotools-package))