From: Ludovic Desroches <ludovic.desroches@atmel.com>
To: buildroot@busybox.net
Subject: [Buildroot] Problem with apply-patches.sh
Date: Mon, 16 Apr 2012 18:00:36 +0200 [thread overview]
Message-ID: <4F8C4224.6040500@atmel.com> (raw)
In-Reply-To: <CAFbHwiQUUsb2XPY_+nw--m1KTutFY_zXVYHaFNAfac_ftg78fA@mail.gmail.com>
Hi
Le 04/16/2012 04:40 PM, Will Newton a ?crit :
> Hi all,
>
> I noticed that in some cases apply-patches.sh will misbehave if you
> have a file matching the glob '*.patch' in the top-level directory.
> For example the patching of binutils fails in this case. The problem
> is at the line:
>
> support/scripts/apply-patches.sh $(@D)
> $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH)
> || exit 1;
>
> in package/Makefile.package.in. The glob gets expanded prematurely (to
> e.g. myfile.patch) and then the expanded glob is passed to
> apply-patches.sh which will fail to find any patches matching the
> glob. I've had a go at trying to stop this happening but with no
> success so far. Can anyone think of any creative ways to suppress this
> expansion?
>
> Thanks,
I see what you mean but I can't reproduce your issue:
diff --git a/support/scripts/apply-patches.sh
b/support/scripts/apply-patches.sh
index e4b98bc..787a297 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -11,6 +11,10 @@ patchdir=${2-../kernel-patches}
shift 2
patchpattern=${@-*}
+echo "====================="
+echo "$patchpattern"
+
if [ ! -d "${builddir}" ] ; then
echo "Aborting. '${builddir}' is not a directory."
exit 1
>>> binutils 2.21.1 Extracting
bzcat /home/ldesroches/workspace/buildroot/dl/binutils-2.21.1.tar.bz2 |
tar --strip-components=1 -C
/home/ldesroches/workspace/buildroot/output/build/binutils-2.21.1 -xf -
>>> binutils 2.21.1 Patching package//binutils
=====================
binutils*.patch binutils*.patch.arm
=====================
*.patch *.patch.arm
On my side the expansion is done only into apply-patches.sh but you are
right it is done too early
I am going to send a patch to correct this.
Thanks to report this bug.
Regards
Ludovic
next prev parent reply other threads:[~2012-04-16 16:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-16 14:40 [Buildroot] Problem with apply-patches.sh Will Newton
2012-04-16 16:00 ` Ludovic Desroches [this message]
2012-04-16 16:02 ` [Buildroot] [PATCH] apply-patches.sh: patch pattern was expanded prematurely ludovic.desroches at atmel.com
2012-04-16 16:07 ` Ludovic Desroches
2012-04-16 21:19 ` Peter Korsgaard
2012-04-16 16:09 ` [Buildroot] Problem with apply-patches.sh Will Newton
2012-04-16 16:23 ` Ludovic Desroches
2012-04-16 16:27 ` Will Newton
2012-04-16 16:42 ` Ludovic Desroches
2012-04-16 16:54 ` Will Newton
2012-04-16 16:58 ` Ludovic Desroches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F8C4224.6040500@atmel.com \
--to=ludovic.desroches@atmel.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox