[PATCH] glibc 2.9: Remove unnecessary asm/page.h include, not present in recent headers

[PATCH] glibc 2.9: Remove unnecessary asm/page.h include, not present in recent headers

[Jonathan Cameron]

Only applies to arm.  The bug may also exist for alpha.
The include doesn't appear to be necessary anyway.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
First oe patch. Please tell me if I got any of the patch formatting
wrong etc. Lots more to follow ;)

Initial copy seems to have bounced due to my first subscription
attempt going wrong. Sorry Koen if you get this twice.

 recipes/glibc/glibc-2.9/remove_page_header.patch |   10 ++++++++++
 recipes/glibc/glibc_2.9.bb                       |    3 ++-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/recipes/glibc/glibc-2.9/remove_page_header.patch b/recipes/glibc/glibc-2.9/remove_page_header.patch
new file mode 100644
index 0000000..0c446bc
--- /dev/null
+++ b/recipes/glibc/glibc-2.9/remove_page_header.patch
@@ -0,0 +1,10 @@
+--- glibc-2.9-old/ports/sysdeps/unix/sysv/linux/arm/ioperm.c	2009-08-13 17:00:08.000000000 +0100
++++ glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/ioperm.c	2009-08-13 17:01:02.000000000 +0100
+@@ -45,7 +45,6 @@
+ #include <sys/mman.h>
+ 
+ #include <linux/version.h>
+-#include <asm/page.h>
+ #include <sys/sysctl.h>
+ 
+ #define PATH_ARM_SYSTYPE	"/etc/arm_systype"
diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb
index 6e323aa..f3592dc 100644
--- a/recipes/glibc/glibc_2.9.bb
+++ b/recipes/glibc/glibc_2.9.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
@@ -65,6 +65,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
            file://generate-supported.mk \
            file://march-i686.patch;patch=1;pnum=0 \
 	   file://tls_i486.patch;patch=1 \
+	   file://remove_page_header.patch;patch=1 \
            "
 
 
-- 
1.6.3.3

Re: [PATCH] glibc 2.9: Remove unnecessary asm/page.h include, not present in recent headers

[Holger Hans Peter Freyther]

On Monday 17 August 2009 12:00:33 Jonathan Cameron wrote:
> Only applies to arm.  The bug may also exist for alpha.
> The include doesn't appear to be necessary anyway.
>
> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
> ---
> First oe patch. Please tell me if I got any of the patch formatting
> wrong etc. Lots more to follow ;)


In the future we will ask us why is this patch necessary. So to ease answering 
the question the patch itself should include the build error you are seeing, a 
post to a mailinglist or even better a ticket in the glibc bugzilla.

thanks
	z.

Re: [PATCH] glibc 2.9: Remove unnecessary asm/page.h include, not present in recent headers

[Jonathan Cameron]

Holger Hans Peter Freyther wrote:
> On Monday 17 August 2009 12:00:33 Jonathan Cameron wrote:
>> Only applies to arm.  The bug may also exist for alpha.
>> The include doesn't appear to be necessary anyway.
>>
>> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
>> ---
>> First oe patch. Please tell me if I got any of the patch formatting
>> wrong etc. Lots more to follow ;)
> 
> 
> In the future we will ask us why is this patch necessary. 
I'll put more detail in future.

In this particular case though, the patch title gives you most info.
The header doesn't exist so the error message is the somewhat obvious:
../ports/sysdeps/unix/sysv/linux/arm/ioperm.c:48:22: error: asm/page.h: No such file or directory 

So to ease answering 
> the question the patch itself should include the build error you are seeing, a 
> post to a mailinglist or even better a ticket in the glibc bugzilla.

There are reports of related issues with older glibc (2.7)
http://www.mail-archive.com/debian-glibc@lists.debian.org/msg38393.html
http://sourceware.org/ml/crossgcc/2008-05/msg00014.html

Not sure which version this one refers to.
http://sourceware.org/ml/libc-ports/2008-04/msg00005.html
For some reason the problem is still there despite (I think) the last one claiming
a check in to the glibc ports tree well before the 2.9 release.
(not sure if it was a branch or the mainline tree though).

Sorry for the lack of original info, the bug fix seemed so trivial I didn't bother
chasing down other references to it.

Anyhow, just after I sent this out, khem told me (on irc)
that the patch was already there for 2.4.
 
Alternate patch to follow shortly, please ignore original one.

Also the bug no longer exists at the head of the glibc tree.

Thanks,

Jonathan

Re: [PATCH] glibc 2.9: Remove unnecessary asm/page.h include, not present in recent headers

[Holger Hans Peter Freyther]

On Monday 17 August 2009 13:40:39 Jonathan Cameron wrote:
> Holger Hans Peter Freyther wrote:
> > On Monday 17 August 2009 12:00:33 Jonathan Cameron wrote:
> >> Only applies to arm.  The bug may also exist for alpha.
> >> The include doesn't appear to be necessary anyway.
> >>
> >> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
> >> ---
> >> First oe patch. Please tell me if I got any of the patch formatting
> >> wrong etc. Lots more to follow ;)
> >
> > In the future we will ask us why is this patch necessary.
>
> I'll put more detail in future.
>
> In this particular case though, the patch title gives you most info.
> The header doesn't exist so the error message is the somewhat obvious:
> ../ports/sysdeps/unix/sysv/linux/arm/ioperm.c:48:22: error: asm/page.h: No
> such file or directory

Right, one can predict the error message but the places where it will be 
encountered but this has been answered now.

thanks
	z.