Re: [patch 1/6] uml: remove elf.h [ compile-fix, for 2.6.12 ]

Re: [patch 1/6] uml: remove elf.h [ compile-fix, for 2.6.12 ]

[Bodo Eggert <harvested.in.lkml@posting.7eggert.dyndns.org>]

Andrew Morton <akpm@osdl.org> wrote:

> hmm, that's exciting.  How to tell diff and patch to remove a zero-length
> file?

$ md a b c
$ touch a/a
$ echo .>c/a
$ diff -purN a c
diff -purN a/a c/a
--- a/a 2005-05-10 04:08:14.000000000 +0200
+++ c/a 2005-05-10 04:09:17.972505331 +0200
@@ -0,0 +1 @@
+.
$ diff -purN c b
diff -purN c/a b/a
--- c/a 2005-05-10 04:09:17.972505331 +0200
+++ b/a 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-.
$ cd a
$ patch -p1   # < both patches (c&p)
<snip>
$ ls -l
total 0
-- 
If your dog is barking at the back door and your wife is
yelling at the front door, who do you let in first?
The dog, of course. He'll shut up once you let him in.

Re: [patch 1/6] uml: remove elf.h [ compile-fix, for 2.6.12 ]

[Andrew Morton]

"Bodo Eggert <harvested.in.lkml@posting.7eggert.dyndns.org>" <7eggert@gmx.de> wrote:
>
>  Andrew Morton <akpm@osdl.org> wrote:
> 
>  > hmm, that's exciting.  How to tell diff and patch to remove a zero-length
>  > file?
> 
>  $ md a b c
>  $ touch a/a
>  $ echo .>c/a
>  $ diff -purN a c
>  diff -purN a/a c/a
>  --- a/a 2005-05-10 04:08:14.000000000 +0200
>  +++ c/a 2005-05-10 04:09:17.972505331 +0200
>  @@ -0,0 +1 @@
>  +.
>  $ diff -purN c b
>  diff -purN c/a b/a
>  --- c/a 2005-05-10 04:09:17.972505331 +0200
>  +++ b/a 1970-01-01 01:00:00.000000000 +0100
>  @@ -1 +0,0 @@
>  -.
>  $ cd a
>  $ patch -p1   # < both patches (c&p)
>  <snip>
>  $ ls -l
>  total 0

That's cheating!

[patch 1/6] uml: remove elf.h [ compile-fix, for 2.6.12 ]

[blaisorblade]

Actually remove elf.h in the tree. The previous patch, due to a quilt
bug/misuse, left it in the tree as a 0-length file, preventing the build to
see it as missing and to generate a symlink in its place.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
---

  |    0 
 1 files changed

diff -L include/asm-um/elf.h -puN include/asm-um/elf.h~uml-remove-elf-h /dev/null
_

Re: [patch 1/6] uml: remove elf.h [ compile-fix, for 2.6.12 ]

[Andrew Morton]

blaisorblade@yahoo.it wrote:
>
> 
> Actually remove elf.h in the tree. The previous patch, due to a quilt
> bug/misuse, left it in the tree as a 0-length file, preventing the build to
> see it as missing and to generate a symlink in its place.
> 
> Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
> ---
> 
>   |    0 
>  1 files changed
> 
> diff -L include/asm-um/elf.h -puN include/asm-um/elf.h~uml-remove-elf-h /dev/null

hmm, that's exciting.  How to tell diff and patch to remove a zero-length
file?

bix:/home/akpm> mkdir a b
bix:/home/akpm> touch a/a
bix:/home/akpm> diff -uNr a b
bix:/home/akpm> diff -u a b  
Only in a: a
bix:/home/akpm> diff -ur a b
Only in a: a
bix:/home/akpm> diff -uPr a b
Only in a: a

I'll just ask Linus to delete it ;)

Re: [patch 1/6] uml: remove elf.h [ compile-fix, for 2.6.12 ]

[Blaisorblade]

On Tuesday 10 May 2005 03:34, Andrew Morton wrote:
> blaisorblade@yahoo.it wrote:
> > Actually remove elf.h in the tree. The previous patch, due to a quilt
> > bug/misuse, left it in the tree as a 0-length file, preventing the build
> > to see it as missing and to generate a symlink in its place.

Ok, I was confused by the fact that with patch-scripts, which you use, it 
works, and thought it was patch to make it work.
-- 
Paolo Giarrusso, aka Blaisorblade
Skype user "PaoloGiarrusso"
Linux registered user n. 292729
http://www.user-mode-linux.org/~blaisorblade

Re: [patch 1/6] uml: remove elf.h [ compile-fix, for 2.6.12 ]

[Andrea Arcangeli]

On Mon, May 09, 2005 at 06:34:01PM -0700, Andrew Morton wrote:
> I'll just ask Linus to delete it ;)

make distclean should delete it too. I never worry about zero length
file, they'll be deleted eventually.