rpms/kernel/devel Makefile.config, 1.36, 1.37 kernel-2.6.spec, 1.2123, 1.2124

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Apr 10 19:14:09 UTC 2006 

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7756

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
Bye kernel-i686-smp
Hello kernel-PAE




Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile.config	7 Mar 2006 19:38:26 -0000	1.36
+++ Makefile.config	10 Apr 2006 19:14:06 -0000	1.37
@@ -5,7 +5,7 @@
 CFG		= kernel-$(VERSION)
 
 CONFIGFILES	= \
-	$(CFG)-i686.config $(CFG)-i686-smp.config $(CFG)-i686-kdump.config \
+	$(CFG)-i686.config $(CFG)-i686-PAE.config $(CFG)-i686-kdump.config \
 	$(CFG)-i586.config \
 	$(CFG)-x86_64.config $(CFG)-x86_64-kdump.config \
 	$(CFG)-ppc64iseries.config \
@@ -69,34 +69,34 @@
 temp-x86_64-xen-generic: configs/config-xen-x86_64 temp-x86_64-xen-generic-tmp
 	perl scripts/merge.pl $^ > $@
 
-kernel-$(VERSION)-i686.config: configs/config-i686 temp-x86-generic 
+kernel-$(VERSION)-i686.config: configs/config-i686 temp-x86-generic
 	perl scripts/merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i686-smp.config: configs/config-i686-smp temp-x86-generic 
+kernel-$(VERSION)-i686-PAE.config: configs/config-i686-PAE temp-x86-generic
 	perl scripts/merge.pl $^ i386 > $@
 
 kernel-$(VERSION)-i686-kdump.config: configs/config-i686-kdump temp-x86-generic
 	perl scripts/merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i586.config: configs/config-i586 temp-x86-generic 
+kernel-$(VERSION)-i586.config: configs/config-i586 temp-x86-generic
 	perl scripts/merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-x86_64.config: configs/config-x86_64 temp-x86_64-generic 
+kernel-$(VERSION)-x86_64.config: configs/config-x86_64 temp-x86_64-generic
 	perl scripts/merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-x86_64-kdump.config: configs/config-x86_64-kdump temp-x86_64-generic 
+kernel-$(VERSION)-x86_64-kdump.config: configs/config-x86_64-kdump temp-x86_64-generic
 	perl scripts/merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-sparc-smp.config: configs/config-sparc-smp temp-sparc-generic 
+kernel-$(VERSION)-sparc-smp.config: configs/config-sparc-smp temp-sparc-generic
 	perl scripts/merge.pl $^ sparc > $@
 
-kernel-$(VERSION)-sparc.config: configs/config-sparc temp-sparc-generic 
+kernel-$(VERSION)-sparc.config: configs/config-sparc temp-sparc-generic
 	perl scripts/merge.pl $^ sparc > $@
 
-kernel-$(VERSION)-sparc64-smp.config: configs/config-sparc64-smp temp-sparc64-generic 
+kernel-$(VERSION)-sparc64-smp.config: configs/config-sparc64-smp temp-sparc64-generic
 	perl scripts/merge.pl $^ sparc64 > $@
 
-kernel-$(VERSION)-sparc64.config: configs/config-sparc64 temp-sparc-generic 
+kernel-$(VERSION)-sparc64.config: configs/config-sparc64 temp-sparc-generic
 	perl scripts/merge.pl $^ sparc64 > $@
 
 kernel-$(VERSION)-ppc64.config: configs/config-powerpc64 temp-powerpc64-generic


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2123
retrieving revision 1.2124
diff -u -r1.2123 -r1.2124
--- kernel-2.6.spec	10 Apr 2006 18:41:27 -0000	1.2123
+++ kernel-2.6.spec	10 Apr 2006 19:14:07 -0000	1.2124
@@ -4,7 +4,8 @@
 # These are the kernels that are built IF the architecture allows it.
 
 %define buildup 1
-%define buildsmp 1
+%define buildsmp 0
+%define buildpae 0
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 0
 # Whether to build the Xen kernels, disable if you want.
@@ -40,7 +41,6 @@
 %ifarch noarch
 %define builddoc 1
 %define buildup 0
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
 %endif
 
@@ -57,25 +57,20 @@
 
 # Second, per-architecture exclusions (ifarch)
 
-%ifarch i586
-%define buildsmp 0
-%endif
-
 %ifarch %{all_x86}
+%define buildpae 1
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
 %define image_install_path boot
 %define signmodules 1
 %endif
 
 %ifarch x86_64
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
 %define signmodules 1
 %endif
 
 %ifarch ppc64
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
 %define image_install_path boot
 %define signmodules 1
@@ -84,7 +79,6 @@
 %endif
 
 %ifarch ppc64iseries
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
 %define image_install_path boot
 %define signmodules 1
@@ -93,23 +87,21 @@
 %endif
 
 %ifarch s390
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390*.config
 %define image_install_path boot
 %endif
 
 %ifarch s390x
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390x.config
 %define image_install_path boot
 %endif
 
 %ifarch sparc
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc.config
-%define buildsmp 0
 %endif
 
 %ifarch sparc64
+%define buildsmp 1
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc64*.config
 %endif
 
@@ -118,11 +110,11 @@
 %define image_install_path boot
 %define make_target vmlinux
 %define kernel_image vmlinux
+%define buildsmp 1
 %endif
 
 %ifarch ia64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config
-%define buildsmp 0
 %define image_install_path boot/efi/EFI/redhat
 %define signmodules 1
 %endif
@@ -193,7 +185,7 @@
 
 Source20: kernel-%{kversion}-i586.config
 Source21: kernel-%{kversion}-i686.config
-Source22: kernel-%{kversion}-i686-smp.config
+Source22: kernel-%{kversion}-i686-PAE.config
 Source23: kernel-%{kversion}-x86_64.config
 Source24: kernel-%{kversion}-ppc64.config
 Source25: kernel-%{kversion}-ppc64iseries.config
@@ -440,6 +432,41 @@
 options that can be passed to Linux kernel modules at load time.
 
 
+%package PAE
+Summary: The Linux kernel compiled for PAE capable machines.
+
+Group: System Environment/Kernel
+Provides: kernel = %{version}
+Provides: kernel-drm = 4.3.0
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}PAE
+Prereq: %{kernel_prereq}
+Conflicts: %{kernel_dot_org_conflicts}
+Conflicts: %{package_conflicts}
+Obsoletes: kernel-smp < 2.6.17
+# We can't let RPM do the dependencies automatic because it'll then pick up
+# a correct but undesirable perl dependency from the module headers which
+# isn't required for the kernel proper to function
+AutoReqProv: no
+
+%description PAE
+This package includes a version of the Linux kernel with support for up to
+64GB of high memory. It requires a CPU with Physical Address Extensions (PAE).
+The non-PAE kernel can only address up to 4GB of memory.
+Install the kernel-PAE package if your machine has more than 4GB of memory.
+
+%package smp-devel
+Summary: Development package for building kernel modules to match the SMP kernel.
+Group: System Environment/Kernel
+Provides: kernel-smp-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}smp
+Provides: kernel-devel = %{rpmversion}-%{release}smp
+AutoReqProv: no
+Prereq: /usr/bin/find
+
+%description smp-devel
+This package provides kernel headers and makefiles sufficient to build modules
+against the SMP kernel package.
+
 %package smp
 Summary: The Linux kernel compiled for SMP machines.
 
@@ -1253,6 +1280,10 @@
 BuildKernel %make_target %kernel_image
 %endif
 
+%if %{buildpae}
+BuildKernel %make_target %kernel_image PAE
+%endif
+
 %if %{buildsmp}
 BuildKernel %make_target %kernel_image smp
 %endif
@@ -1601,6 +1632,8 @@
 %changelog
 * Mon Apr 10 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc1-git2
+- Enable SMP on all x86 kernels.
+  SMP_ALTERNATIVES disables the spinlocks etc at runtime.
 
 * Thu Apr  6 2006 Dave Jones <davej at redhat.com>
 - Rebuild without a zillion warnings.

More information about the fedora-cvs-commits mailing list