rpms/kernel/devel kernel.spec, 1.64, 1.65 linux-2.6-powerpc-vdso-install-unstripped-copies-on-disk.patch, 1.1, 1.2 linux-2.6-x86_64-ia32-vdso-install-unstripped-copies-on-disk.patch, 1.1, 1.2 linux-2.6-x86_64-vdso-install-unstripped-copies-on-disk.patch, 1.1, 1.2

Roland McGrath (roland) fedora-extras-commits at redhat.com
Thu Aug 9 11:57:50 UTC 2007


Author: roland

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

Modified Files:
	kernel.spec 
	linux-2.6-powerpc-vdso-install-unstripped-copies-on-disk.patch 
	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:
spec/makefile fixes for vdso install


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kernel.spec	9 Aug 2007 11:27:26 -0000	1.64
+++ kernel.spec	9 Aug 2007 11:57:17 -0000	1.65
@@ -1283,10 +1283,7 @@
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
     make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer
 %ifarch %{vdso_arches}
-    for subdir in %{vdso_subdir}; do
-      make -s ARCH=$Arch -f scripts/Makefile.build obj=arch/$Arch/$subdir \
-      	   install INSTALL_MOD_PATH=$RPM_BUILD_ROOT KERNELRELEASE=$KernelVer
-    done
+    make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer
 %endif
 
     # And save the headers/makefiles etc for building modules against

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

Index: linux-2.6-powerpc-vdso-install-unstripped-copies-on-disk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-powerpc-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-powerpc-vdso-install-unstripped-copies-on-disk.patch	9 Aug 2007 09:23:39 -0000	1.1
+++ linux-2.6-powerpc-vdso-install-unstripped-copies-on-disk.patch	9 Aug 2007 11:57:17 -0000	1.2
@@ -20,22 +20,23 @@
 diff -puN arch/powerpc/Makefile~powerpc-vdso-install-unstripped-copies-on-disk arch/powerpc/Makefile
 --- a/arch/powerpc/Makefile~powerpc-vdso-install-unstripped-copies-on-disk
 +++ a/arch/powerpc/Makefile
-@@ -168,6 +168,10 @@ endef
+@@ -166,9 +166,15 @@ define archhelp
+   @echo '  *_defconfig     - Select default config from arch/$(ARCH)/configs'
+ endef
  
- install:
+-install:
++install: vdso_install
  	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install
+ 
++vdso_install:
 +ifeq ($(CONFIG_PPC64),y)
-+	$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 install
++	$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@
 +endif
-+	$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 install
- 
++	$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@
++
  archclean:
  	$(Q)$(MAKE) $(clean)=$(boot)
-@@ -217,4 +221,3 @@ checkbin:
- 	fi
- 
- CLEAN_FILES += $(TOUT)
--
+
 diff -puN arch/powerpc/kernel/vdso32/Makefile~powerpc-vdso-install-unstripped-copies-on-disk arch/powerpc/kernel/vdso32/Makefile
 --- a/arch/powerpc/kernel/vdso32/Makefile~powerpc-vdso-install-unstripped-copies-on-disk
 +++ a/arch/powerpc/kernel/vdso32/Makefile
@@ -81,7 +82,7 @@
 +	@mkdir -p $(MODLIB)/vdso
 +	$(call cmd,vdso_install)
 +
-+install: vdso32.so
++vdso_install: vdso32.so
 diff -puN arch/powerpc/kernel/vdso64/Makefile~powerpc-vdso-install-unstripped-copies-on-disk arch/powerpc/kernel/vdso64/Makefile
 --- a/arch/powerpc/kernel/vdso64/Makefile~powerpc-vdso-install-unstripped-copies-on-disk
 +++ a/arch/powerpc/kernel/vdso64/Makefile
@@ -126,5 +127,4 @@
 +	@mkdir -p $(MODLIB)/vdso
 +	$(call cmd,vdso_install)
  
-+install: vdso64.so
-_
++vdso_install: vdso64.so

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

Index: linux-2.6-x86_64-ia32-vdso-install-unstripped-copies-on-disk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86_64-ia32-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-x86_64-ia32-vdso-install-unstripped-copies-on-disk.patch	9 Aug 2007 09:23:39 -0000	1.1
+++ linux-2.6-x86_64-ia32-vdso-install-unstripped-copies-on-disk.patch	9 Aug 2007 11:57:17 -0000	1.2
@@ -18,16 +18,22 @@
 diff -puN arch/x86_64/Makefile~x86_64-ia32-vdso-install-unstripped-copies-on-disk arch/x86_64/Makefile
 --- a/arch/x86_64/Makefile~x86_64-ia32-vdso-install-unstripped-copies-on-disk
 +++ a/arch/x86_64/Makefile
-@@ -107,6 +107,9 @@ fdimage fdimage144 fdimage288 isoimage: 
+@@ -105,9 +105,14 @@ bzdisk: vmlinux
+ fdimage fdimage144 fdimage288 isoimage: vmlinux
+ 	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@
  
- install:
+-install:
++install: vdso_install
  	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ 
+ 
++vdso_install:
 +ifeq ($(CONFIG_IA32_EMULATION),y)
 +	$(Q)$(MAKE) $(build)=arch/x86_64/ia32 $@
 +endif
- 
++
  archclean:
  	$(Q)$(MAKE) $(clean)=$(boot)
+
 diff -puN arch/x86_64/ia32/Makefile~x86_64-ia32-vdso-install-unstripped-copies-on-disk arch/x86_64/ia32/Makefile
 --- a/arch/x86_64/ia32/Makefile~x86_64-ia32-vdso-install-unstripped-copies-on-disk
 +++ a/arch/x86_64/ia32/Makefile
@@ -70,5 +76,5 @@
 +	@mkdir -p $(MODLIB)/vdso
 +	$(call cmd,vdso_install)
 +
-+install: $(vdsos)
-_
++vdso_install: $(vdsos)
+

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

Index: linux-2.6-x86_64-vdso-install-unstripped-copies-on-disk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86_64-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-x86_64-vdso-install-unstripped-copies-on-disk.patch	9 Aug 2007 11:27:26 -0000	1.1
+++ linux-2.6-x86_64-vdso-install-unstripped-copies-on-disk.patch	9 Aug 2007 11:57:17 -0000	1.2
@@ -13,14 +13,15 @@
 index 93fc1f2..c0905ae 100644
 --- a/arch/x86_64/Makefile
 +++ b/arch/x86_64/Makefile
-@@ -107,6 +107,7 @@ fdimage fdimage144 fdimage288 isoimage: vmlinux
- 
- install:
- 	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ 
-+	$(Q)$(MAKE) $(build)=arch/x86_64/vdso $@
+@@ -112,6 +112,7 @@ vdso_install:
  ifeq ($(CONFIG_IA32_EMULATION),y)
  	$(Q)$(MAKE) $(build)=arch/x86_64/ia32 $@
  endif
++	$(Q)$(MAKE) $(build)=arch/x86_64/vdso $@
+ 
+ archclean:
+ 	$(Q)$(MAKE) $(clean)=$(boot)
+
 diff --git a/arch/x86_64/vdso/Makefile b/arch/x86_64/vdso/Makefile
 index faaa72f..20ecf05 100644
 --- a/arch/x86_64/vdso/Makefile
@@ -67,4 +68,4 @@
 +	@mkdir -p $(MODLIB)/vdso
 +	$(call cmd,vdso_install)
 +
-+install: vdso.so
++vdso_install: vdso.so




More information about the fedora-extras-commits mailing list