From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yann E. MORIN Date: Sun, 13 Mar 2016 00:22:08 +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: <20160312232208.GO3745@free.fr> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Yegor, Thomas, All, On 2016-03-10 14:37 +0100, Thomas Petazzoni spake thusly: > 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. And that's especially usefull for our conditional patches, like, say, for gcc, for which we manual apply condiotnal patches depending on our configuration. Regards, Yann E. MORIN. > 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. > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Free Electrons > Embedded Linux, Kernel and Android engineering > http://free-electrons.com > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'