SPECS: kernel-xen.spec - multiboot grubby install

[glen]

Author: glen                         Date: Sun Apr 27 10:40:55 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- multiboot grubby install

---- Files affected:
SPECS:
   kernel-xen.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/kernel-xen.spec
diff -u SPECS/kernel-xen.spec:1.8 SPECS/kernel-xen.spec:1.9
--- SPECS/kernel-xen.spec:1.8	Sun Apr 27 00:16:30 2008
+++ SPECS/kernel-xen.spec	Sun Apr 27 12:40:50 2008
@@ -42,7 +42,7 @@
 
 %define		_basever	2.6.18
 %define		_postver	.8
-%define		_rel		0.9
+%define		_rel		0.10
 %define		_ver		%{nil}
 
 Summary:	The Linux kernel (the core of the Linux operating system)
@@ -74,8 +74,8 @@
 Patch0:		kernel-xen-xen.patch
 Patch1:		kernel-PATH_MAX.patch
 URL:		http://www.kernel.org/
-BuildRequires:	binutils >= 3:2.14.90.0.7
 BuildRequires:	%{kgcc_package} >= 5:3.2
+BuildRequires:	binutils >= 3:2.14.90.0.7
 BuildRequires:	module-init-tools
 # for hostname command
 BuildRequires:	net-tools
@@ -87,6 +87,7 @@
 Requires:	coreutils
 Requires:	geninitrd >= 2.57
 Requires:	module-init-tools >= 0.9.9
+Requires:	xen >= %{xen_version}
 Provides:	%{name}(vermagic) = %{kernel_release}
 Provides:	kernel(xen0) = %{xen_version}
 Conflicts:	e2fsprogs < 1.29
@@ -256,8 +257,8 @@
 
 %description headers -l de.UTF-8
 Dies sind die C Header Dateien für den Linux-Kernel, die definierte
-Strukturen und Konstante beinhalten, die beim rekompilieren des Kernels
-oder bei Kernel Modul kompilationen gebraucht werden.
+Strukturen und Konstante beinhalten, die beim rekompilieren des
+Kernels oder bei Kernel Modul kompilationen gebraucht werden.
 
 %description headers -l pl.UTF-8
 Pakiet zawiera pliki nagłówkowe jądra, niezbędne do rekompilacji jądra
@@ -520,15 +521,19 @@
 ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd-%{alt_kernel}
 
 if [ -x /sbin/new-kernel-pkg ]; then
+	xen=$(readlink -f /boot/xen.gz)
+	xenver=${xen#/boot/xen-}
+	xenver=${xenver%.gz}
+
 	if [ -f /etc/pld-release ]; then
 		title=$(sed 's/^[0-9.]\+ //' < /etc/pld-release)
 	else
 		title='PLD Linux'
 	fi
 
-	title="$title %{alt_kernel}"
+	title="Xen $xenver / $title"
 
-	/sbin/new-kernel-pkg --initrdfile=%{initrd_dir}/initrd-%{kernel_release}.gz --install %{kernel_release} --banner "$title"
+	/sbin/new-kernel-pkg --multiboot=$xen --initrdfile=%{initrd_dir}/initrd-%{kernel_release}.gz --install %{kernel_release} --banner "$title"
 elif [ -x /sbin/rc-boot ]; then
 	/sbin/rc-boot 1>&2 || :
 fi
@@ -746,6 +751,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2008-04-27 10:40:50  glen
+- multiboot grubby install
+
 Revision 1.8  2008-04-26 22:16:30  glen
 - provide just 3.2 major
 - kabi in localversion
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-xen.spec?r1=1.8&r2=1.9&f=u