Author: glen Date: Sun Apr 27 10:48:54 2008 GMT
Module: SPECS Tag: LINUX_2_6_16
---- Log message:
- multiboot grubby install for xen0; rel 12
---- Files affected:
SPECS:
kernel.spec (1.441.2.1558.2.149 -> 1.441.2.1558.2.150)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.149
SPECS/kernel.spec:1.441.2.1558.2.150
--- SPECS/kernel.spec:1.441.2.1558.2.149 Tue Apr 8 10:01:51 2008
+++ SPECS/kernel.spec Sun Apr 27 12:48:48 2008
@@ -148,7 +148,7 @@
%define _basever 2.6.16
%define _postver .60
-%define _rel 11
+%define _rel 12
Summary: The Linux kernel (the core of the Linux operating system)
Summary(de.UTF-8): Der Linux-Kernel (Kern des Linux-Betriebssystems)
Summary(et.UTF-8): Linuxi kernel (ehk operatsioonisüsteemi tuum)
@@ -377,6 +377,7 @@
Provides: %{name}-up = %{epoch}:%{version}-%{release}
%if %{with xen0}
Provides: kernel(xen0) = %{xen_version}
+Requires: xen >= %{xen_version}
%endif
Obsoletes: kernel-misc-fuse
Obsoletes: kernel-modules
@@ -1408,12 +1409,22 @@
title='PLD Linux'
fi
+%if %{with xen0}
+ xen=$(readlink -f /boot/xen.gz)
+ xenver=${xen#/boot/xen-}
+ xenver=${xenver%.gz}
+
+ title="Xen $xenver / $title"
+ args=--multiboot=$xen
+%else
ext='%{?with_pax:pax}%{?with_grsec_full:grsecurity}%{?with_xen0:Xen0}%{?with_xenU:XenU}'
if [ "$ext" ]; then
title="$title $ext"
fi
+%endif
+
+ /sbin/new-kernel-pkg $args
--initrdfile=%{initrd_dir}/initrd-%{kernel_release}.gz --install
%{kernel_release} --banner "$title"
- /sbin/new-kernel-pkg
--initrdfile=%{initrd_dir}/initrd-%{kernel_release}.gz --install
%{kernel_release} --banner "$title"
elif [ -x /sbin/rc-boot ]; then
/sbin/rc-boot 1>&2 || :
fi
@@ -1880,6 +1891,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1558.2.150 2008-04-27 10:48:48 glen
+- multiboot grubby install for xen0; rel 12
+
Revision 1.441.2.1558.2.149 2008-04-08 08:01:51 glen
- kabi 6 for main kernel, grsec has 9 (sic)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1558.2.149&r2=1.441.2.1558.2.150&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
