Author: glen Date: Sun May 18 19:00:04 2008 GMT
Module: SPECS Tag: LINUX_2_6_22
---- Log message:
- update unionfs to 2.3.3
- trim Features in %description; rel 8
---- Files affected:
SPECS:
kernel.spec (1.441.2.1796.2.75 -> 1.441.2.1796.2.76)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.75 SPECS/kernel.spec:1.441.2.1796.2.76
--- SPECS/kernel.spec:1.441.2.1796.2.75 Thu Apr 24 20:20:16 2008
+++ SPECS/kernel.spec Sun May 18 20:59:58 2008
@@ -104,7 +104,7 @@
%define _prepatch %{nil}
%define _pre_rc %{nil}
%define _rc %{nil}
-%define _rel 7
+%define _rel 8
%define _enable_debug_packages 0
@@ -329,8 +329,8 @@
# add tty ioctl to figure physical device of the console. used by
showconsole.spec (blogd)
Patch131: kernel-TIOCGDEV.patch
-#
http://download.filesystems.org/unionfs/unionfs-2.1/unionfs-2.1.4_for_2.6.22.6.diff.gz
-Patch140: linux-2.6-unionfs-2.1.1.patch
+#
http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-2.3.3_for_2.6.22.19.diff.gz
+Patch140: kernel-unionfs.patch
Patch141: kernel-unionfs-vserver.patch
@@ -505,20 +505,24 @@
%define DepMod /sbin/depmod
%endif
+%define __features Netfilter module dated: %{netfilter_snap}\
+%{?with_abi:Linux ABI support - enabled}\
+%{?with_grsec_full:Grsecurity full support - enabled}\
+%{?with_pax:PaX support - enabled}\
+%{?with_xen0:Xen 0 - enabled}\
+%{?with_xenU:Xen U - enabled}\
+%{?with_fbsplash:Fbsplash - enabled}\
+%{?with_vesafb_tng:VesaFB New generation - enabled}\
+%{?with_nfsroot:Root on NFS - enabled}
+
+%define Features %(echo "%{__features}" | sed '/^$/d')
+
%description
This package contains the Linux kernel that is used to boot and run
your system. It contains few device drivers for specific hardware.
Most hardware is instead supported by modules loaded after booting.
-Netfilter module dated: %{netfilter_snap}
-%{?with_abi:Linux ABI support - enabled}
-%{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX support - enabled}
-%{?with_xen0:Xen 0 - enabled}
-%{?with_xenU:Xen U - enabled}
-%{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
-%{?with_nfsroot:Root on NFS - enabled}
+%{Features}
%description -l de.UTF-8
Das Kernel-Paket enthält den Linux-Kernel (vmlinuz), den Kern des
@@ -526,15 +530,7 @@
Systemfunktionen verantwortlich: Speicherreservierung,
Prozeß-Management, Geräte Ein- und Ausgaben, usw.
-Netfilter module dated: %{netfilter_snap}
-%{?with_abi:Linux ABI support - enabled}
-%{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX support - enabled}
-%{?with_xen0:Xen 0 - enabled}
-%{?with_xenU:Xen U - enabled}
-%{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
-%{?with_nfsroot:Root on NFS - enabled}
+%{Features}
%description -l fr.UTF-8
Le package kernel contient le kernel linux (vmlinuz), la partie
@@ -542,30 +538,14 @@
fonctions basiques d'un système d'exploitation: allocation mémoire,
allocation de process, entrée/sortie de peripheriques, etc.
-Netfilter module dated: %{netfilter_snap}
-%{?with_abi:Linux ABI support - enabled}
-%{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX support - enabled}
-%{?with_xen0:Xen 0 - enabled}
-%{?with_xenU:Xen U - enabled}
-%{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
-%{?with_nfsroot:Root on NFS - enabled}
+%{Features}
%description -l pl.UTF-8
Pakiet zawiera jądro Linuksa niezbędne do prawidłowego działania
Twojego komputera. Zawiera w sobie sterowniki do sprzętu znajdującego
się w komputerze, takiego jak sterowniki dysków itp.
-Netfilter module dated: %{netfilter_snap}
-%{?with_abi:Linux ABI support - enabled}
-%{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX support - enabled}
-%{?with_xen0:Xen 0 - enabled}
-%{?with_xenU:Xen U - enabled}
-%{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
-%{?with_nfsroot:Root on NFS - enabled}
+%{Features}
%package vmlinux
Summary: vmlinux - uncompressed kernel image
@@ -1749,6 +1729,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1796.2.76 2008-05-18 18:59:58 glen
+- update unionfs to 2.3.3
+- trim Features in %description; rel 8
+
Revision 1.441.2.1796.2.75 2008-04-24 18:20:16 glen
- still romfs by default
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1796.2.75&r2=1.441.2.1796.2.76&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
