rpms/kernel/devel kernel.spec, 1.316, 1.317 linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch, 1.3, 1.4 linux-2.6-x86_64-ia32-vdso-install-unstripped-copies-on-disk.patch, 1.2, NONE linux-2.6-x86_64-vdso-install-unstripped-copies-on-disk.patch, 1.4, NONE

Roland McGrath (roland) fedora-extras-commits at redhat.com
Fri Dec 14 22:10:05 UTC 2007 

Author: roland

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

Modified Files:
	kernel.spec 
	linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch 
Removed Files:
	linux-2.6-x86_64-ia32-vdso-install-unstripped-copies-on-disk.patch 
	linux-2.6-x86_64-vdso-install-unstripped-copies-on-disk.patch 
Log Message:
Clean up vDSO install patches.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- kernel.spec	14 Dec 2007 16:59:17 -0000	1.316
+++ kernel.spec	14 Dec 2007 22:09:24 -0000	1.317
@@ -215,8 +215,7 @@
 %define all_x86 i386 i586 i686
 
 # These arches install vdso/ directories.
-#define vdso_arches %{all_x86} x86_64 ppc ppc64
-%define vdso_arches ppc ppc64
+%define vdso_arches %{all_x86} x86_64 ppc ppc64
 
 # Overrides for generic default options
 
@@ -632,9 +631,7 @@
 Patch693: linux-2.6-ath5k-use-soft-wep.patch
 Patch820: linux-2.6-compile-fixes.patch
 Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
-Patch1103: linux-2.6-i386-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
+Patch1102: linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch
 Patch1400: linux-2.6-smarter-relatime.patch
 Patch1504: linux-2.6-xfs-optimize-away-realtime-tests.patch
 Patch1509: linux-2.6-xfs-setfattr-32bit-compat.patch
@@ -1157,9 +1154,7 @@
 
 # build id related enhancements
 ApplyPatch linux-2.6-default-mmf_dump_elf_headers.patch
-#ApplyPatch linux-2.6-i386-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-i386-vdso-install-unstripped-copies-on-disk.patch
 
 # http://www.lirc.org/
 #ApplyPatch linux-2.6-lirc.patch
@@ -1745,6 +1740,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Fri Dec 14 2007 Roland McGrath <roland at redhat.com>
+- Clean up vDSO install patches.
+
 * Fri Dec 14 2007 David Woodhouse <dwmw2 at redhat.com>
 - Fix OProfile on non-Cell ppc64
 - Fix EHCI on PS3 to allow rebooting

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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch	15 Oct 2007 18:36:21 -0000	1.3
+++ linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch	14 Dec 2007 22:09:24 -0000	1.4
@@ -11,14 +11,14 @@
 Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
 ---
 
- arch/i386/Makefile        |    1 +
- arch/i386/kernel/Makefile |   27 ++++++++++++++++++++++-----
+ arch/x86/Makefile        |    1 +
+ arch/x86/kernel/Makefile_32 |   27 ++++++++++++++++++++++-----
  2 files changed, 23 insertions(+), 5 deletions(-)
 
-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
-@@ -141,9 +141,12 @@ zdisk bzdisk: vmlinux
+diff -puN arch/x86/Makefile_32~i386-vdso-install-unstripped-copies-on-disk arch/x86/Makefile_32
+--- a/arch/x86/Makefile_32~i386-vdso-install-unstripped-copies-on-disk
++++ a/arch/x86/Makefile_32
+@@ -152,9 +152,12 @@ zdisk bzdisk: vmlinux
  fdimage fdimage144 fdimage288 isoimage: vmlinux
  	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) $@
  
@@ -30,39 +30,38 @@
 +	$(Q)$(MAKE) $(build)=arch/x86/kernel vdso_install
 +
  archclean:
+ 	$(Q)rm -rf $(objtree)/arch/i386/boot
  	$(Q)$(MAKE) $(clean)=arch/x86/boot
- 
-diff -puN arch/x86/kernel/Makefile~i386-vdso-install-unstripped-copies-on-disk arch/x86/kernel/Makefile
+
+diff -puN arch/x86/kernel/Makefile_32~i386-vdso-install-unstripped-copies-on-disk arch/x86/kernel/Makefile_32
 --- a/arch/x86/kernel/Makefile_32~i386-vdso-install-unstripped-copies-on-disk
 +++ a/arch/x86/kernel/Makefile_32
-@@ -52,7 +52,8 @@ obj-$(CONFIG_SCx200)		+= scx200_32.o
- # We must build both images before we can assemble it.
+@@ -54,6 +54,8 @@ obj-$(CONFIG_SCx200)		+= scx200_32.o
  # Note: kbuild does not track this dependency due to usage of .incbin
  $(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so
--targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
-+targets += $(foreach F,$(addprefix vsyscall-,int80 sysenter),\
+ targets += $(foreach F,int80 sysenter,vsyscall-$F_32.o vsyscall-$F_32.so)
++targets += $(foreach F,$(patsubst %,vsyscall-%_32,int80 sysenter),\
 +		     $F.o $F.so $F.so.dbg)
  targets += vsyscall-note_32.o vsyscall_32.lds
  
  # The DSO images are built using a special linker script.
-@@ -62,16 +63,32 @@ quiet_cmd_syscall = SYSCALL $@
+@@ -63,16 +65,32 @@ quiet_cmd_syscall = SYSCALL $@
  
- export CPPFLAGS_vsyscall_32.lds += -P -C -U$(ARCH)
+ export CPPFLAGS_vsyscall_32.lds += -P -C -Ui386
  
 -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_32.so	= $(vsyscall-flags)
 -SYSCFLAGS_vsyscall-int80_32.so	= $(vsyscall-flags)
-+SYSCFLAGS_vsyscall-sysenter.so.dbg	= $(vsyscall-flags)
-+SYSCFLAGS_vsyscall-int80.so.dbg		= $(vsyscall-flags)
++SYSCFLAGS_vsyscall-sysenter_32.so.dbg	= $(vsyscall-flags)
++SYSCFLAGS_vsyscall-int80_32.so.dbg	= $(vsyscall-flags)
  
 -$(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so: \
 -$(obj)/vsyscall-%.so: $(src)/vsyscall_32.lds \
--		      $(obj)/vsyscall-%.o $(obj)/vsyscall-note_32.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_32.o FORCE
++$(obj)/vsyscall-int80_32.so.dbg $(obj)/vsyscall-sysenter_32.so.dbg: \
++$(obj)/vsyscall-%.so.dbg: $(src)/vsyscall_32.lds \
+ 		      $(obj)/vsyscall-%.o $(obj)/vsyscall-note_32.o FORCE
  	$(call if_changed,syscall)
  
 +$(obj)/%.so: OBJCOPYFLAGS := -S
@@ -72,7 +71,7 @@
 +vdsos := vdso-int80.so vdso-sysenter.so
 +
 +quiet_cmd_vdso_install = INSTALL $@
-+      cmd_vdso_install = cp $(@:vdso-%.so=$(obj)/vsyscall-%.so.dbg) \
++      cmd_vdso_install = cp $(@:vdso-%.so=$(obj)/vsyscall-%_32.so.dbg) \
 +			    $(MODLIB)/vdso/$@
 +
 +$(vdsos):


--- linux-2.6-x86_64-ia32-vdso-install-unstripped-copies-on-disk.patch DELETED ---


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

More information about the fedora-extras-commits mailing list