From: Andrew Morton <akpm@osdl.org>
To: git@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Linus Torvalds <torvalds@osdl.org>,
"Paolo 'Blaisorblade' Giarrusso" <blaisorblade@yahoo.it>
Subject: Re: [PATCH] uml: remove elf.h
Date: Tue, 17 May 2005 14:21:13 -0700 [thread overview]
Message-ID: <20050517142113.59097a3d.akpm@osdl.org> (raw)
In-Reply-To: <200505171704.j4HH4Ne8002532@hera.kernel.org>
Linux Kernel Mailing List <linux-kernel@vger.kernel.org> wrote:
>
> tree a3d85d9f43f64bbd8437c973caf98f79d95b5f3e
> parent a123edab03ac39e08c2f9cb4fc1af07e099c68bc
> author Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Tue, 17 May 2005 11:53:14 -0700
> committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 17 May 2005 21:59:11 -0700
>
> [PATCH] uml: remove elf.h
>
> 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>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
>
> asm-um/elf.h | 0
> 1 files changed
>
> Index: include/asm-um/elf.h
Hot damn, this zero-length file is hard to get rid of. I pulled Linus's
tree this morning with this bizarre concoction:
cd $GIT_TREE
cg-pull origin
tagsha1=$(cat .git/refs/tags/v$(kversion))
t=$(cat-file tag $tagsha1 | head -n 1 | sed -e 's/object //')
cg-diff -r $t -r $(cat .git/refs/heads/origin) > $PULL/linus.patch
and the resulting diff has:
Index: include/asm-ia64/ioctl32.h
===================================================================
--- eed337ef5e9ae7d62caa84b7974a11fddc7f06e0/include/asm-ia64/ioctl32.h (mode:100644 sha1:d0d227f45e05d23705ac849f4bd5c06a28288b58)
+++ 6bb5a1cf91bbda8308ec7e6d900cb89071907dcd/include/asm-ia64/ioctl32.h (mode:100644 sha1:e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
@@ -1 +0,0 @@
-#include <linux/ioctl32.h>
Index: include/asm-um/elf.h
===================================================================
Index: include/asm-x86_64/apicdef.h
===================================================================
which of course doesn't remove that file at all.
And I bet that when Linus releases patch-2.6.12-rc5.gz and patch-2.6.12.gz,
they will have the same construct. AFAICT, the patch-based people will
need to download a full new tarball to get rid of this dang file.
It all wouldn't really matter much, except apparently the mere presence of
this file breaks the UML build.
Frazzle. Paolo, I'm almost wondering if we should change that test to also
check for a zero-length file.
next parent reply other threads:[~2005-05-17 21:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200505171704.j4HH4Ne8002532@hera.kernel.org>
2005-05-17 21:21 ` Andrew Morton [this message]
2005-05-17 21:34 ` [PATCH] uml: remove elf.h Petr Baudis
2005-05-17 21:44 ` Linus Torvalds
2005-05-17 21:42 ` Linus Torvalds
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=20050517142113.59097a3d.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=blaisorblade@yahoo.it \
--cc=git@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/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