On 05/11/2007 01:51 PM, David Woodhouse wrote:
On Fri, 2007-05-11 at 13:24 +0200, Oliver Falk wrote:
Please find attached my current cvs diff. The Makefile.config part
should be fixed better - I know, but had no time yet...
echo 'diff -up' >> ~/.cvsrc
I have no idea where you're putting those ifarches.
Sure. Sorry.
New diff attached.
-of
? kernel-2.6.21-alpha.config.new
? linux-2.6-no_fec_for_alpha.patch
? configs/ALPHA
? configs/config-alpha
Index: Makefile.config
===================================================================
RCS file: /cvs/dist/devel/kernel/Makefile.config,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile.config
--- Makefile.config 7 Mar 2007 07:25:46 -0000 1.53
+++ Makefile.config 11 May 2007 11:56:31 -0000
@@ -14,9 +14,10 @@ CONFIGFILES = \
$(CFG)-ppc.config $(CFG)-ppc-smp.config \
$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \
- $(CFG)-ia64-xen.config
+ $(CFG)-ia64-xen.config \
+ $(CFG)-alpha.config
-PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
+PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 alpha # sparc sparc64
TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
configs: $(CONFIGFILES)
@@ -67,6 +68,9 @@ temp-s390-generic: configs/config-s390-g
temp-ia64-generic: configs/config-ia64-generic temp-generic
perl merge.pl $^ > $@
+#temp-alpha-generic: configs/config-alpha-generic temp-generic
+# perl merge.pl $^ > $@
+
temp-x86-xen-generic-tmp: configs/config-xen-generic temp-x86-generic
perl merge.pl $^ > $@
@@ -82,6 +86,9 @@ temp-x86_64-xen-generic: configs/config-
temp-ia64-xen-generic: configs/config-xen-generic temp-ia64-generic
perl merge.pl $^ > $@
+#temp-alpha-xen-generic: configs/config-xen-generic temp-alpha-generic
+# perl merge.pl $^ > $@
+
kernel-$(VERSION)-i686.config: configs/config-i686 temp-x86-generic
perl merge.pl $^ i386 > $@
@@ -142,6 +149,12 @@ kernel-$(VERSION)-ppc-smp.config: config
kernel-$(VERSION)-ia64.config: configs/config-ia64 temp-ia64-generic
perl merge.pl $^ ia64 > $@
+#kernel-$(VERSION)-alpha.config: configs/config-alpha-generic temp-alpha-generic
+# perl merge.pl $^ alpha > $@
+
+kernel-$(VERSION)-alpha.config: configs/config-alpha
+ cat $^ > $@
+
kernel-$(VERSION)-i686-xen.config: configs/config-i686-PAE temp-x86-xen-generic
perl merge.pl $^ i386 > $@
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/devel/kernel/kernel-2.6.spec,v
retrieving revision 1.3125
diff -u -p -r1.3125 kernel-2.6.spec
--- kernel-2.6.spec 1 May 2007 21:53:26 -0000 1.3125
+++ kernel-2.6.spec 11 May 2007 11:56:34 -0000
@@ -166,6 +166,16 @@ Summary: The Linux kernel (the core of t
%define usesparse 0
%endif
+%ifarch alpha alphaev5 alphaev56 alphaev6 alphaev67
+%define with_smp 0
+%define with_pae 0
+%define with_xen 0
+%define with_kdump 0
+%define with_debug 0
+%define usesparse 0
+%define with_modsign 0
+%endif
+
# Per-arch tweaks
%ifarch %{all_x86}
@@ -237,6 +247,13 @@ Summary: The Linux kernel (the core of t
%define xen_image vmlinux.gz
%endif
+%ifarch alpha alphaev6 alphaev67
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-alpha*.config
+%define image_install_path boot
+%define make_target boot
+%define kernel_image vmlinux
+%endif
+
# To temporarily exclude an architecture from being built, add it to
# %nobuildarches. Do _NOT_ use the ExclusiveArch: line, because if we
# don't build kernel-headers then the new build system will no longer let
@@ -289,13 +306,13 @@ Name: kernel
Group: System Environment/Kernel
License: GPLv2
Version: %{rpmversion}
-Release: %{release}
+Release: %{release}axp
%if 0%{?olpc}
ExclusiveArch: i386 i586
%else
# DO NOT CHANGE THIS LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
# SET %nobuildarches (ABOVE) INSTEAD
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x alpha alphaev6 alphaev67
%endif
ExclusiveOS: Linux
Provides: kernel-drm = 4.3.0
@@ -363,6 +380,9 @@ Source39: kernel-%{kversion}-ia64-xen.co
#Source67: kernel-%{kversion}-sparc64.config
#Source68: kernel-%{kversion}-sparc64-smp.config
+Source50: kernel-%{kversion}-alpha.config
+Source50: kernel-%{kversion}-alpha-smp.config
+
Source80: config-rhel-generic
Source81: config-rhel-x86-generic
Source82: config-olpc-generic
@@ -456,6 +476,9 @@ Patch378: linux-2.6-ps3-sysbus-modalias.
# 600 - 699 sparc(64)
+# 700 - 799 alpha
+Patch701: linux-2.6-no_fec_for_alpha.patch
+
#
# Patches 800 through 899 are reserved for bugfixes to the core system
# and patches related to how RPMs are build
@@ -1009,7 +1032,9 @@ cd linux-%{kversion}.%{_target_cpu}
# Patches 10 through 100 are meant for core subsystem upgrades
# Roland's utrace ptrace replacement.
+%ifnarch alpha alphaev5 alphaev56 alphaev6 alphaev67
%patch10 -p1
+%endif
%patch11 -p1
# Power management fixes
@@ -1118,7 +1143,9 @@ cd linux-%{kversion}.%{_target_cpu}
%patch800 -p1
# Exec shield
+%ifnarch alpha alphaev5 alphaev56 alphaev6 alphaev6
%patch810 -p1
+%endif
#
# GPG signed kernel modules
@@ -1193,7 +1220,9 @@ mv drivers/xen/blktap/blktap.c drivers/x
%patch1018 -p1
%patch1019 -p1
%patch1020 -p1
+%ifnarch alpha alphaev5 alphaev56 alphaev6 alphaev6
%patch1021 -p1
+%endif
%patch1022 -p1
%if %{includexen}
%patch1023 -p1
@@ -1210,7 +1239,9 @@ mv drivers/xen/blktap/blktap.c drivers/x
#
# /dev/crash driver for the crashdump analysis tool
#
+%ifnarch alpha alphaev5 alphaev56 alphaev6 alphaev67
%patch1060 -p1
+%endif
%if %{includexen}
%patch1061 -p1
%endif
@@ -1282,7 +1313,9 @@ mv drivers/xen/blktap/blktap.c drivers/x
# DVB spinlock bug
%patch1700 -p1
# setuid /proc/self/maps fix.
+%ifnarch alpha alphaev5 alphaev56 alphaev6 alphaev67
%patch1720 -p1
+%endif
# Add a safety net to softlockup so that it doesn't prevent installs.
%patch1740 -p1
# Speed up spinlock debug.
@@ -1360,7 +1393,9 @@ mv drivers/xen/blktap/blktap.c drivers/x
#
# Pull in the new firewire stack
+%ifnarch alpha alphaev5 alphaev56 alphaev6 alphaev67
%patch5000 -p1
+%endif
#
# final stuff
@@ -1374,6 +1409,9 @@ mv drivers/xen/blktap/blktap.c drivers/x
%patch10002 -p1
%patch10003 -p1
+# alpha related, but must be done at the end...
+%patch701 -p0
+
# END OF PATCH APPLICATIONS
cp %{SOURCE10} Documentation/
@@ -2340,6 +2378,9 @@ fi
# - tux.
%changelog
+* Thu May 03 2007 Oliver Falk <oliver@xxxxxxxxxxxxxxx>
+- Build on alpha - testing only
+
* Tue May 01 2007 Dave Jones <davej@xxxxxxxxxx>
- Update sparse to 0.3 and reenable.
--
fedora-devel-list mailing list
fedora-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-devel-list
