From patchwork Sun Jul 8 09:45:49 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: 940971 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="UT3dfS/s"; 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 41NkBv3Xxyz9s29 for ; Sun, 8 Jul 2018 19:47:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6ED9287AB5; Sun, 8 Jul 2018 09:46:52 +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 EEAVlK5HF5PH; Sun, 8 Jul 2018 09:46:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 015F487A58; Sun, 8 Jul 2018 09:46:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 908CE1C1FEB for ; Sun, 8 Jul 2018 09:46:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8E7E686EB1 for ; Sun, 8 Jul 2018 09:46:38 +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 qWy+jUXFI626 for ; Sun, 8 Jul 2018 09:46:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id BD99086703 for ; Sun, 8 Jul 2018 09:46:37 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id n17-v6so17921286wmh.2 for ; Sun, 08 Jul 2018 02:46:37 -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=tu6GBGz6Ttz77iG36Icn5MzXWbz3BM54v9IIcd3GXcQ=; b=UT3dfS/sdF1FByuP5fyvIElCnO9B1ZPd/5wiLfdUvHCn5zcZal65cz3h5aYFlUtv5A Z+MJ4csPsxl3JFc/jMsFi7aNKL0Q2MVugzFn79TQPZuRWAFD5dsCN72v34xR56auaEj9 sQxJJftAKEGB2MM6g2oG4z/27khzxbF6VHYtpPXU/dn65AtLsT0xEQhfVwzz9ZzWKnAb XW8cC3S8BXwHZuydXFJytI13ITVZi69WmXYA/9JBMSMbkwGUPR/ejvb0bcByQCpR05qG 3TGkw3pDjAxcltJytw0M/pjc3Ie/UOnhV0RDl2b7Q3pF+2UxoOEyFjX8ohjTipOoGKzj So4g== 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=tu6GBGz6Ttz77iG36Icn5MzXWbz3BM54v9IIcd3GXcQ=; b=qbeE+mIkJ3LCl/H+DCsHBUB2tm515WXB7AvMZFv2jQp/eX3FUMHYItxzBYGV9fHsXN 6yjWwV1mqbZhg4vjeSLp8UnDkOH9zDoRi17As3RoMWCaJjYVIF6croywa6sb2m9xHVX8 VHKzNwjUufeSQ5wg9Y5yvdVQtBwpA7/xgQvPJHOzGc9S+M6cGD6LyGcoxbB3zzPJ5qab jnEyvUKwFF6dCmgIZss3r0Mj55RYV0yWUvs8oofx42TyqcL9hrcqheHKH6a5mkVAU5PF NMxd96PXDucOt3cSCrCLFInx5W/AfXyDWbHhXqi063WmyeA7mURxHGeNmNuLfhmSJiVW 6lQQ== X-Gm-Message-State: APt69E3f8DHDxfsNYfvVQfNzsuIKVqqSHcxxs7BRXVhxOLs1l/oOOUSW 5Fb68Cw0ULhdYWI5+tKVuBvbxA== X-Google-Smtp-Source: AAOMgpc/3UBMnGjBSpkIrl2SL20NmV1hFMRcWHRs2Gbln61BLzZH4xOPKXeuLhDiHffqLpAtiF+n5A== X-Received: by 2002:a1c:f46:: with SMTP id 67-v6mr9187693wmp.122.1531043196124; Sun, 08 Jul 2018 02:46:36 -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.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jul 2018 02:46:35 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 8 Jul 2018 11:45:49 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 24/50 v2] package/busybox: invert dependency with net-tools 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" Signed-off-by: Yann E. MORIN Cc: Baruch Siach --- Changes v1 -> v2: - fix typo (Baruch) --- package/busybox/busybox.mk | 1 + package/net-tools/net-tools.mk | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index eeb9dc5bac..451aae46a5 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_NET_TOOLS),net-tools) \ $(if $(BR2_PACKAGE_NETCAT),netcat) \ $(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \ $(if $(BR2_PACKAGE_NMAP),nmap) \ diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk index adab475b35..985fe2e35e 100644 --- a/package/net-tools/net-tools.mk +++ b/package/net-tools/net-tools.mk @@ -10,11 +10,6 @@ NET_TOOLS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) NET_TOOLS_LICENSE = GPL-2.0+ NET_TOOLS_LICENSE_FILES = COPYING -# Install after busybox for the full-blown versions -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -NET_TOOLS_DEPENDENCIES += busybox -endif - define NET_TOOLS_CONFIGURE_CMDS (cd $(@D); yes "" | ./configure.sh config.in ) endef @@ -40,7 +35,8 @@ define NET_TOOLS_BUILD_CMDS endef # install renames conflicting binaries, update does not -# ifconfig & route reside in /sbin for busybox +# ifconfig & route reside in /sbin for busybox, so ensure we don't end +# up with two versions of those. define NET_TOOLS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) update mv -f $(TARGET_DIR)/bin/ifconfig $(TARGET_DIR)/sbin/ifconfig