From patchwork Sat Apr 21 09:10:50 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: 902341 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="DumJf0Bn"; 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 40Sn5R1k51z9s1w for ; Sat, 21 Apr 2018 19:11:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 688258A131; Sat, 21 Apr 2018 09:11:04 +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 dT4vXtuWIub1; Sat, 21 Apr 2018 09:11:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BFB378A044; Sat, 21 Apr 2018 09:11:03 +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 CC6F71C156B for ; Sat, 21 Apr 2018 09:10:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CA45889FB7 for ; Sat, 21 Apr 2018 09:10:59 +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 Ufyk4w8iwdM9 for ; Sat, 21 Apr 2018 09:10:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by hemlock.osuosl.org (Postfix) with ESMTPS id 080BF89F5B for ; Sat, 21 Apr 2018 09:10:59 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id p18-v6so9432836wrm.1 for ; Sat, 21 Apr 2018 02:10:58 -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=sfNGZGbGfazRrPpQIuOCkDAx2kJpC5N4B1d99Dw3bYw=; b=DumJf0BnZgmvVj1lDMf1pwRX5mPw5a3cEFAJQ+RXt127vEU+NslJCQ7bajoe1UPgG2 XaWWubQ55/EBuLN8W5pDYxdRP+FD6Ca/QgUVViPIEylgAxtSRX3/Tzxp7SAYnBL6nQJK bpml02AdvNr2IilullbpZMF1ivFk3Z9m8djJu3s1OwO/+EwtHqq/z6SR7iXJqu5jOSX3 3I2bq+s2bCLc5DiCUgHycDzFjk7/WIfeUL7LrcC3i3bfzJF7knYt5LvY6XZTNsaKrmoV 7hBR9ktv1ekSDqXMOKgSyyAWlE0vK9zYskLkYx1T6cbblP/4bg/0qMXsjxsvNaqGJCfF +XDw== 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=sfNGZGbGfazRrPpQIuOCkDAx2kJpC5N4B1d99Dw3bYw=; b=opGPThJyrOEwKUY5VU6e84sJv2qleMbmxc19bwQLx4QNkLUWrT1EdElTilegG1k/wj 7RhLqb3XBeDR7Wsxvg6xYQ7p1EQXG7mbFdVsFirsCjEn9zxSkI9vVGnRNU+jpqB/d9Mq gDt5T+xpVFGqAeFamEFSsOy8XksnSnh7i1O17uvEhH4BJfrIT25OTQb/S/GIsN7NyYvT q2lgp3Pbc6GfPc55YPYpQdt7FXXgMJdr0g+6z0Kr/VgsmCtACCF00z6JZ0W24II864Nr nmGR0ajvOo9zg0Ynpz39aS0BqixXNn5rUOkfYEbeDxGGoBn9hMpyLSvZzrxieU4Z2n5+ 9Lnw== X-Gm-Message-State: ALQs6tBmk2t6zVEwOq/EH3CtY73hIalQAZ/ryCTNVGBJ5ouXpBvFXFga 4YndXgUx8HNYXhkHNFCmb4cqPQ== X-Google-Smtp-Source: AIpwx4/murUnPf0zrZfbsCgxdanIsALxIJLo4bNvHMj46Okfc8pwuja3ZCIz6IWbYmBJLeYd8kimCw== X-Received: by 10.28.19.13 with SMTP id 13mr4176037wmt.89.1524301857364; Sat, 21 Apr 2018 02:10:57 -0700 (PDT) Received: from scaer.bzh.lan (2a01cb088610730021d32b09ea00dc7a.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:21d3:2b09:ea00:dc7a]) by smtp.gmail.com with ESMTPSA id y68-v6sm10255619wrb.91.2018.04.21.02.10.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Apr 2018 02:10:56 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 21 Apr 2018 11:10:50 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 1/7] support/graph-depends: ensure all packages get graphed 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" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When a package: - has no dependency, - is not a first-level target, - is a cut-off point, then this package is omitted from the dependency graph. We currently have no such package, but the next commit will make host-skeleton, which already matches the first two conditions, a cut-off point too, and thus host-skeleton would not appear on the graph. To ensure that all packages, whatever their conditions, are displayed, we add them as a dependency of 'all'. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni --- support/scripts/graph-depends | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index 621e603278..6ce90d872c 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -391,6 +391,15 @@ def main(): deps = get_all_depends(filtered_targets, get_depends_func) if deps is not None: dependencies += deps + # 'all' depends on everything, so add any newly discovered + # package. d[0] was a target, above, or a d[1] of another + # tuple, so it's already in the list. + for d in deps: + if d[1] in TARGET_EXCEPTIONS: + continue + if ('all', d[1]) in dependencies: + continue + dependencies.append(('all', d[1])) rootpkg = 'all' # In pkg mode, start directly with get_all_depends() on the requested From patchwork Sat Apr 21 09:10:51 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: 902342 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.137; helo=fraxinus.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="HjzcdRPK"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Sn5S1Z9wz9s1t for ; Sat, 21 Apr 2018 19:11:08 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3BA06884AB; Sat, 21 Apr 2018 09:11:06 +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 3zbXrZVEoDnf; Sat, 21 Apr 2018 09:11:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A763D88240; Sat, 21 Apr 2018 09:11:04 +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 AA9C41C156B for ; Sat, 21 Apr 2018 09:11:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A7E5A89FB7 for ; Sat, 21 Apr 2018 09:11:00 +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 7yPYCZ7nNMk3 for ; Sat, 21 Apr 2018 09:11:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id E72C189F5B for ; Sat, 21 Apr 2018 09:10:59 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id d1-v6so28584028wrj.13 for ; Sat, 21 Apr 2018 02:10:59 -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=ImG1i3Jw1dhrpMrn5zAVsFkgCpShu1xI/qMPOZb1mdM=; b=HjzcdRPKv1vCRF2xwbyPnxGvvd92KkFEnhiS24/YwpXfAZYr2SB8FIyJwZmsDeCD74 NSzCdXNoZYWd4F6wyPyAxZCbSxbEeO8P1JLtW+uhea5DhvacrWu/e/bm62i+UJxmvCQg D4G2/s+je1/q3vfKKPLXS7ppsBqrZ2pYri4nkl/dgV3DSZWqvaVdhoqTuSk9BekeqBNy 3A82Akrhj4Pyo/yT8z/k/IG3HGhB5Bdto9++5ulbpKYyc5FKrwD28T7/kWwc5WhSp2SK BwtjtXg4P8RdLLVTdXkaxyG7EjNcm3B42+GRNM8r38NGVFA5cYxbi9pW4uDVbMaDI6Yi wMnw== 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=ImG1i3Jw1dhrpMrn5zAVsFkgCpShu1xI/qMPOZb1mdM=; b=RywWgSbNzfb3gDN+vTqZSwibazAEJ004gx6vGwdHNg1cMgDYtAhHn0zLEAlvJg4GIv e6O5nXbkXJKuVplvu+p8XYWVOynmChtgjc1y5g8CDwG9l+Kh99iWkTzs8I1wpQKgt942 kSPGTCdGit3y5kfEiNuvDV5VZBH+x43eU6+cKX6tu3xGl/NNrwe4VeuGTzgJgUacv0N7 WT5/93TCB3FFDs4mesEo608cY1YwstJRcb6Ns0K1IqnMDOzTRWQ3I/y+ulp+K4Efp4Zm WTKAN0r6KknWjGohnFaNtkVCaABN+IHsKqEMwQmTiXEQ8usqFNBataWaB5ZUAZ4rtd9X wnWQ== X-Gm-Message-State: ALQs6tC45zV2HcaLVEHmSBNnlAtwNZ+TBWHrbEB+sIbbJRwnFMr4JCWW xeQDmuBE0rVTqCyXTFuF8QrbEw== X-Google-Smtp-Source: AIpwx48cmfGYpf8Q2+T/55bcAMgbyXlsOLvweO5chgmIf/BvCYpSqC62nZwQeD6Ho1KJETcUdXXkfQ== X-Received: by 10.28.225.130 with SMTP id y124mr3120439wmg.57.1524301858162; Sat, 21 Apr 2018 02:10:58 -0700 (PDT) Received: from scaer.bzh.lan (2a01cb088610730021d32b09ea00dc7a.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:21d3:2b09:ea00:dc7a]) by smtp.gmail.com with ESMTPSA id y68-v6sm10255619wrb.91.2018.04.21.02.10.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Apr 2018 02:10:57 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 21 Apr 2018 11:10:51 +0200 Message-Id: <46720e6336b7efe82d9b733222f942a8cfaac3c6.1524301847.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 2/7] support/graph-depends: also cut on host-skeleton 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" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" host-skeleton is a dependency of almost all packages, except a very few. As such, it clutters the dependency graph uselessly. Do with it as we do for the skeleton: cut the dependency chains. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni --- support/scripts/graph-depends | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index 6ce90d872c..40a8eee5e9 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -175,10 +175,17 @@ def remove_transitive_deps(pkg, deps): return new_d +CUT_ON_PACKAGES = [ + 'toolchain', + 'skeleton', + 'host-skeleton', +] + + # This function removes the dependency on some 'mandatory' package, like the # 'toolchain' package, or the 'skeleton' package def remove_mandatory_deps(pkg, deps): - return [p for p in deps[pkg] if p not in ['toolchain', 'skeleton']] + return [p for p in deps[pkg] if p not in CUT_ON_PACKAGES] # This function will check that there is no loop in the dependency chain From patchwork Sat Apr 21 09:10:52 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: 902343 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.137; helo=fraxinus.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="KVmu01Yb"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Sn5V6xgWz9s1t for ; Sat, 21 Apr 2018 19:11:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C58F4883CA; Sat, 21 Apr 2018 09:11:07 +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 JfD8ogyMTSyr; Sat, 21 Apr 2018 09:11:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6A45F883F8; Sat, 21 Apr 2018 09:11:05 +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 82B9D1C156B for ; Sat, 21 Apr 2018 09:11:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7B9168A041 for ; Sat, 21 Apr 2018 09:11:01 +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 iwGImTuz-rQM for ; Sat, 21 Apr 2018 09:11:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by hemlock.osuosl.org (Postfix) with ESMTPS id D725D8A13B for ; Sat, 21 Apr 2018 09:11:00 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id f14-v6so28610262wre.4 for ; Sat, 21 Apr 2018 02:11:00 -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=TmZPRazZeTu5mYvwfXGicezxhYUJnihztRn5M5dNu0w=; b=KVmu01YbKzoMOPbg1AhnGVL1E/iEtbyr3I8u0LJtJbEGvsssJeubXlYIHHua2ZhC0n W15iFBBNqbO6Y6OnaEN9IU0hxc0jx+rIZKOUo6ISvJ4t0+q0Z+cEpKqYSXbNns5nr97t JNl+X+1xGdUYvKvWaBfZdgfN9yqyM6zt0yi3815dZa1nteTfUCt07iEgWRujrU8AKaax 3DV+3V5kjbY9PEqosSBEaerxr1XDrvpzcNerSjjBKv6xsMN7RcYBN/+sNrzobem3p69h UDVclh9ZF1BWpfd3pyy+NqzrunIV+edVwkPmCgHf/SDUgaQtRlBFr/+J7NVq24DPex4Z s/hg== 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=TmZPRazZeTu5mYvwfXGicezxhYUJnihztRn5M5dNu0w=; b=s1zuNnqprTU72XRfSt/wRXx8ESOBDSQxKA9EVlx6DCEkk6zB0wQZ1vrPdIpoIXZJ53 RWC9//5+z8i7palhxMRLfY+YafdRLmriKYBVCQBXpPwcUycJmGwv9iZ63nHCWz1GO7Zo 6lirdJqj9Buq+lW9yy2Z1pYpjogAxb3nwQzPwjLj2iAxgYap/16RHEAhYuOqtPut4OsF Am4MvTo0bbIhhXof+YLZ1jUzrIqtfnwkdutnsvCDpLkN/gV5ryoV81DheTDq2g7469eG EZORX8YvmBEZV59WIu0+0Naop4sIuFr4E4XsViDBOBJHqsDWElL4krIhg9BrYehcHH72 +bPA== X-Gm-Message-State: ALQs6tCYlchIy7yGbBj14DwsIXO9+GYQY9PdyWFfgppn6id7pRqqurWJ eRnrrLgAQRoms7IRGnjwNb3O9g== X-Google-Smtp-Source: AIpwx49gTKXLQyT0fPw2o6xYGWYINS/mQIal4R+FTgVOOUwxFrT/aeSHTYylLXYLP0PfyJcwymL+3g== X-Received: by 10.28.137.204 with SMTP id l195mr3689194wmd.141.1524301859265; Sat, 21 Apr 2018 02:10:59 -0700 (PDT) Received: from scaer.bzh.lan (2a01cb088610730021d32b09ea00dc7a.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:21d3:2b09:ea00:dc7a]) by smtp.gmail.com with ESMTPSA id y68-v6sm10255619wrb.91.2018.04.21.02.10.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Apr 2018 02:10:58 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 21 Apr 2018 11:10:52 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 3/7] support/graph-depends: also cut on host-tar 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" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When host-tar is needed, it is a mandatory dependency of all packages. As such, drawing the dependency lines toward host-tar would uselessly clutter the graph. So, like for the skeleton and host-skeleton, we cut the dependency chains toward host-tar. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni --- support/scripts/graph-depends | 1 + 1 file changed, 1 insertion(+) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index 40a8eee5e9..46ff164262 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -179,6 +179,7 @@ CUT_ON_PACKAGES = [ 'toolchain', 'skeleton', 'host-skeleton', + 'host-tar', ] From patchwork Sat Apr 21 09:10:53 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: 902344 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="mZ9Ob64m"; 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 40Sn5W598gz9s1w for ; Sat, 21 Apr 2018 19:11:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 000DF8A14A; Sat, 21 Apr 2018 09:11:06 +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 2-2ryi5YaITp; Sat, 21 Apr 2018 09:11:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4A18B8A14C; Sat, 21 Apr 2018 09:11:06 +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 D00BE1C156B for ; Sat, 21 Apr 2018 09:11:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CCF6F8A019 for ; Sat, 21 Apr 2018 09:11:02 +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 yrjW8PpOjF-e for ; Sat, 21 Apr 2018 09:11:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id E5F3C8A041 for ; Sat, 21 Apr 2018 09:11:01 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id s18-v6so28599104wrg.9 for ; Sat, 21 Apr 2018 02:11:01 -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=MQYGrj5fwHundBpyQeE4QCEsYVL/Wl2j7PCyfQ+4jAQ=; b=mZ9Ob64mcxNBqxLl/ESVg55LXO8xnoiDd8MVOyDqrhoupquERJi2BIxhoFQIivCIc5 LilkKVjpFhKg0AL72753eLzTrxW4q1vV/QVI2tAZL63zpGCdJvVCOb8T3mLnS4Oqk0Os lQ+A4Dt4Szfc4nlEiMX+2EJLvrqh0soy94W2lfjk4VqUE9tugzX7bKYpkNbiIdnR038B fEvYGTY3+98MaxJHTcpNFVcPnQ5957A9pwASDsw6AgYydTax6gs6YiIyXkhFGkv3Cek2 yg4Sr2aAp7tUTtWl6I5OGEJG+V2+3yb1rP7OtAgu6NMLEj1cn+KWmD1nM9h7CWgo6JvV bJ3w== 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=MQYGrj5fwHundBpyQeE4QCEsYVL/Wl2j7PCyfQ+4jAQ=; b=t1YRpZKnVuTOsZlU86P+Fg8ODhFrkJWuZfDUDuyUMk7+pjHhOizGqRK9L/Rmn6DS9r tihSbBdUv4JJPfXqP26EXaDTWUMqmTHHp7wlxvIEEYnkBSacCYblAYqnkjy7qZMQcT28 bode/i5fZgtJ33Pcm4Zbkl8mli1x0BWPSdRO37wzl3+Y6pGIv02awaswH/jmrgSBY8J6 cPBGDtS9EYNkXMSRpXWpN5gdrjr8TYaYd90812rrkSt2rEgIGSMW/LYvsxhgznfK3MwV RiW2oXSZt7QtpjsGi1BfP1aEhk46LrJnJk1n4ZtfmX5p0w9uF7e1TC4ne5A8UnYFbEmJ nxTg== X-Gm-Message-State: ALQs6tDyhEm6p+7pkVqc/GADd90svnLAouKtHP3nA8WMX/nbwWJ1sCHi faltYyD8ElFEMXnGG1KZoDcJ+g== X-Google-Smtp-Source: AIpwx4+ro48Fs7T6Lm+xFRDbCtLN9D7xA7HCVD/2fY7bZ2ZTtCK/Yzl1HSI2uUpjpQmuJO+JDLqZ1A== X-Received: by 2002:adf:a48d:: with SMTP id g13-v6mr10506395wrb.7.1524301860174; Sat, 21 Apr 2018 02:11:00 -0700 (PDT) Received: from scaer.bzh.lan (2a01cb088610730021d32b09ea00dc7a.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:21d3:2b09:ea00:dc7a]) by smtp.gmail.com with ESMTPSA id y68-v6sm10255619wrb.91.2018.04.21.02.10.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Apr 2018 02:10:59 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 21 Apr 2018 11:10:53 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 4/7] core/package: postpone evaluation of dependency conditions 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" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" In the pkg-inner macro, all variables, but he positional arguments, must be $$-prefixed, so that they are expanded only when the macro is evaluated in each package, not when the macro is parsed. It is to be noted, though, that the current code, even though incorrect by the above rules, seemed to work. However, the upcoming addition of download dependencies, mimicking that code, would not work unless it was $$-prefixed. So, for consistency sake, and for correctness sake, let's always use the $$-prefix in the inner macro. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- Arnout: you the make expert, any idea why on Earth the single-expansion was working in thefirst place? --- package/pkg-generic.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 1c9dd1d734..12e3981752 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -560,26 +560,26 @@ ifneq ($(1),host-skeleton) $(2)_DEPENDENCIES += host-skeleton endif -ifeq ($(filter host-tar host-skeleton host-fakedate,$(1)),) +ifeq ($$(filter host-tar host-skeleton host-fakedate,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $(BR2_TAR_HOST_DEPENDENCY) endif -ifeq ($(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) +ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $(BR2_XZCAT_HOST_DEPENDENCY) endif -ifeq ($(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) +ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $(BR2_LZIP_HOST_DEPENDENCY) endif -ifeq ($(BR2_CCACHE),y) -ifeq ($(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache,$(1)),) +ifeq ($$(BR2_CCACHE),y) +ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache,$(1)),) $(2)_DEPENDENCIES += host-ccache endif endif -ifeq ($(BR2_REPRODUCIBLE),y) -ifeq ($(filter host-skeleton host-fakedate,$(1)),) +ifeq ($$(BR2_REPRODUCIBLE),y) +ifeq ($$(filter host-skeleton host-fakedate,$(1)),) $(2)_DEPENDENCIES += host-fakedate endif endif From patchwork Sat Apr 21 09:10:54 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: 902347 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="V6z2ufxn"; 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 40Sn5w0lxdz9s1t for ; Sat, 21 Apr 2018 19:11:32 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1669788EBE; Sat, 21 Apr 2018 09:11:28 +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 dQE-BHdtKj+X; Sat, 21 Apr 2018 09:11:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BFA5A89023; Sat, 21 Apr 2018 09:11:13 +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 F2DB41C156B for ; Sat, 21 Apr 2018 09:11:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EFDF2885CE for ; Sat, 21 Apr 2018 09:11:03 +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 J3e3xFDJKxwo for ; Sat, 21 Apr 2018 09:11:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id 05CC7885DD for ; Sat, 21 Apr 2018 09:11:03 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id h3-v6so28629653wrh.5 for ; Sat, 21 Apr 2018 02:11:02 -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=VoAdpFUEuL9AVTV00LIKZcottnuORvaqi9dLHjp9c68=; b=V6z2ufxnG6yIv3jhVryg2y5Y2aDpmuJblWzUlC9rFC7ZJV3cOr163P0T8DuOGUikhV vAxA/k20+JTxQxDtZwBIZ90IykYXoJvezUYvr8mxo9q0Jp5hT7dodfb/O/1Pun75/UNR 0kak3h2nCFaCdBKGWc3BVywtTcs3BQVz+fe8eSRBdmvSUkjQH/KK7zuKVS4DswxRx9wG m+9lU+7cs4EknRVIVdZRhlrC2ihB72XoLoEFLNDrTgGLA1V8hhfBrmf6QpuWzQM7/EJg B0rF7hScfRGx2QTXx9XtFMgtPtF6LFF496buc0mcNrgINHMT22+o/Yrtqfj/XI6YoYwc dP+w== 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=VoAdpFUEuL9AVTV00LIKZcottnuORvaqi9dLHjp9c68=; b=l6f8kBM7bkj4kzKWsIPC1AL79JFo4nh3uis2ll7KNsLW1lSwoBCD8W1RX8Gq2YQ+d0 QlNQmt/KaNaUQvsrpueYapOtHJvauQRziyvzITYBXYgyuVNGqlSJLBGny1QX0MRL2Rvm s6BrCqs0boKBD/vo4bmLrGLPfElXd0uLfwBq+mSsQsZmVIzcuz+8hiEgFduum5loqr9d uyayw6lQaJinP9l5RTkjEq95VncNn/GdUdWtdywfDQx4dsgHxOH54dizvI/jZcDWRymk CttOVb/EpZT+TW2++LzulzpqyHIXbZeJURQ6lSulFWcu0aJ1gOqTW6p0LvifytMSeump Fl+w== X-Gm-Message-State: ALQs6tA2PNHKzqdIhJJ+ycKGos6GqNpSZBQH0wM7xILEZR+fPoygGwnk mF96igYwSTet3S2Sa1b9DcW2fQ== X-Google-Smtp-Source: AIpwx4/4783fE0hNbXhBS4WT555pZeMenlDyPcpBJWell3HCQJm2G0L+ik2sxqC46lVAmIHB1JEBEw== X-Received: by 2002:adf:dbc6:: with SMTP id e6-v6mr11011856wrj.212.1524301861270; Sat, 21 Apr 2018 02:11:01 -0700 (PDT) Received: from scaer.bzh.lan (2a01cb088610730021d32b09ea00dc7a.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:21d3:2b09:ea00:dc7a]) by smtp.gmail.com with ESMTPSA id y68-v6sm10255619wrb.91.2018.04.21.02.11.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Apr 2018 02:11:00 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 21 Apr 2018 11:10:54 +0200 Message-Id: <84c119a06517599853f67712361eeb48e4edef2f.1524301847.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 5/7] core/package: add possibility to declare download dependencies 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" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" For some packages, we may need to have a certain set of host-tools built before the download of said packages are attempted. For example, when the system tar is not suitable, we will want to build our own tar before we attempt a git download (because we generate a tarball in the git backend). Mimick the _EXTRACT_DEPENDENCIES, and introduce _DOWNLOAD_DEPENDENCIES. As for _EXTRACT_DEPENDENCIES, we do not document _DOWNLOAD_DEPENDENCIES, on the assumption that it is mostly for internal use. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Peter Korsgaard --- package/pkg-generic.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 12e3981752..6222d238c6 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -586,11 +586,13 @@ endif # Eliminate duplicates in dependencies $(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES)) +$(2)_FINAL_DOWNLOAD_DEPENDENCIES = $$(sort $$($(2)_DOWNLOAD_DEPENDENCIES)) $(2)_FINAL_EXTRACT_DEPENDENCIES = $$(sort $$($(2)_EXTRACT_DEPENDENCIES)) $(2)_FINAL_PATCH_DEPENDENCIES = $$(sort $$($(2)_PATCH_DEPENDENCIES)) $(2)_FINAL_ALL_DEPENDENCIES = \ $$(sort \ $$($(2)_FINAL_DEPENDENCIES) \ + $$($(2)_FINAL_DOWNLOAD_DEPENDENCIES) \ $$($(2)_FINAL_EXTRACT_DEPENDENCIES) \ $$($(2)_FINAL_PATCH_DEPENDENCIES)) @@ -717,6 +719,7 @@ $$($(2)_TARGET_EXTRACT): | $$($(2)_FINAL_EXTRACT_DEPENDENCIES) $(1)-depends: $$($(2)_FINAL_DEPENDENCIES) $(1)-source: $$($(2)_TARGET_SOURCE) +$$($(2)_TARGET_SOURCE): | $$($(2)_FINAL_DOWNLOAD_DEPENDENCIES) $(1)-all-source: $(1)-legal-source $(1)-legal-info: $(1)-legal-source From patchwork Sat Apr 21 09:10:55 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: 902345 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.136; helo=silver.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="GM/V2Rps"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Sn5f1cz2z9s1t for ; Sat, 21 Apr 2018 19:11:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CA9872EF15; Sat, 21 Apr 2018 09:11:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OC2g6w1JAVuM; Sat, 21 Apr 2018 09:11:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 77401226DD; Sat, 21 Apr 2018 09:11:14 +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 050E81C156B for ; Sat, 21 Apr 2018 09:11:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0248B883CA for ; Sat, 21 Apr 2018 09:11:05 +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 vuv4dKWjGdf7 for ; Sat, 21 Apr 2018 09:11:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by fraxinus.osuosl.org (Postfix) with ESMTPS id D535988228 for ; Sat, 21 Apr 2018 09:11:03 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id h3-v6so28629722wrh.5 for ; Sat, 21 Apr 2018 02:11:03 -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=amYSN/bO/fVOkQNiCTSdhbZNUhLidtNKowfeK6ennXw=; b=GM/V2RpsyauQYz1zZIVTHkUnNjrb41WEtZehDUgB39hDcJXqT8ahb6y3uLmZfoL+WN BZgoTWttJvti6ENS4jLM6C5fHpY/xeUViUZdPV0vkfm9zGVL3pV38PrTHpATznN7bf+d T94uWvyQx6+er8COYD5/VOPC3sHrbAoTT4kjBsgMpxFQjEB5p5aYzc9bxVWpj0PJ8Kny XvTRLXB81GivmugH+wZIzGqA1mjr80F284Z4DVoLcGqaW8cdxaxAmyfndJnLdPdVoB+Y t9+PgZwUD9m9sAxUEqqqlBAC29tM6ZzEbzsGsUtChUgVG1CJ8fAUBHiBoiwbuNdAiwj/ YkBg== 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=amYSN/bO/fVOkQNiCTSdhbZNUhLidtNKowfeK6ennXw=; b=RGYQbbXBV2jygvigrpC961eIwuArMVKkNLz6y15y4q4EZjrV9e8xxxHv74dZDeqUMq OnWPitBwZiCAfj2zVkJnxxxTHOziCOBwlNu1BjPqUWpLtOwr5hjMqM3lMbdiVYzpGYH4 u7L9fpA8e7cTXBAyTiYlaBHxIx5x7N3oRZddV5688CB1/yGZCY5ISnQR0q2qeInoONxc d5HfgB1f9eEx+rsFk2OTf86sa3A5ZBJwBzXkc1vKO0HZzwmb0+W0LuHklrLNr7VKTzIE o8sp3TVw9Z84W36ZWugNyN5m8mXmY3ULYOgQ3TMzvNsPmyJ0M4jftMd+jGpIDOD76WU4 54Mg== X-Gm-Message-State: ALQs6tCBDYmoxuk02s2oFDrucKfXRUb+t3goKtdJjRQMKYkJoOkbY4L9 naMUXn2eHi/OTFtc9ddeTzKtfw== X-Google-Smtp-Source: AIpwx49w1N/NE+jt3Iyfo+KNjjiV5wVyJL9z8AAaPJWsh445/7ILzKIRBinoJQygMWH4VQxy7Ke7Tg== X-Received: by 2002:adf:b0e2:: with SMTP id j31-v6mr9617067wra.263.1524301862159; Sat, 21 Apr 2018 02:11:02 -0700 (PDT) Received: from scaer.bzh.lan (2a01cb088610730021d32b09ea00dc7a.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:21d3:2b09:ea00:dc7a]) by smtp.gmail.com with ESMTPSA id y68-v6sm10255619wrb.91.2018.04.21.02.11.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Apr 2018 02:11:01 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 21 Apr 2018 11:10:55 +0200 Message-Id: <033e8b463463d1ed5931599abba35ce6214fb123.1524301847.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 6/7] core/package: add host-tar dependency for downloads from repositories 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" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Three of our download backends need a host tar that can generate reproducible archives: cvs, git, and svn. The other two, hbzr and hg, use their internal implementation. So, for those three that need it, and a dependency on host-tar when the system tar is not appropriate. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Peter Korsgaard --- package/pkg-generic.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6222d238c6..aece46ff0c 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -560,6 +560,10 @@ ifneq ($(1),host-skeleton) $(2)_DEPENDENCIES += host-skeleton endif +ifneq ($$(filter cvs git svn,$$($(2)_SITE_METHOD)),) +$(2)_DOWNLOAD_DEPENDENCIES += $(BR2_TAR_HOST_DEPENDENCY) +endif + ifeq ($$(filter host-tar host-skeleton host-fakedate,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $(BR2_TAR_HOST_DEPENDENCY) endif From patchwork Sat Apr 21 09:10:56 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: 902346 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.136; helo=silver.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="Kjj02iHc"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Sn5m29GHz9s1t for ; Sat, 21 Apr 2018 19:11:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 335142F674; Sat, 21 Apr 2018 09:11:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9s40uaZW9nrc; Sat, 21 Apr 2018 09:11:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 375372CD7A; Sat, 21 Apr 2018 09:11:15 +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 476051C156B for ; Sat, 21 Apr 2018 09:11:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 33A82884DF for ; Sat, 21 Apr 2018 09:11:08 +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 UHlXSByRYr0Z for ; Sat, 21 Apr 2018 09:11:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9A42588401 for ; Sat, 21 Apr 2018 09:11:05 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id u18-v6so1359164wrg.3 for ; Sat, 21 Apr 2018 02:11:05 -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=LBfFIseE6bkcIOghkPJWmjZ3ex0cCNlvrbdyAc6zDSA=; b=Kjj02iHcZnUMv5lGi1RI1WMcAZtLhXIBR0hxmQFJQgOFQxgJRLfSNw2lYRjlpU6tsD JDZASSTKU8HS34JMXXYC3KiwiExymiXXKC9GsC35/rcVBiTJnq28VNDPCGv2j9a3h7SI VN84q861JlzE0ZhL6cmffFW6rPZ/Yyb+HoceM86JhZEKnGKcQ9Yp6ch/v7pgC3LPSJpW XbTUAgtDaEMdqQBnRors4RGFZff7HcmEDLDCD/8U/XF1wc5o3zJPkhnfaopt0sJbBdb8 Kg9CkP7r0tMOES9YwkUP8LC8q82IyLpb9+DkM5dpKWt+tz4WNw6XbVWoXFo4Lp9L++2X fYhg== 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=LBfFIseE6bkcIOghkPJWmjZ3ex0cCNlvrbdyAc6zDSA=; b=DxWGFunYTXCbdpPl/7PMJmsV4mK6/kE80B6pk7m1TapKwv1YDQWSQ9aMWEkRpHJHWX 1Tkzfh9zdgpRPDrSsBTk5LSzIOwdGcU+kSjuNNqgg4fgPryRNaIvbBU3NmJF71BDJNSi fVUzlXYOd/OTIbFjC+hpnlBmXzXhFPUYuvyIJ5ev8z5y1i6Jf0IBy/pUD1fks2KTqix6 +nJ3JK3JFDQTaqVAooIe15bA9CA7p5GIn2qLRF6x40Fq5jf6FVlu9oLEiJXuZu/a1VlP /r6yxVlMGNyQZhpMuQaAEsVYKNwe98ujGg/htCL2GeayVntK5LqF3vJIcRzHllfdQ+3I tUSA== X-Gm-Message-State: ALQs6tAsPIn7yo8Ox6voy5M2fFCLzlPN7E+oNYLFTM+cRDJE2hZBNR0h 89/T6g4cJ5a+8Nm336UUMonNCg== X-Google-Smtp-Source: AIpwx49WXpVqF62Dm+TCjMInYYNWe8gjspVUGH8q+zpkm/n2iY0Ln3oBXeYous0g5+IvLnWmZyulZA== X-Received: by 2002:adf:e642:: with SMTP id b2-v6mr5325848wrn.172.1524301863964; Sat, 21 Apr 2018 02:11:03 -0700 (PDT) Received: from scaer.bzh.lan (2a01cb088610730021d32b09ea00dc7a.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:21d3:2b09:ea00:dc7a]) by smtp.gmail.com with ESMTPSA id y68-v6sm10255619wrb.91.2018.04.21.02.11.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Apr 2018 02:11:03 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 21 Apr 2018 11:10:56 +0200 Message-Id: <021f6b14835ca89bc6ecb4b36aa09fd246f7d896.1524301847.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 7/7] fs: always depend on build host-tar if needed 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" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, the filesystems do not depend on building host-tar when it is needed, even though all of them have to extract the intermediate tarball. However, in degenerate (but legally valid) configurations with no user-selectable package selected, host-tar would not be built, so the rootfs images would use whatever improper tar the system has. Add the conditional dependency to host-tar to the rootfs-common intermediate image. Since this is the internal step that all real rootfs generators depend on, they now properly depend on host-tar when needed. In practice, when host-tar is needed, it will always be built before the rootfs inages, because it is a dependency of all packages (except a very few, like the skeleton), of which host-fakeroot, which is a mandatory dependency of rootfs-comon anyway. But for consistency sake, let's explicitly add host-tar as a dependency to rootfs-common too. Note that rootfs-tar already had that dependency, and we leave it as-is because it is semantically correct, even if superfluous. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni --- Note: yes, I had a randpackageconfig turn up a configuration with no user-selectable package enabled... I should just stop coding and go play bingo. Too bad there is no big jackpot tonight... ;-] --- fs/common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/common.mk b/fs/common.mk index 9baf367729..d106783813 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -63,6 +63,7 @@ ROOTFS_COMMON_TARGET_DIR = $(FS_DIR)/target ROOTFS_COMMON_DEPENDENCIES = \ host-fakeroot host-makedevs \ + $(BR2_TAR_HOST_DEPENDENCY) \ $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-mkpasswd) $(ROOTFS_COMMON_TAR): ROOTFS=COMMON