rpms/kernel/devel linux-2.6-header-install-git.patch,1.3,1.4

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Apr 27 01:42:53 UTC 2006


Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6605

Modified Files:
	linux-2.6-header-install-git.patch 
Log Message:
this should fix glibc on most arches... hopefully

linux-2.6-header-install-git.patch:
 Makefile                              |   17 ++++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 ++
 include/asm-arm/Kbuild                |    7 +
 include/asm-arm26/Kbuild              |    8 ++
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 +++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    7 +
 include/asm-m68k/Kbuild               |   17 ++++
 include/asm-m68knommu/Kbuild          |   12 +++
 include/asm-mips/Kbuild               |   15 ++++
 include/asm-parisc/Kbuild             |    8 ++
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 ++
 include/asm-s390/Kbuild               |    4 +
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 +++
 include/asm-sparc64/Kbuild            |   16 ++++
 include/asm-um/Kbuild                 |   14 +++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   11 +++
 include/linux/Kbuild                  |   63 +++++++++++++++++
 include/linux/byteorder/Kbuild        |    1 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 +++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 +
 include/linux/netfilter_ipv4/Kbuild   |   21 +++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/media/Kbuild                  |    2 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  124 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 ++
 50 files changed, 500 insertions(+)

Index: linux-2.6-header-install-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-install-git.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-header-install-git.patch	26 Apr 2006 23:46:20 -0000	1.3
+++ linux-2.6-header-install-git.patch	27 Apr 2006 01:42:49 -0000	1.4
@@ -106,11 +106,11 @@
 +	timex.h unistd.h user.h
 diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
 new file mode 100644
-index 0000000..fb44933
+index 0000000..2558ee8
 --- /dev/null
 +++ b/include/asm-generic/Kbuild
 @@ -0,0 +1,3 @@
-+header-y += errno-base.h errno.h fcntl.h ipc.h mman.h signal.h	\
++header-y += errno-base.h errno.h fcntl.h ioctl.h ipc.h mman.h signal.h	\
 +	statfs.h
 +unifdef-y := resource.h siginfo.h
 diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
@@ -155,13 +155,14 @@
 +unifdef-y += mtrr.h vm86.h
 diff --git a/include/asm-ia64/Kbuild b/include/asm-ia64/Kbuild
 new file mode 100644
-index 0000000..178f555
+index 0000000..070c2e6
 --- /dev/null
 +++ b/include/asm-ia64/Kbuild
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,7 @@
 +include include/asm-generic/Kbuild.asm
 +
-+header-y += break.h fpu.h fwspa.h ia64regs.h kprobes.h perfmon_default_smpl.h \
++header-y += break.h fpu.h fwspa.h gcc_intrin.h ia64regs.h		\
++	 intel_intrin.h kprobes.h intrinsics.h perfmon_default_smpl.h	\
 +	 ptrace_offsets.h rse.h setup.h ucontext.h
 +
 +unifdef-y += perfmon.h
@@ -339,14 +340,15 @@
 +	vac-ops.h vaddrs.h vfc_ioctls.h viking.h winmacro.h
 diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild
 new file mode 100644
-index 0000000..9b1c48c
+index 0000000..225df8a
 --- /dev/null
 +++ b/include/asm-sparc64/Kbuild
-@@ -0,0 +1,15 @@
+@@ -0,0 +1,16 @@
 +include include/asm-generic/Kbuild.asm
 +
 +ALTARCH := sparc
-+ARCHDEF := __arch64__ 
++ARCHDEF := defined __sparc__ && defined __arch64__ 
++ALTARCHDEF := defined __sparc__ && !defined __arch64__
 +
 +header-y += agp.h apb.h asi.h auxio.h bbc.h bpp.h bsderrno.h \
 +	chafsr.h chmctrl.h compat.h const.h cpudata.h dcr.h dcu.h \
@@ -396,14 +398,15 @@
 +	v850e_uartb.h v850e_utils.h
 diff --git a/include/asm-x86_64/Kbuild b/include/asm-x86_64/Kbuild
 new file mode 100644
-index 0000000..b8d8251
+index 0000000..ed24e73
 --- /dev/null
 +++ b/include/asm-x86_64/Kbuild
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,11 @@
 +include include/asm-generic/Kbuild.asm
 +
 +ALTARCH := i386
-+ARCHDEF := __x86_64__
++ARCHDEF := defined __x86_64__
++ALTARCHDEF := defined __i386__
 +
 +header-y += boot.h bootsetup.h cpufeature.h debugreg.h kprobes.h ldt.h \
 +	 msr.h prctl.h setup.h sigcontext32.h ucontext.h user32.h \
@@ -665,10 +668,10 @@
 +unifdef-y := sisfb.h
 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
 new file mode 100644
-index 0000000..265d1ea
+index 0000000..ecb78b0
 --- /dev/null
 +++ b/scripts/Makefile.headersinst
-@@ -0,0 +1,116 @@
+@@ -0,0 +1,124 @@
 +# ==========================================================================
 +# Installing headers
 +# ==========================================================================
@@ -718,6 +721,7 @@
 +
 +export ALTARCH
 +export ARCHDEF
++export ALTARCHDEF
 +
 +quiet_cmd_headers_install = INSTALL $(_dst)/$@
 +      cmd_headers_install = cp $(srctree)/$(obj)/$@ $(INSTALL_HDR_PATH)/$(_dst)
@@ -732,20 +736,27 @@
 +      cmd_mkdir		  = mkdir -p $(INSTALL_HDR_PATH)/$@
 +
 +quiet_cmd_gen		  = GEN $(_dst)/$@
-+      cmd_gen		  = ( echo "/* File autogenerated by 'make headers_install' */"	;			\
-+      			    echo "\#ifdef $(ARCHDEF)" ;								\
++      cmd_gen		  = STUBDEF=__ASM_STUB_`echo $@ | tr a-z. A-Z_` ;					\
++      			    ( echo "/* File autogenerated by 'make headers_install' */"	;			\
++      			    echo "\#ifndef $$STUBDEF" ;								\
++      			    echo "\#define $$STUBDEF" ;								\
++      			    echo "\# if $(ARCHDEF)" ;								\
 +			    if [ -r $(srctree)/include/$(archasm)/$@ ]; then					\
-+      			       echo "\#include <$(archasm)/$@>" ;						\
++      			       echo "\#  include <$(archasm)/$@>" ;						\
 +			    else										\
-+      			       echo "\#error $(archasm)/$@ does not exist in the $(ARCH) architecture" ;	\
++      			       echo "\#  error $(archasm)/$@ does not exist in the $(ARCH) architecture" ;	\
 +			    fi ;										\
-+      			    echo "\#else" ;									\
++      			    echo "\# elif $(ALTARCHDEF)" ;							\
 +			    if [ -r $(srctree)/include/$(altarchasm)/$@ ]; then					\
-+      			       echo "\#include <$(altarchasm)/$@>" ;						\
++      			       echo "\#  include <$(altarchasm)/$@>" ;						\
 +			    else										\
-+      			       echo "\#error $(altarchasm)/$@ does not exist in the $(ALTARCH) architecture" ;	\
++      			       echo "\#  error $(altarchasm)/$@ does not exist in the $(ALTARCH) architecture" ;	\
 +			    fi ;										\
-+      			    echo "\#endif" ) > $(INSTALL_HDR_PATH)/$(_dst)/$@
++      			    echo "\# else" ;									\
++			    echo "\#  warning This machine appears to be neither $(ARCH) nor $(ALTARCH)." ;	\
++      			    echo "\# endif" ;									\
++      			    echo "\#endif /* $$STUBDEF */" ;							\
++			    	 ) > $(INSTALL_HDR_PATH)/$(_dst)/$@
 +
 +__headersinst: $(subdir-y) $(header-y) $(unifdef-y) $(altarch-y)
 +




More information about the fedora-cvs-commits mailing list