rpms/kernel/devel Makefile.config, 1.39, 1.40 kernel-2.6.spec, 1.2281, 1.2282

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jun 14 12:11:10 UTC 2006 

Author: quintela

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

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
create xen-PAE kernel (temporary until test2, not enabled by now)


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile.config	13 Jun 2006 22:46:56 -0000	1.39
+++ Makefile.config	14 Jun 2006 12:11:06 -0000	1.40
@@ -12,6 +12,7 @@
 	$(CFG)-s390.config $(CFG)-s390x.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
+	$(CFG)-i686-xen-PAE.config \
 	$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
@@ -58,7 +59,10 @@
 temp-ia64-generic: configs/config-ia64-generic temp-generic
 	perl scripts/merge.pl $^ > $@
 
-temp-x86-xen-generic: configs/config-xen-generic temp-x86-generic
+temp-x86-xen-generic-temp: configs/config-xen-generic temp-x86-generic
+	perl scripts/merge.pl $^ > $@
+
+temp-x86-xen-generic: configs/config-xen-xen temp-x86-xen-generic-temp
 	perl scripts/merge.pl $^ > $@
 
 temp-x86_64-xen-generic-tmp: configs/config-xen-generic temp-x86_64-generic
@@ -121,7 +125,10 @@
 kernel-$(VERSION)-ia64.config: configs/config-ia64 temp-ia64-generic
 	perl scripts/merge.pl $^ ia64 > $@
 
-kernel-$(VERSION)-i686-xen.config: configs/config-xen-xen temp-x86-xen-generic
+kernel-$(VERSION)-i686-xen.config: configs/config-i686 temp-x86-xen-generic
+	perl scripts/merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-i686-xen-PAE.config: configs/config-i686-PAE temp-x86-xen-generic
 	perl scripts/merge.pl $^ i386 > $@
 
 kernel-$(VERSION)-x86_64-xen.config: configs/config-xen-xen temp-x86_64-xen-generic


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2281
retrieving revision 1.2282
diff -u -r1.2281 -r1.2282
--- kernel-2.6.spec	14 Jun 2006 10:43:15 -0000	1.2281
+++ kernel-2.6.spec	14 Jun 2006 12:11:06 -0000	1.2282
@@ -233,6 +233,7 @@
 Source33: kernel-%{kversion}-i686-xen.config
 Source34: kernel-%{kversion}-x86_64-xen.config
 Source35: kernel-%{kversion}-i686-kdump.config
+Source36: kernel-%{kversion}-i686-xen-PAE.config
 
 #Source66: kernel-%{kversion}-sparc.config
 #Source67: kernel-%{kversion}-sparc64.config
@@ -607,6 +608,40 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
+%package xen-PAE
+Summary: The Linux kernel compiled for Xen VM operations with PAE support
+
+Group: System Environment/Kernel
+Provides: kernel = %{version}
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen-PAE
+Prereq: %{kernel_prereq}
+Conflicts: %{kernel_dot_org_conflicts}
+Conflicts: %{package_conflicts}
+Conflicts: %{xen_conflicts}
+# the hypervisor kernel needs a newer mkinitrd than everything else right now
+Conflicts: mkinitrd <= 4.2.0
+# 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 xen-PAE
+This package includes a version of the Linux kernel which runs in Xen
+VM with PAE. It works for both priviledged and unpriviledged guests.
+
+%package xen-PAE-devel
+Summary: Development package for building kernel modules to match the kernel.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: kernel-xen-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen-PAE
+Provides: kernel-devel = %{rpmversion}-%{release}xen-PAE
+Prereq: /usr/bin/find
+
+%description xen-PAE-devel
+This package provides kernel headers and makefiles sufficient to build modules
+against the kernel package.
+
 %package kdump
 Summary: A minimal Linux kernel compiled for kernel crash dumps.
 
@@ -1268,7 +1303,7 @@
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}-PAE
   make clean
 %endif
-  make debug=y pae=y verbose=y crash_debug=y
+  make debug=y verbose=y crash_debug=y
   install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}
   cd ..
@@ -1424,6 +1459,23 @@
   popd > /dev/null
 fi
 
+%post xen-PAE
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen-PAE
+if [ -e /proc/xen/xsd_kva ]; then 
+	/sbin/new-kernel-pkg --package kernel-xen-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}xen-PAE
+else 
+	/sbin/new-kernel-pkg --package kernel-xen-PAE --mkinitrd --depmod --install %{KVERREL}xen-PAE
+fi
+[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
+
+%post xen-PAE-devel
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
+  pushd /usr/src/kernels/%{KVERREL}-xen-PAE-%{_target_cpu} > /dev/null
+  /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
+  popd > /dev/null
+fi
+
 %post kdump
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-kdump
 /sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump
@@ -1456,6 +1508,10 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen
 
+%preun xen-PAE
+/sbin/modprobe loop 2> /dev/null > /dev/null  || :
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen-PAE
+
 
 ###
 ### file lists
@@ -1558,6 +1614,30 @@
 /usr/src/kernels/%{KVERREL}xen-%{_target_cpu}
 %endif
 
+%if %{buildxenPAE}
+%files xen-PAE
+%defattr(-,root,root)
+/%{image_install_path}/vmlinuz-%{KVERREL}xen-PAE
+/boot/System.map-%{KVERREL}xen-PAE
+/boot/symvers-%{KVERREL}xen-PAE.gz
+/boot/symsets-%{KVERREL}xen-PAE.tar.gz
+/boot/config-%{KVERREL}xen-PAE
+/boot/xen.gz-%{KVERREL}-PAE
+/boot/xen-syms-%{KVERREL}-PAE
+%dir /lib/modules/%{KVERREL}xen-PAE
+/lib/modules/%{KVERREL}xen-PAE/kernel
+%verify(not mtime) /lib/modules/%{KVERREL}xen-PAE/build
+/lib/modules/%{KVERREL}xen-PAE/source
+/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
+/lib/modules/%{KVERREL}xen-PAE/extra
+/lib/modules/%{KVERREL}xen-PAE/updates
+/lib/modules/%{KVERREL}xen-PAE/weak-updates
+
+%files xen-PAE_devel
+%defattr(-,root,root)
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen-PAE-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}xen-PAE-%{_target_cpu}
+%endif
 %endif
 
 %if %{buildkdump}
@@ -1594,8 +1674,10 @@
 %endif
 
 %changelog
-* Wed Jun 14 2006 Juan Quintela <quintela at troll.mitica> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_%tag
+* Wed Jun 14 2006 Juan Quintela <quintela at redhat.com>
 - remove xen0/xenU/xen0-PAE/xenU-PAE packages
+- disable xen PAE kernel for i386 for now
+- create xen-PAE kernel
 - remove %%requires xen from xen kernels
 
 * Wed Jun 14 2006 Juan Quintela <quintela at redhat.com>

More information about the fedora-cvs-commits mailing list