SPECS: kernel-xen.spec - merged useful spec changes from -vanilla
glen
glen at pld-linux.org
Sat Apr 26 18:00:31 CEST 2008
Author: glen Date: Sat Apr 26 16:00:31 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged useful spec changes from -vanilla
---- Files affected:
SPECS:
kernel-xen.spec (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SPECS/kernel-xen.spec
diff -u SPECS/kernel-xen.spec:1.2 SPECS/kernel-xen.spec:1.3
--- SPECS/kernel-xen.spec:1.2 Thu Dec 27 12:23:18 2007
+++ SPECS/kernel-xen.spec Sat Apr 26 18:00:26 2008
@@ -3,7 +3,7 @@
# TODO:
# - port grsec_minimal
# - legal stuff ( http://www.xensource.com/Pages/legal.aspx )
-#
+#
# Status:
# - dom0 boots
# - domU doesn't
@@ -25,24 +25,6 @@
%define have_oss 1
%define have_sound 1
-## Program required by kernel to work.
-%define _binutils_ver 2.12.1
-%define _util_linux_ver 2.10o
-%define _module_init_tool_ver 0.9.10
-%define _e2fsprogs_ver 1.29
-%define _jfsutils_ver 1.1.3
-%define _reiserfsprogs_ver 3.6.3
-%define _xfsprogs_ver 2.6.0
-%define _pcmcia_cs_ver 3.1.21
-%define _pcmciautils_ver 004
-%define _quota_tools_ver 3.09
-%define _ppp_ver 1:2.4.0
-%define _isdn4k_utils_ver 3.1pre1
-%define _nfs_utils_ver 1.0.5
-%define _procps_ver 3.2.0
-%define _oprofile_ver 0.9
-%define _udev_ver 071
-
%define xen_version 3.2.0
%define alt_kernel xen
@@ -54,6 +36,7 @@
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)
Summary(fr.UTF-8): Le Kernel-Linux (La partie centrale du systeme)
Summary(pl.UTF-8): Jądro Linuksa
Name: kernel-%{alt_kernel}
@@ -64,14 +47,10 @@
Group: Base/Kernel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2
# Source0-md5: 296a6d150d260144639c3664d127d174
-%if "%{_postver}" != "%{nil}"
Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{_basever}%{_postver}.bz2
# Source1-md5: 090f582d2a0e1951d500b2e55f7df7b4
-%endif
-
Source2: kernel-xen-module-build.pl
Source3: kernel-xen-config.h
-
Source20: kernel-xen-common.config
Source21: kernel-xen-i386.config
Source22: kernel-xen-x86_64.config
@@ -89,32 +68,25 @@
BuildRequires: rpmbuild(macros) >= 1.379
BuildRequires: sed >= 4.0
Autoreqprov: no
+Requires: /sbin/depmod
Requires: coreutils
Requires: geninitrd >= 2.57
Requires: module-init-tools >= 0.9.9
-Provides: %{name}-up = %{epoch}:%{version}-%{release}
-Provides: kernel = %{epoch}:%{version}-%{release}
-Provides: kernel(realtime-lsm) = 0.1.1
+Provides: %{name}(vermagic) = %{kernel_release}
Provides: kernel(xen0) = %{xen_version}
-Provides: kernel-misc-fuse
-Provides: kernel-net-hostap = 0.4.4
-Provides: kernel-net-ieee80211
-Provides: kernel-net-ipw2100 = 1.1.3
-Provides: kernel-net-ipw2200 = 1.0.8
-Provides: module-info
-Conflicts: e2fsprogs < %{_e2fsprogs_ver}
-Conflicts: isdn4k-utils < %{_isdn4k_utils_ver}
-Conflicts: jfsutils < %{_jfsutils_ver}
-Conflicts: module-init-tool < %{_module_init_tool_ver}
-Conflicts: nfs-utils < %{_nfs_utils_ver}
-Conflicts: oprofile < %{_oprofile_ver}
-Conflicts: ppp < %{_ppp_ver}
-Conflicts: procps < %{_procps_ver}
-Conflicts: quota-tools < %{_quota_tools_ver}
-Conflicts: reiserfsprogs < %{_reiserfsprogs_ver}
-Conflicts: udev < %{_udev_ver}
-Conflicts: util-linux < %{_util_linux_ver}
-Conflicts: xfsprogs < %{_xfsprogs_ver}
+Conflicts: e2fsprogs < 1.29
+Conflicts: isdn4k-utils < 3.1pre1
+Conflicts: jfsutils < 1.1.3
+Conflicts: module-init-tools < 0.9.10
+Conflicts: nfs-utils < 1.0.5
+Conflicts: oprofile < 0.9
+Conflicts: ppp < 1:2.4.0
+Conflicts: procps < 3.2.0
+Conflicts: quota-tools < 3.09
+Conflicts: reiserfsprogs < 3.6.3
+Conflicts: udev < 1:071
+Conflicts: util-linux < 2.10o
+Conflicts: xfsprogs < 2.6.0
ExclusiveArch: %{ix86} %{x8664}
ExcludeArch: i386 i486 i586
ExclusiveOS: Linux
@@ -122,6 +94,7 @@
# No ELF objects there to strip (skips processing 27k files)
%define _noautostrip .*%{_kernelsrcdir}/.*
+%define _noautochrpath .*%{_kernelsrcdir}/.*
%define initrd_dir /boot
@@ -189,49 +162,43 @@
Summary(de.UTF-8): DRM Kernel Treiber
Summary(pl.UTF-8): Sterowniki DRM
Group: Base/Kernel
-Requires(postun): %{name}-up = %{epoch}:%{version}-%{release}
-Requires: %{name}-up = %{epoch}:%{version}-%{release}
-Provides: kernel-drm = %{drm_xfree_version}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Autoreqprov: no
%description drm
-DRM kernel modules (%{drm_xfree_version}).
+DRM kernel modules.
%description drm -l de.UTF-8
-DRM Kernel Treiber (%{drm_xfree_version}).
+DRM Kernel Treiber.
%description drm -l pl.UTF-8
-Sterowniki DRM (%{drm_xfree_version}).
+Sterowniki DRM.
%package pcmcia
Summary: PCMCIA modules
Summary(de.UTF-8): PCMCIA Module
Summary(pl.UTF-8): Moduły PCMCIA
Group: Base/Kernel
-Requires(postun): %{name}-up = %{epoch}:%{version}-%{release}
-Requires: %{name}-up = %{epoch}:%{version}-%{release}
-Provides: kernel(pcmcia)
-Provides: kernel-pcmcia = %{pcmcia_version}
-Conflicts: pcmcia-cs < %{_pcmcia_cs_ver}
-Conflicts: pcmciautils < %{_pcmciautils_ver}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Conflicts: pcmcia-cs < 3.1.21
+Conflicts: pcmciautils < 004
Autoreqprov: no
%description pcmcia
-PCMCIA modules (%{pcmcia_version}).
+PCMCIA modules.
%description pcmcia -l de.UTF-8
-PCMCIA Module (%{pcmcia_version})
+PCMCIA Module.
%description pcmcia -l pl.UTF-8
-Moduły PCMCIA (%{pcmcia_version}).
+Moduły PCMCIA.
%package sound-alsa
Summary: ALSA kernel modules
Summary(de.UTF-8): ALSA Kernel Module
Summary(pl.UTF-8): Sterowniki dźwięku ALSA
Group: Base/Kernel
-Requires(postun): %{name}-up = %{epoch}:%{version}-%{release}
-Requires: %{name}-up = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Autoreqprov: no
%description sound-alsa
@@ -248,8 +215,7 @@
Summary(de.UTF-8): OSS Kernel Module
Summary(pl.UTF-8): Sterowniki dźwięku OSS
Group: Base/Kernel
-Requires(postun): %{name}-up = %{epoch}:%{version}-%{release}
-Requires: %{name}-up = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Autoreqprov: no
%description sound-oss
@@ -266,11 +232,6 @@
Summary(de.UTF-8): Header Dateien für den Linux-Kernel
Summary(pl.UTF-8): Pliki nagłówkowe jądra Linuksa
Group: Development/Building
-Provides: kernel-headers = %{epoch}:%{version}-%{release}
-Provides: kernel-headers(agpgart) = %{version}
-Provides: kernel-headers(alsa-drivers)
-Provides: kernel-headers(bridging) = %{version}
-Provides: kernel-headers(reiserfs) = %{version}
Autoreqprov: no
%description headers
@@ -280,7 +241,7 @@
%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
+Strukturen und Konstante beinhalten, die beim rekompilieren des Kernels
oder bei Kernel Modul kompilationen gebraucht werden.
%description headers -l pl.UTF-8
@@ -293,7 +254,6 @@
Summary(pl.UTF-8): Pliki służące do budowania modułów jądra
Group: Development/Building
Requires: %{name}-headers = %{epoch}:%{version}-%{release}
-Provides: kernel-module-build = %{epoch}:%{version}-%{release}
Autoreqprov: no
%description module-build
@@ -314,14 +274,11 @@
Summary(pl.UTF-8): Kod źródłowy jądra Linuksa
Group: Development/Building
Requires: %{name}-module-build = %{epoch}:%{version}-%{release}
-Provides: kernel-source = %{epoch}:%{version}-%{release}
Autoreqprov: no
%description source
-This is the source code for the Linux kernel. It is required to build
-most C programs as they depend on constants defined in here. You can
-also build a custom kernel that is better tuned to your particular
-hardware.
+This is the source code for the Linux kernel. You can build a custom
+kernel that is better tuned to your particular hardware.
%description source -l de.UTF-8
Das Kernel-Source-Packet enthält den source code (C/Assembler-Code)
@@ -347,12 +304,11 @@
Summary(de.UTF-8): Kernel Dokumentation
Summary(pl.UTF-8): Dokumentacja do jądra Linuksa
Group: Documentation
-Provides: kernel-doc = %{version}
Autoreqprov: no
%description doc
This is the documentation for the Linux kernel, as found in
-Documentation directory.
+/usr/src/linux/Documentation directory.
%description doc -l de.UTF-8
Dies ist die Kernel Dokumentation wie sie im 'Documentation'
@@ -360,7 +316,7 @@
%description doc -l pl.UTF-8
Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu
-Documentation.
+/usr/src/linux/Documentation.
%prep
%setup -q -n linux-%{_basever}
@@ -578,23 +534,17 @@
fi
%post
-mv -f /boot/vmlinuz-%{alt_kernel} /boot/vmlinuz-%{alt_kernel}.old 2> /dev/null > /dev/null
-mv -f /boot/System.map-%{alt_kernel} /boot/System.map-%{alt_kernel}.old 2> /dev/null > /dev/null
ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz-%{alt_kernel}
ln -sf System.map-%{kernel_release} /boot/System.map-%{alt_kernel}
if [ ! -e /boot/vmlinuz ]; then
- mv -f /boot/vmlinuz /boot/vmlinuz.old 2> /dev/null > /dev/null
- mv -f /boot/System.map /boot/System.map.old 2> /dev/null > /dev/null
ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz
ln -sf System.map-%{alt_kernel} /boot/System.map
- mv -f %{initrd_dir}/initrd %{initrd_dir}/initrd.old 2> /dev/null > /dev/null
ln -sf initrd-%{alt_kernel} %{initrd_dir}/initrd
fi
%depmod %{kernel_release}
/sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{kernel_release}.gz %{kernel_release}
-mv -f %{initrd_dir}/initrd-%{alt_kernel} %{initrd_dir}/initrd-%{alt_kernel}.old 2> /dev/null > /dev/null
ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd-%{alt_kernel}
if [ -x /sbin/new-kernel-pkg ]; then
@@ -612,7 +562,6 @@
fi
%post vmlinux
-mv -f /boot/vmlinux-%{alt_kernel} /boot/vmlinux-%{alt_kernel}.old 2> /dev/null > /dev/null
ln -sf vmlinux-%{kernel_release} /boot/vmlinux-%{alt_kernel}
%post drm
@@ -805,10 +754,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2008-04-26 16:00:26 glen
+- merged useful spec changes from -vanilla
+
Revision 1.2 2007-12-27 11:23:18 adamg
- updated md5sums
Revision 1.1 2007-12-27 10:21:56 adamg
- new ( xen-unstable.hg )
- based on kernel-vanilla.spec
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-xen.spec?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list