From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnout Vandecappelle Date: Thu, 10 Mar 2016 23:44:18 +0100 Subject: [Buildroot] [PATCH] apply-patches.sh: handle any file name as *.patch In-Reply-To: <20160310143725.7a1ac7aa@free-electrons.com> References: <1457608789-32336-1-git-send-email-yegorslists@googlemail.com> <20160310143725.7a1ac7aa@free-electrons.com> Message-ID: <56E1F8C2.5010703@mind.be> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On 03/10/16 14:37, Thomas Petazzoni wrote: > Hello, > > On Thu, 10 Mar 2016 12:19:49 +0100, yegorslists at googlemail.com wrote: >> From: Yegor Yefremov >> >> Handle both *.patch and default cases as *.patch. This is needed >> in order to handle downloaded patches generated by for example >> cgit, that have no file name extension. >> >> Signed-off-by: Yegor Yefremov >> --- >> support/scripts/apply-patches.sh | 6 +----- >> 1 file changed, 1 insertion(+), 5 deletions(-) >> >> diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh >> index 201278d..e4cccf5 100755 >> --- a/support/scripts/apply-patches.sh >> +++ b/support/scripts/apply-patches.sh >> @@ -83,12 +83,8 @@ function apply_patch { >> type="compress"; uncomp="uncompress -c"; ;; >> *.diff*) >> type="diff"; uncomp="cat"; ;; >> - *.patch*) >> + *.patch*|*) >> type="patch"; uncomp="cat"; ;; >> - *) >> - echo "Unsupported file type for ${path}/${patch}, skipping"; >> - return 0 >> - ;; > > Unfortunately, this might break some existing use cases. Today, you can > point to a directory of patches, and only the *.patch* or *.diff* files > will be applied, other files will be ignored and not applied. > > With your change, if there is any other file in the directory, it will > also attempt to apply it. > > Maybe we need to have a different behavior depending on whether we pass > a directory to apply-patches.sh, or a file. If we specify a file, then > we really want that file to be applied, regardless of its extension. > However, if it's a directory, then we don't want to apply all files. Actually, we already do that, because apply-patches is always called with a pattern parameter. So this will only be a problem if there would be a directory called foo.patch. Yegor, can you check if that is true for all cases? Regards, Arnout > > Best regards, > > Thomas > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF