Author: arekm Date: Mon Feb 28 18:13:31 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2; kernel-small_fixes is back after evil broke it; virtio conditional
dropped (always build it as module)
---- Files affected:
packages/kernel:
kernel-patches.config (1.8 -> 1.9) , kernel.spec (1.885 -> 1.886)
---- Diffs:
================================================================
Index: packages/kernel/kernel-patches.config
diff -u packages/kernel/kernel-patches.config:1.8
packages/kernel/kernel-patches.config:1.9
--- packages/kernel/kernel-patches.config:1.8 Wed Sep 29 10:57:36 2010
+++ packages/kernel/kernel-patches.config Mon Feb 28 19:13:26 2011
@@ -53,3 +53,6 @@
NET_SCH_ESFQ all=m
NET_SCH_ESFQ_NFCT all=y
+
+# virtio-gl
+VIRTIOGL=m
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.885 packages/kernel/kernel.spec:1.886
--- packages/kernel/kernel.spec:1.885 Mon Feb 28 18:08:53 2011
+++ packages/kernel/kernel.spec Mon Feb 28 19:13:26 2011
@@ -32,7 +32,6 @@
%bcond_with fbcondecor # build fbcondecor (disable FB_TILEBLITTING and
affected fb modules)
%bcond_with pae # build PAE (HIGHMEM64G) support on uniprocessor
%bcond_with nfsroot # build with root on NFS support
-%bcond_with virtio_gl # build with virtio_gl thats avaible under
guest OS with patched qemu (qemu-gl.spec)
%bcond_without imq # imq support
%bcond_without wrr # wrr support
@@ -57,10 +56,6 @@
%define with_pax 1
%endif
-%if %{with virtio_gl}
-%define with_virtiogl 1
-%endif
-
%define have_drm 1
%define have_oss 1
%define have_sound 1
@@ -94,7 +89,7 @@
%define basever 2.6.37
%define postver .2
-%define rel 1
+%define rel 2
%define _enable_debug_packages 0
@@ -107,7 +102,7 @@
%endif
%else
%if %{without rescuecd}
-%define __alt_kernel
%{?with_pax:pax}%{!?with_grsecurity:nogrsecurity}%{?with_pae:pae}%{?with_virtiogl:virtiogl}
+%define __alt_kernel
%{?with_pax:pax}%{!?with_grsecurity:nogrsecurity}%{?with_pae:pae}
%if "%{__alt_kernel}" != ""
%define alt_kernel %{__alt_kernel}
%endif
@@ -282,6 +277,9 @@
# http://www.ssi.bg/~ja/routes-2.6.37-16.diff
Patch300: kernel-routes.patch
+# https://patchwork.kernel.org/patch/236261/
+Patch400: kernel-virtio-gl-accel.patch
+
Patch2000: kernel-small_fixes.patch
Patch2001: kernel-pwc-uncompress.patch
Patch2003: kernel-regressions.patch
@@ -310,7 +308,6 @@
# Do not remove this line, please. It is easier for me to uncomment two lines,
then patch
# kernel.spec every time.
#Patch50000: kernel-usb_reset.patch
-Patch60000: kernel-virtio-gl-accel.patch
URL: http://www.kernel.org/
BuildRequires: binutils >= 3:2.18
@@ -446,7 +443,6 @@
%{?with_pax:PaX support - enabled}\
%{?with_fbcondecor:Fbsplash/fbcondecor - enabled }\
%{?with_nfsroot:Root on NFS - enabled}\
-%{?with_virtiogl:virtio_gl for qemu-gl guest OpenGL accel - enabled}\
%define Features %(echo "%{__features}" | sed '/^$/d')
@@ -809,14 +805,16 @@
# routes
%patch300 -p1
+# virtio-gl
+%patch400 -p1
+
# Small fixes:
-#%patch2000 -p1
+%patch2000 -p1
%patch2001 -p1
#%patch2003 -p1
# Do not remove this, please!
#%patch50000 -p1
-%{?with_virtiogl:%patch60000 -p1}
# Fix EXTRAVERSION in main Makefile
sed -i 's#EXTRAVERSION =.*#EXTRAVERSION =
%{postver}%{?alt_kernel:_%{alt_kernel}}#g' Makefile
@@ -973,10 +971,6 @@
CONFIG_ROOT_NFS=y
%endif
-%if %{with virtio_gl}
- CONFIG_VIRTIOGL=m
-%endif
-
# Temporary disabled RELOCATABLE. Needed only on x86??
%if %{with pax} || %{with grsecurity}
CONFIG_RELOCATABLE=n
@@ -1544,6 +1538,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.886 2011/02/28 18:13:26 arekm
+- rel 2; kernel-small_fixes is back after evil broke it; virtio conditional
dropped (always build it as module)
+
Revision 1.885 2011/02/28 17:08:53 arekm
- revert wanrouter split, makes no sense
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-patches.config?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.885&r2=1.886&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
