rpms/kernel/devel linux-2.6-powerpc-lparmap-g.patch, NONE, 1.1 kernel.spec, 1.73, 1.74 linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch, 1.1, 1.2 linux-2.6-i386-vdso-install-unstripped-copies-on-disk-fix.patch, 1.1, NONE

[Roland McGrath (roland)]

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31600

Modified Files:
	kernel.spec 
	linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch 
Added Files:
	linux-2.6-powerpc-lparmap-g.patch 
Removed Files:
	linux-2.6-i386-vdso-install-unstripped-copies-on-disk-fix.patch 
Log Message:
- fix i386 vdso install patch
- fix ppc64 build breakage from "enable -g for assembly"



linux-2.6-powerpc-lparmap-g.patch:

--- NEW FILE linux-2.6-powerpc-lparmap-g.patch ---
--- linux-2.6/arch/powerpc/kernel/Makefile
+++ linux-2.6/arch/powerpc/kernel/Makefile
@@ -81,6 +81,7 @@ obj-y				+= iomap.o
 endif
 
 ifeq ($(CONFIG_PPC_ISERIES),y)
+CFLAGS_lparmap.o		+= -g0
 extra-y += lparmap.s
 $(obj)/head_64.o:	$(obj)/lparmap.s
 AFLAGS_head_64.o += -I$(obj)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kernel.spec	9 Aug 2007 21:10:37 -0000	1.73
+++ kernel.spec	9 Aug 2007 22:32:09 -0000	1.74
@@ -654,11 +654,11 @@
 Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
 Patch1102: linux-2.6-add-sys-module-name-notes.patch
 Patch1103: linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch
-Patch1104: linux-2.6-i386-vdso-install-unstripped-copies-on-disk-fix.patch
 Patch1105: linux-2.6-powerpc-vdso-install-unstripped-copies-on-disk.patch
 Patch1106: linux-2.6-x86_64-ia32-vdso-install-unstripped-copies-on-disk.patch
 Patch1107: linux-2.6-x86_64-vdso-install-unstripped-copies-on-disk.patch
 Patch1108: linux-2.6-pass-g-to-assembler-under-config_debug_info.patch
+Patch1109: linux-2.6-powerpc-lparmap-g.patch
 Patch1200: linux-2.6-ps3-gelic-wireless.patch
 Patch1210: linux-2.6-ps3-storage-alias.patch
 Patch1220: linux-2.6-ps3-legacy-bootloader-hack.patch
@@ -1151,11 +1151,11 @@
 ApplyPatch linux-2.6-default-mmf_dump_elf_headers.patch
 ApplyPatch linux-2.6-add-sys-module-name-notes.patch
 ApplyPatch linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch
-ApplyPatch linux-2.6-i386-vdso-install-unstripped-copies-on-disk-fix.patch
 ApplyPatch linux-2.6-powerpc-vdso-install-unstripped-copies-on-disk.patch
 ApplyPatch linux-2.6-x86_64-ia32-vdso-install-unstripped-copies-on-disk.patch
 ApplyPatch linux-2.6-x86_64-vdso-install-unstripped-copies-on-disk.patch
-#ApplyPatch linux-2.6-pass-g-to-assembler-under-config_debug_info.patch
+ApplyPatch linux-2.6-pass-g-to-assembler-under-config_debug_info.patch
+ApplyPatch linux-2.6-powerpc-lparmap-g.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1733,8 +1733,9 @@
 
 
 %changelog
-* Thu Aug 09 2007 John W. Linville <linville at redhat.com>
-- undo "enable -g for assembly" due to ppc64 build breakage
+* Thu Aug  9 2007 Roland McGrath <roland at redhat.com>
+- fix i386 vdso install patch
+- fix ppc64 build breakage from "enable -g for assembly"
 
 * Thu Aug 09 2007 Chuck Ebbert <cebbert at redhat.com>
 - update e1000e driver

linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch:

Index: linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch	9 Aug 2007 09:23:39 -0000	1.1
+++ linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch	9 Aug 2007 22:32:09 -0000	1.2
@@ -18,14 +18,20 @@
 diff -puN arch/i386/Makefile~i386-vdso-install-unstripped-copies-on-disk arch/i386/Makefile
 --- a/arch/i386/Makefile~i386-vdso-install-unstripped-copies-on-disk
 +++ a/arch/i386/Makefile
-@@ -143,6 +143,7 @@ fdimage fdimage144 fdimage288 isoimage: 
+@@ -141,9 +141,12 @@ zdisk bzdisk: vmlinux
+ fdimage fdimage144 fdimage288 isoimage: vmlinux
+ 	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) $@
  
- install:
+-install:
++install: vdso_install
  	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install
-+	$(Q)$(MAKE) $(build)=arch/i386/kernel $@
  
++vdso_install:
++	$(Q)$(MAKE) $(build)=arch/i386/kernel vdso_install
++
  archclean:
  	$(Q)$(MAKE) $(clean)=arch/i386/boot
+ 
 diff -puN arch/i386/kernel/Makefile~i386-vdso-install-unstripped-copies-on-disk arch/i386/kernel/Makefile
 --- a/arch/i386/kernel/Makefile~i386-vdso-install-unstripped-copies-on-disk
 +++ a/arch/i386/kernel/Makefile
@@ -46,15 +52,17 @@
 -vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \
 +vsyscall-flags = -shared -Wl,-soname=linux-gate.so.1 \
  		 $(call ld-option, -Wl$(comma)--hash-style=sysv)
- SYSCFLAGS_vsyscall-sysenter.so	= $(vsyscall-flags)
- SYSCFLAGS_vsyscall-int80.so	= $(vsyscall-flags)
+-SYSCFLAGS_vsyscall-sysenter.so	= $(vsyscall-flags)
+-SYSCFLAGS_vsyscall-int80.so	= $(vsyscall-flags)
++SYSCFLAGS_vsyscall-sysenter.so.dbg	= $(vsyscall-flags)
++SYSCFLAGS_vsyscall-int80.so.dbg		= $(vsyscall-flags)
  
 -$(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so: \
 -$(obj)/vsyscall-%.so: $(src)/vsyscall.lds \
 -		      $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE
 +$(obj)/vsyscall-int80.so.dbg $(obj)/vsyscall-sysenter.so.dbg: \
 +$(obj)/vsyscall-%.so.dbg: $(src)/vsyscall.lds \
-+			  $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE
++		      $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE
  	$(call if_changed,syscall)
  
 +$(obj)/%.so: OBJCOPYFLAGS := -S
@@ -71,9 +79,8 @@
 +	@mkdir -p $(MODLIB)/vdso
 +	$(call cmd,vdso_install)
 +
-+install: $(vdsos)
++vdso_install: $(vdsos)
 +
  # We also create a special relocatable object that should mirror the symbol
  # table and layout of the linked DSO.  With ld -R we can then refer to
  # these symbols in the kernel code rather than hand-coded addresses.
-_


--- linux-2.6-i386-vdso-install-unstripped-copies-on-disk-fix.patch DELETED ---