rpms/kernel/F-8 linux-2.6-makefile-after_link.patch, NONE, 1.1 kernel.spec, 1.541, 1.542
Chuck Ebbert
cebbert at fedoraproject.org
Wed Oct 8 22:00:52 UTC 2008
- Previous message (by thread): rpms/pysvn/EL-5 pysvn-1.5.3-remove-rpath.patch, NONE, 1.1 pysvn-1.6.1-drop-version.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pysvn.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/swfdec-gnome/devel swfdec-gnome.spec,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16805
Modified Files:
kernel.spec
Added Files:
linux-2.6-makefile-after_link.patch
Log Message:
Fix build ID fiddling magic. (F9#465873)
linux-2.6-makefile-after_link.patch:
--- NEW FILE linux-2.6-makefile-after_link.patch ---
>From f072f7db2194c8255c003d985b61ad2f97ebbee0 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland at redhat.com>
Date: Mon, 6 Oct 2008 23:03:03 -0700
Subject: [PATCH] kbuild: AFTER_LINK
If the make variable AFTER_LINK is set, it is a command line to run
after each final link. This includes vmlinux itself and vDSO images.
Signed-off-by: Roland McGrath <roland at redhat.com>
---
Makefile | 4 ++++
arch/powerpc/kernel/vdso32/Makefile | 3 ++-
arch/powerpc/kernel/vdso64/Makefile | 3 ++-
arch/x86/vdso/Makefile | 3 ++-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index ce9eceb..b27b1b7 100644
--- a/Makefile
+++ b/Makefile
@@ -679,6 +679,10 @@ quiet_cmd_vmlinux__ ?= LD $@
--start-group $(vmlinux-main) --end-group \
$(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o FORCE ,$^)
+ifdef AFTER_LINK
+cmd_vmlinux__ += ; $(AFTER_LINK)
+endif
+
# Generate new vmlinux version
quiet_cmd_vmlinux_version = GEN .version
cmd_vmlinux_version = set -e; \
diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile
index c3d57bd..c9519c5 100644
--- a/arch/powerpc/kernel/vdso32/Makefile
+++ b/arch/powerpc/kernel/vdso32/Makefile
@@ -40,7 +40,8 @@ $(obj-vdso32): %.o: %.S
# actual build commands
quiet_cmd_vdso32ld = VDSO32L $@
- cmd_vdso32ld = $(CROSS32CC) $(c_flags) -Wl,-T $^ -o $@
+ cmd_vdso32ld = $(CROSS32CC) $(c_flags) -Wl,-T $^ -o $@ \
+ $(if $(AFTER_LINK),; $(AFTER_LINK))
quiet_cmd_vdso32as = VDSO32A $@
cmd_vdso32as = $(CROSS32CC) $(a_flags) -c -o $@ $<
diff --git a/arch/powerpc/kernel/vdso64/Makefile b/arch/powerpc/kernel/vdso64/Makefile
index fa7f1b8..712fe1d 100644
--- a/arch/powerpc/kernel/vdso64/Makefile
+++ b/arch/powerpc/kernel/vdso64/Makefile
@@ -34,7 +34,8 @@ $(obj-vdso64): %.o: %.S
# actual build commands
quiet_cmd_vdso64ld = VDSO64L $@
- cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@
+ cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ \
+ $(if $(AFTER_LINK),; $(AFTER_LINK))
quiet_cmd_vdso64as = VDSO64A $@
cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
index 4d6ef0a..5203ae9 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@@ -120,7 +120,8 @@ $(obj)/vdso32-syms.lds: $(vdso32.so-y:%=$(obj)/vdso32-%-syms.lds) FORCE
quiet_cmd_vdso = VDSO $@
cmd_vdso = $(CC) -nostdlib -o $@ \
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
- -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
+ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) \
+ $(if $(AFTER_LINK),; $(AFTER_LINK))
VDSO_LDFLAGS = -fPIC -shared $(call ld-option, -Wl$(comma)--hash-style=sysv)
--
1.5.5.1
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -r1.541 -r1.542
--- kernel.spec 6 Oct 2008 15:25:35 -0000 1.541
+++ kernel.spec 8 Oct 2008 22:00:21 -0000 1.542
@@ -559,6 +559,12 @@
# -stable RC
#Patch02: patch-2.6.26.4-rc1
+# build tweak for build ID magic, even for -vanilla
+Patch05: linux-2.6-makefile-after_link.patch
+
+# we always need nonintconfig, even for -vanilla kernels
+Patch06: linux-2.6-build-nonintconfig.patch
+
# we also need compile fixes for -vanilla
Patch07: linux-2.6-compile-fixes.patch
Patch08: linux-2.6-compile-fix-gcc-43.patch
@@ -609,7 +615,6 @@
Patch147: linux-2.6-imac-transparent-bridge.patch
Patch148: linux-2.6-powerpc-zImage-32MiB.patch
-Patch150: linux-2.6-build-nonintconfig.patch
Patch160: linux-2.6-execshield.patch
Patch170: linux-2.6-modsign-mpilib.patch
Patch180: linux-2.6-modsign-crypto.patch
@@ -992,6 +997,8 @@
# builds (as used in the buildsystem).
ApplyPatch linux-2.6-build-nonintconfig.patch
+ApplyPatch linux-2.6-makefile-after_link.patch
+
#
# misc small stuff to make things compile
#
@@ -1877,6 +1884,10 @@
%changelog
+* Wed Oct 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-32
+- Fix build ID fiddling magic. (F9#465873)
+- Move build-nonintconfig patch so it gets included in -vanilla.
+
* Mon Oct 06 2008 John W. Linville <linville at redhat.com> 2.6.26.5-31
- Re-revert at76_usb to version from before attempted mac80211 port
- Previous message (by thread): rpms/pysvn/EL-5 pysvn-1.5.3-remove-rpath.patch, NONE, 1.1 pysvn-1.6.1-drop-version.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pysvn.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/swfdec-gnome/devel swfdec-gnome.spec,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list