* do_patch fails if path starts with ./
@ 2009-03-12 8:30 Frans Meulenbroeks
2009-03-12 10:09 ` Marcin Juszkiewicz
2009-03-12 18:40 ` Denys Dmytriyenko
0 siblings, 2 replies; 3+ messages in thread
From: Frans Meulenbroeks @ 2009-03-12 8:30 UTC (permalink / raw)
To: openembedded-devel
Hi,
When generating my (normally small) patches I typically do a cp file
file.orig in the work dir, then change file and at the end do a diff
-urN path/file.oirg path/file >file.patch
no probllems with that (although if there are recommendations to do
things simpler/better, I'm of course open to suggestions).
However yesterday I copied and pasted filenames and ended up with
diff -urN ./path/file.orig ./path/file >file.patch
of course then in file.patch the filenames starts with ./
when that happens do_patch does not find the file.(probably because it
thinks there is an additional directory because it does not see that
./ is actually the same dir)
is this a bug in our build system? or in patch?
or should I just avoid using ./ if I create a patch?
btw: I alredy tried diff -Nurd (so an additional d flag) but that did
not make a difference).
Frans.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: do_patch fails if path starts with ./
2009-03-12 8:30 do_patch fails if path starts with ./ Frans Meulenbroeks
@ 2009-03-12 10:09 ` Marcin Juszkiewicz
2009-03-12 18:40 ` Denys Dmytriyenko
1 sibling, 0 replies; 3+ messages in thread
From: Marcin Juszkiewicz @ 2009-03-12 10:09 UTC (permalink / raw)
To: openembedded-devel
Dnia czwartek, 12 marca 2009 o 09:30:47 Frans Meulenbroeks napisał(a):
> When generating my (normally small) patches
quilt new my-new-patch.diff
> I typically do a cp file file.orig in the work dir,
quilt add file
> then change file and at the end do a diff -urN path/file.oirg
> path/file >file.patch
quilt refresh
> no probllems with that (although if there are recommendations to do
> things simpler/better, I'm of course open to suggestions).
cp patches/my-new-patch.diff OE/
In other words: start using quilt - life will be much easier.
Regards,
--
JID: hrw@jabber.org
Website: http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: do_patch fails if path starts with ./
2009-03-12 8:30 do_patch fails if path starts with ./ Frans Meulenbroeks
2009-03-12 10:09 ` Marcin Juszkiewicz
@ 2009-03-12 18:40 ` Denys Dmytriyenko
1 sibling, 0 replies; 3+ messages in thread
From: Denys Dmytriyenko @ 2009-03-12 18:40 UTC (permalink / raw)
To: openembedded-devel
On Thu, Mar 12, 2009 at 09:30:47AM +0100, Frans Meulenbroeks wrote:
> Hi,
>
> When generating my (normally small) patches I typically do a cp file
> file.orig in the work dir, then change file and at the end do a diff
> -urN path/file.oirg path/file >file.patch
> no probllems with that (although if there are recommendations to do
> things simpler/better, I'm of course open to suggestions).
>
> However yesterday I copied and pasted filenames and ended up with
> diff -urN ./path/file.orig ./path/file >file.patch
Have you tried:
diff -urN path/file.orig path/file >file.patch
> of course then in file.patch the filenames starts with ./
> when that happens do_patch does not find the file.(probably because it
> thinks there is an additional directory because it does not see that
> ./ is actually the same dir)
You may want to play with the pnum variable (increase it?) in the SRC_URI
of the patch...
> is this a bug in our build system? or in patch?
> or should I just avoid using ./ if I create a patch?
>
> btw: I alredy tried diff -Nurd (so an additional d flag) but that did
> not make a difference).
--
Denys
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-03-12 18:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-12 8:30 do_patch fails if path starts with ./ Frans Meulenbroeks
2009-03-12 10:09 ` Marcin Juszkiewicz
2009-03-12 18:40 ` Denys Dmytriyenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox