From patchwork Tue Mar 20 22:52:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 147873 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id CB801B6EF4 for ; Wed, 21 Mar 2012 10:32:21 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C8ECD101123; Tue, 20 Mar 2012 23:32:20 +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 VaGm81z1IK43; Tue, 20 Mar 2012 23:32:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 43071101137; Tue, 20 Mar 2012 23:32:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id CC2178F78E for ; Tue, 20 Mar 2012 23:32:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BDE7D8C732 for ; Tue, 20 Mar 2012 23:32:00 +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 FTSsY8QJiW-X for ; Tue, 20 Mar 2012 23:31:59 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by whitealder.osuosl.org (Postfix) with ESMTP id C32858C554 for ; Tue, 20 Mar 2012 23:31:59 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id BCD3E953F5; Tue, 20 Mar 2012 23:31:59 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Tue, 20 Mar 2012 23:52:29 +0100 X-Git-Refname: refs/heads/master X-Git-Oldrev: 1b671d477bc3154c1c72e2a770b8a97e4566a359 X-Git-Newrev: 1b58957a9637d3b3d1ae13ec26096d737fdd1a45 Message-Id: <20120320233159.BCD3E953F5@busybox.osuosl.org> Subject: [Buildroot] [git commit] apply-patches.sh: directories are no more considered as overlays X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net commit: http://git.buildroot.net/buildroot/commit/?id=1b58957a9637d3b3d1ae13ec26096d737fdd1a45 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master When a directory is found in patchdir, it is skipped. Signed-off-by: Ludovic Desroches Tested-by: Ludovic Desroches with an armadeus_apf9328_defconfig build Acked-by: Thomas Petazzoni Tested-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/scripts/apply-patches.sh | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index c741a63..3d655f1 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -30,10 +30,7 @@ for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do apply="patch -g0 -p1 -E -d" uncomp_parm="" if [ -d "${patchdir}/$i" ] ; then - type="directory overlay" - uncomp="tar cf - --exclude=.svn --no-anchored -C" - uncomp_parm="." - apply="tar xvf - -C" + echo "${patchdir}/$i skipped" else case "$i" in *.gz) type="gzip"; uncomp="gunzip -dc"; ;;