From patchwork Mon Jul 4 07:52:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 643926 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3rjfPl5L42z9spN for ; Mon, 4 Jul 2016 17:52:43 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=oX67V3es; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9BBEE2F27C; Mon, 4 Jul 2016 07:52:39 +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 vNf2-V+4rP4W; Mon, 4 Jul 2016 07:52:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 495C52F1F1; Mon, 4 Jul 2016 07:52:36 +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 56F5A1BFFCA for ; Mon, 4 Jul 2016 07:52:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 542C186D26 for ; Mon, 4 Jul 2016 07:52:34 +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 aGEADOnSjlBn for ; Mon, 4 Jul 2016 07:52:33 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id 6695386A9D for ; Mon, 4 Jul 2016 07:52:33 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id 187so19646793wmz.1 for ; Mon, 04 Jul 2016 00:52:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=Z9sVIkZbZAOCFe1y6SyrEoC/RHHw9HK/vS+VzJbiFlY=; b=oX67V3esQQxKuw7TvBwcc4Zi2yhbRzeM+Oj9iNso2xbFGC5BXDAQyYxvRuPQFYnzs7 W3mhPilfvR/gjaG/yfFb8RvJajHjTqRwPI/3K4ayMFmjSttdN09BtzlU88+ytsiTJES3 cG/Ie8u8wNozKj2/GlGsalHd5UCg6UfXY4VFB/qTZ05LMvqqjg0DGyQXg4g6qqmingY6 skmlsfrF0QIL3LpmrblPvGdQbnZhuRVNbPqgaoZU2e6cVb0Qw+qMnMtzSfs1nPSGfahl k+Zy9Gl9ZC691fIym9ycsJ7tXEPAPP2cuf8da7Q52kGMBaMl11gchVF+EC7BuJcUPR+t V2vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=Z9sVIkZbZAOCFe1y6SyrEoC/RHHw9HK/vS+VzJbiFlY=; b=Tos8sCMsgLAswpvjd9n2PCNlh8/hHA6l62eZQ60x7Krqabdool2jyNvvdAFXVsHJQs Q04b3Ke7L8wFQpfaeQBxhNVcztCXk9ufgrDSEF249JqHRIWrRg4hiOZgjRBIkNxukn7/ C9JZD/OC88pVVVN8LAGvB1FsTMQivg4tJ+q1jU+6KOr2zOAbS5hVYCXXLI5CiaZN1GHK NtAS0Vla6/mRcQiOrfF9OzwI+y9JxaVe/xEf0yITXeZhtxi0uQO39BuhzT+mpOxp6Hai 4fbk7qu+8VPvIR++qHxqsSas378TZUMMARh08dfqN7yq9aU6xSGobqnE49IQCgpcJyrN TeZg== X-Gm-Message-State: ALyK8tKlFt9/+2E6yqSBqeyY0wmJiTZ/oSc9pscvfwK+yE+hn6knB4hVd6GJTFR2v9VhJw== X-Received: by 10.28.168.7 with SMTP id r7mr9668386wme.9.1467618751862; Mon, 04 Jul 2016 00:52:31 -0700 (PDT) Received: from gourin.home ([2a01:cb19:84c0:6b00:3e97:eff:fe77:54d6]) by smtp.gmail.com with ESMTPSA id k3sm3750797wju.29.2016.07.04.00.52.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Jul 2016 00:52:30 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 4 Jul 2016 09:52:25 +0200 Message-Id: <1467618745-1231-1-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 2.7.4 Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH] support/download: don't be over-remove file from git archives X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When we now manually create git archives, we remove all .git-related files. However, we also exclude empty directories. This means that a directory which only had a .gitignore file is excluded from the archive. Fixes: http://autobuild.buildroot.org/results/2aa/2aa8954311f009988880d27b6e48af91bc74c346/ http://autobuild.buildroot.org/results/b45/b45cceea99b9860ccf1c925eeda498a823b30903/ http://autobuild.buildroot.org/results/5ae/5ae336052fd32057d9631649279e142a81f5651f/ http://autobuild.buildroot.org/results/5fc/5fc3abf4a1aea677f576e16c49253d00720a8bef/ Signed-off-by: "Yann E. MORIN" --- support/download/git | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/download/git b/support/download/git index 45802d3..663006b 100755 --- a/support/download/git +++ b/support/download/git @@ -83,9 +83,9 @@ if [ ${recurse} -eq 1 ]; then _git submodule update --init --recursive fi -# We do not need the .git dir and other gitfiles to generate the tarball -find . \( -name .git -o -name .gitmodules -o -name .gitignore \) \ - -exec rm -rf {} + +# We do not need the .git dir; we keep other .git files, in case they +# are the only files in their directory. +rm -rf .git popd >/dev/null