Author: glen Date: Sat May 24 12:05:02 2008 GMT
Module: SPECS Tag: LINUX_2_6_16
---- Log message:
- add pae to kernel_release (except xen* to avoid xen0pae in name)
- update xen related initrd generation, add xen-hypervisor-abi virtual; rel 15
---- Files affected:
SPECS:
kernel.spec (1.441.2.1558.2.154 -> 1.441.2.1558.2.155)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.154
SPECS/kernel.spec:1.441.2.1558.2.155
--- SPECS/kernel.spec:1.441.2.1558.2.154 Fri May 23 21:35:44 2008
+++ SPECS/kernel.spec Sat May 24 14:04:55 2008
@@ -119,9 +119,9 @@
%define squashfs_version 3.1
%define suspend_version 2.2.5
-%define xen_version 3.0.2
+%define xen_hv_abi 3.0
-%define __alt_kernel
%{?with_pax:pax}%{?with_grsec_full:grsecurity}%{?with_xen0:xen0}%{?with_xenU:xenU}%{?with_pae:pae}
+%define __alt_kernel
%{?with_pax:pax}%{?with_grsec_full:grsecurity}%{?with_xen0:xen0}%{?with_xenU:xenU}%{!?with_xen:%{?with_pae:pae}}
%if "%{__alt_kernel}" != ""
%define alt_kernel %{__alt_kernel}
%endif
@@ -138,7 +138,7 @@
%define _basever 2.6.16
%define _postver .60
-%define _rel 14
+%define _rel 15
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)
@@ -367,8 +367,7 @@
Provides: %{name}(vermagic) = %{kernel_release}
Provides: %{name}-up = %{epoch}:%{version}-%{release}
%if %{with xen0}
-Requires: xen >= %{xen_version}
-Provides: kernel(xen0) = %{xen_version}
+Requires: xen-hypervisor-abi = %{xen_hv_abi}
%endif
Obsoletes: kernel-misc-fuse
Obsoletes: kernel-modules
@@ -587,8 +586,7 @@
Provides: %{name}(netfilter) = %{netfilter_snap}
Provides: %{name}-smp(vermagic) = %{kernel_release}
%if %{with xen0}
-Requires: xen >= %{xen_version}
-Provides: kernel(xen0) = %{xen_version}
+Requires: xen-hypervisor-abi = %{xen_hv_abi}
%endif
Obsoletes: kernel-smp-misc-fuse
Obsoletes: kernel-smp-net-hostap
@@ -1401,11 +1399,15 @@
if [ -x /sbin/new-kernel-pkg ]; then
%if %{with xen0}
- xen=$(readlink -f /boot/xen.gz)
- xenver=${xen#/boot/xen-}
- xenver=${xenver%.gz}
+ xenimg=%{initrd_dir}/xen.gz
+ xenver=
+ xen=$(readlink -f $xenimg)
+ if [ "$xen" != "$xenimg" ]; then
+ xenver=${xen#%{initrd_dir}/xen-}
+ xenver=${xenver%.gz}
+ fi
- title="Xen $xenver / PLD Linux (%{pld_release})"
+ title="Xen${xenver:+ $xenver} / PLD Linux (%{pld_release})"
args=--multiboot=$xen
%else
title="PLD Linux (%{pld_release})%{?alt_kernel: / %{alt_kernel}}"
@@ -1481,11 +1483,15 @@
if [ -x /sbin/new-kernel-pkg ]; then
%if %{with xen0}
- xen=$(readlink -f /boot/xen.gz)
- xenver=${xen#/boot/xen-}
- xenver=${xenver%.gz}
+ xenimg=%{initrd_dir}/xen.gz
+ xenver=
+ xen=$(readlink -f $xenimg)
+ if [ "$xen" != "$xenimg" ]; then
+ xenver=${xen#%{initrd_dir}/xen-}
+ xenver=${xenver%.gz}
+ fi
- title="Xen $xenver / PLD Linux (%{pld_release})"
+ title="Xen${xenver:+ $xenver} / PLD Linux (%{pld_release})"
args=--multiboot=$xen
%else
title="PLD Linux (%{pld_release})%{?alt_kernel: / %{alt_kernel}}"
@@ -1882,6 +1888,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1558.2.155 2008-05-24 12:04:55 glen
+- add pae to kernel_release (except xen* to avoid xen0pae in name)
+- update xen related initrd generation, add xen-hypervisor-abi virtual; rel 15
+
Revision 1.441.2.1558.2.154 2008-05-23 19:35:44 glen
- pae is %{ix86} above (including) i686 only
- add -pae as alt kernel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1558.2.154&r2=1.441.2.1558.2.155&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
