patches/glibc/2.7/280-sh-fix-kernel-headers-location.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
parent 962 2ba4393e0441
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com>
yann@962
     1
diff -durN glibc-2.7.orig/sysdeps/unix/sysv/linux/sh/sys/procfs.h glibc-2.7/sysdeps/unix/sysv/linux/sh/sys/procfs.h
yann@962
     2
--- glibc-2.7.orig/sysdeps/unix/sysv/linux/sh/sys/procfs.h	2008-10-22 21:23:32.000000000 +0200
yann@962
     3
+++ glibc-2.7/sysdeps/unix/sysv/linux/sh/sys/procfs.h	2008-10-22 21:41:54.000000000 +0200
yann@962
     4
@@ -29,6 +29,7 @@
yann@962
     5
 #include <sys/types.h>
yann@962
     6
 #include <sys/ucontext.h>
yann@962
     7
 #include <sys/user.h>
yann@962
     8
+#include <asm/ptrace.h>
yann@962
     9
 
yann@962
    10
 __BEGIN_DECLS
yann@962
    11
 
yann@962
    12
diff -durN glibc-2.7.orig/sysdeps/unix/sysv/linux/sh/sys/user.h glibc-2.7/sysdeps/unix/sysv/linux/sh/sys/user.h
yann@962
    13
--- glibc-2.7.orig/sysdeps/unix/sysv/linux/sh/sys/user.h	2008-10-22 21:23:32.000000000 +0200
yann@962
    14
+++ glibc-2.7/sysdeps/unix/sysv/linux/sh/sys/user.h	2008-10-22 21:33:34.000000000 +0200
yann@962
    15
@@ -21,8 +21,6 @@
yann@962
    16
 
yann@962
    17
 #include <features.h>
yann@962
    18
 
yann@962
    19
-#include <asm/user.h>
yann@962
    20
-
yann@962
    21
 #undef start_thread
yann@962
    22
 
yann@962
    23
 #endif  /* sys/user.h */