Version bump to -r2 thanks to everyone in bug 76837

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 1519cd60e95a82a4bda833e36b43ce64ddb4c9f7..7a8df01e1f3578a688c09bff5dbef37c13dd16b6 100644 (file)
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/ck-sources
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.78 2004/12/29 02:45:11 kingtaco Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.79 2005/01/07 15:23:58 dsd Exp $
+
+*ck-sources-2.6.10-r2 (07 Jan 2005)
+
+  07 Jan 2005; Daniel Drake <dsd@gentoo.org>
+  +files/ck-sources-2.6.10-disable-iopriowr.patch,
+  -files/ck-sources-2.6.10.CAN-2004-1056.patch, -ck-sources-2.6.10-r1.ebuild,
+  +ck-sources-2.6.10-r2.ebuild:
+  Version bump to -r2 thanks to everyone in bug 76837
 
   28 Dec 2004; Mike Doty <kingtaco@gentoo.org> ck-sources-2.6.10-r1.ebuild:
   ~amd64 keyword added

diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 843edb7b9f02d89ad8bd784bf8eacb0672a3aa56..de4a5539fd8996577327455264cf7474fc8a6539 100644 (file)
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c9c879d2b034eae4e91990b664624769 ChangeLog 16823
+MD5 76b1482dfbccaced9d8fc541bdd21184 ck-sources-2.4.28-r1.ebuild 1089
+MD5 7086f7cc2573a4c6c2234051084fcc20 ck-sources-2.6.10-r2.ebuild 747
+MD5 923a18eda00fe45f79a07f205293dc37 ChangeLog 17116
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
-MD5 b6e2f5aa9770de9a81272db5aa39f662 ck-sources-2.4.28-r1.ebuild 1089
-MD5 befc649424a0dbeb22f992247b725ba0 ck-sources-2.6.10-r1.ebuild 736
-MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/ck-sources-2.4.28.CAN-2004-1016.patch 2835
-MD5 757ee1239c3f14645ccea3640d551e11 files/ck-sources-2.4.28.CAN-2004-1056.patch 11249
 MD5 8c35751caf824a9dacb02e80d6189b2e files/ck-sources-2.4.28.CAN-2004-1137.patch 1764
+MD5 cd90102d73b2dbed58a9263901319844 files/ck-sources-2.6.10-disable-iopriowr.patch 912
+MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/ck-sources-2.4.28.CAN-2004-1016.patch 2835
+MD5 d1ccc2047be533c992f67270a150a210 files/ck-sources-2.4.28.cmdlineLeak.patch 388
 MD5 c27699e9d62f7d46213bd51f87636163 files/ck-sources-2.4.28.vma.patch 8143
 MD5 55eb417b53b98efb6e89557bbf35e51b files/digest-ck-sources-2.4.28-r1 214
-MD5 b16a5ef5d8bdaf351a70ca61aa0e4bc2 files/digest-ck-sources-2.6.10-r1 131
-MD5 b9a94233e1457787352e5f85e3e3582d files/ck-sources-2.4.28.binfmt_a.out.patch 2009
-MD5 d1ccc2047be533c992f67270a150a210 files/ck-sources-2.4.28.cmdlineLeak.patch 388
 MD5 79a76d3cb0029b85d4303b0019e788a8 files/ck-sources-2.4.28.compileFix.patch 2070
-MD5 001b0a631c9fc28133013a1f8f78f74c files/ck-sources-2.6.10.CAN-2004-1056.patch 8458
+MD5 b9a94233e1457787352e5f85e3e3582d files/ck-sources-2.4.28.binfmt_a.out.patch 2009
+MD5 757ee1239c3f14645ccea3640d551e11 files/ck-sources-2.4.28.CAN-2004-1056.patch 11249
+MD5 45c159d1ec53d40f6d602733313523b5 files/digest-ck-sources-2.6.10-r2 131
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB0hpA0K3RJaeXx6cRAtgFAJ9mO/OL8xkOJJ+/RqMrO+U4hmqiUACfVxBm
-n/V4//jUv/n/e9r940V42NY=
-=U4n3
+iD8DBQFB3roLiJcSIUGNthERAo3sAJ9ajutqahgFD+49A0cR+GQBgUHGwQCfVLDn
+LOvMbfP52mmCMTG7wxRe4Ko=
+=wTBQ
 -----END PGP SIGNATURE-----

diff --git a/sys-kernel/ck-sources/ck-sources-2.4.28-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.28-r1.ebuild
index 1c2fb300954c0850814f16d4bfcd82c11de185c3..3c72677ff7673776e868e4a6b80943292957a6e5 100644 (file)
--- a/sys-kernel/ck-sources/ck-sources-2.4.28-r1.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.4.28-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.28-r1.ebuild,v 1.1 2004/12/25 15:30:23 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.28-r1.ebuild,v 1.2 2005/01/07 15:23:58 dsd Exp $
 
 ETYPE="sources"
 

diff --git a/sys-kernel/ck-sources/ck-sources-2.6.10-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.10-r2.ebuild
similarity index 79%
rename from sys-kernel/ck-sources/ck-sources-2.6.10-r1.ebuild
rename to sys-kernel/ck-sources/ck-sources-2.6.10-r2.ebuild
index 7f2bf2bd783199d54a9397cd625dd4cd970bbe3e..e236ed8cc96371074abced18d07c007dd081b5e5 100644 (file)
--- a/sys-kernel/ck-sources/ck-sources-2.6.10-r1.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.10-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.10-r1.ebuild,v 1.2 2004/12/29 02:45:11 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.10-r2.ebuild,v 1.1 2005/01/07 15:23:58 dsd Exp $
 
 UNIPATCH_LIST="${DISTDIR}/patch-${KV}.bz2
-       ${FILESDIR}/${P}.CAN-2004-1056.patch"
+       ${FILESDIR}/ck-sources-2.6.10-disable-iopriowr.patch"
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
 

diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.10-disable-iopriowr.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.10-disable-iopriowr.patch
new file mode 100644 (file)
index 0000000..7afd793
--- /dev/null
+++ b/sys-kernel/ck-sources/files/ck-sources-2.6.10-disable-iopriowr.patch
@@ -0,0 +1,23 @@
+Con says this is broken
+
+--- linux-2.6.10-ck2/drivers/block/Kconfig.iosched.orig        2005-01-07 13:18:43.557859120 +0000
++++ linux-2.6.10-ck2/drivers/block/Kconfig.iosched     2005-01-07 13:19:11.989536848 +0000
+@@ -39,16 +39,8 @@ config IOSCHED_CFQ
+         working environment, suitable for desktop systems.
+ 
+ config IOPRIO_WRITE
+-      bool "Support for full write io fairness"
++      bool
+       depends on IOSCHED_CFQ
+-      ---help---
+-        Most data writeout that isn't direct or raw happen asyncronously
+-        and thus not in the context of the process that originally dirtied
+-        the data. This type of writeback is typically handled by the pdflush
+-        kernel threads. The result is that a process dirtying a lot of pages
+-        gets proportionally more bandwidth than it should.
+-
+-        Say Y here it you want to apply full fairness for file system
+-        asyncronous writes at the expense of using 4 bytes in struct page.
++      default n
+ 
+ endmenu

diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.10.CAN-2004-1056.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.10.CAN-2004-1056.patch
deleted file mode 100644 (file)
index cd8d7af..0000000
--- a/sys-kernel/ck-sources/files/ck-sources-2.6.10.CAN-2004-1056.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-diff -ur linux-2.6.9/drivers/char/drm/i810_dma.c linux-2.6.9.drm.plasmaroo/drivers/char/drm/i810_dma.c
---- linux-2.6.9/drivers/char/drm/i810_dma.c    2004-10-18 22:53:46.000000000 +0100
-+++ linux-2.6.9.drm.plasmaroo/drivers/char/drm/i810_dma.c      2004-12-19 22:46:33.317446112 +0000
-@@ -1030,10 +1030,7 @@
-       drm_file_t        *priv   = filp->private_data;
-       drm_device_t      *dev    = priv->dev;
- 
--      if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i810_flush_ioctl called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp );
- 
-       i810_flush_queue(dev);
-       return 0;
-@@ -1055,10 +1052,7 @@
-       if (copy_from_user(&vertex, (drm_i810_vertex_t __user *)arg, sizeof(vertex)))
-               return -EFAULT;
- 
--      if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i810_dma_vertex called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp );
- 
-       DRM_DEBUG("i810 dma vertex, idx %d used %d discard %d\n",
-                 vertex.idx, vertex.used, vertex.discard);
-@@ -1090,10 +1084,7 @@
-       if (copy_from_user(&clear, (drm_i810_clear_t __user *)arg, sizeof(clear)))
-               return -EFAULT;
- 
--      if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i810_clear_bufs called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp );
- 
-       /* GH: Someone's doing nasty things... */
-       if (!dev->dev_private) {
-@@ -1114,10 +1105,8 @@
- 
-       DRM_DEBUG("i810_swap_bufs\n");
- 
--      if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i810_swap_buf called without lock held\n");
--              return -EINVAL;
--      }
-+
-+      LOCK_TEST_WITH_RETURN( dev, filp ); 
- 
-       i810_dma_dispatch_swap( dev );
-       return 0;
-@@ -1152,10 +1141,7 @@
-       if (copy_from_user(&d, (drm_i810_dma_t __user *)arg, sizeof(d)))
-               return -EFAULT;
- 
--      if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i810_dma called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp ); 
- 
-       d.granted = 0;
- 
-@@ -1266,10 +1252,7 @@
-               return -EFAULT;
- 
- 
--      if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i810_dma_mc called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp ); 
- 
-       if (mc.idx >= dma->buf_count || mc.idx < 0)
-               return -EINVAL;
-@@ -1317,10 +1300,7 @@
-       drm_device_t *dev = priv->dev;
-       drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
- 
--      if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i810_fstatus called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp ); 
-       return I810_READ(0x30008);
- }
- 
-@@ -1331,10 +1311,7 @@
-       drm_device_t *dev = priv->dev;
-       drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
- 
--      if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i810_ov0_flip called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp ); 
- 
-       //Tell the overlay to update
-       I810_WRITE(0x30000,dev_priv->overlay_physical | 0x80000000);
-@@ -1376,10 +1353,7 @@
- 
-       DRM_DEBUG("%s\n", __FUNCTION__);
- 
--      if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i810_flip_buf called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp );
- 
-       if (!dev_priv->page_flipping) 
-               i810_do_init_pageflip( dev );
-diff -ur linux-2.6.9/drivers/char/drm/i830_dma.c linux-2.6.9.drm.plasmaroo/drivers/char/drm/i830_dma.c
---- linux-2.6.9/drivers/char/drm/i830_dma.c    2004-10-18 22:53:12.000000000 +0100
-+++ linux-2.6.9.drm.plasmaroo/drivers/char/drm/i830_dma.c      2004-12-19 22:46:33.319445808 +0000
-@@ -1319,10 +1319,7 @@
-       drm_file_t        *priv   = filp->private_data;
-       drm_device_t      *dev    = priv->dev;
- 
--      if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i830_flush_ioctl called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp ); 
- 
-       i830_flush_queue(dev);
-       return 0;
-@@ -1343,10 +1340,7 @@
-       if (copy_from_user(&vertex, (drm_i830_vertex_t __user *)arg, sizeof(vertex)))
-               return -EFAULT;
- 
--      if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i830_dma_vertex called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp ); 
- 
-       DRM_DEBUG("i830 dma vertex, idx %d used %d discard %d\n",
-                 vertex.idx, vertex.used, vertex.discard);
-@@ -1373,10 +1367,7 @@
-       if (copy_from_user(&clear, (drm_i830_clear_t __user *)arg, sizeof(clear)))
-               return -EFAULT;
-    
--      if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i830_clear_bufs called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp ); 
- 
-       /* GH: Someone's doing nasty things... */
-       if (!dev->dev_private) {
-@@ -1398,10 +1389,7 @@
-    
-       DRM_DEBUG("i830_swap_bufs\n");
- 
--      if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i830_swap_buf called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp ); 
- 
-       i830_dma_dispatch_swap( dev );
-       return 0;
-@@ -1442,10 +1430,7 @@
- 
-       DRM_DEBUG("%s\n", __FUNCTION__);
- 
--      if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i830_flip_buf called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp ); 
- 
-       if (!dev_priv->page_flipping) 
-               i830_do_init_pageflip( dev );
-@@ -1484,10 +1469,7 @@
-       if (copy_from_user(&d, (drm_i830_dma_t __user *)arg, sizeof(d)))
-               return -EFAULT;
-    
--      if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i830_dma called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp ); 
-       
-       d.granted = 0;
- 
-diff -ur linux-2.6.9/drivers/char/drm/i830_irq.c linux-2.6.9.drm.plasmaroo/drivers/char/drm/i830_irq.c
---- linux-2.6.9/drivers/char/drm/i830_irq.c    2004-10-18 22:54:54.000000000 +0100
-+++ linux-2.6.9.drm.plasmaroo/drivers/char/drm/i830_irq.c      2004-12-19 22:46:33.320445656 +0000
-@@ -129,10 +129,7 @@
-       drm_i830_irq_emit_t emit;
-       int result;
- 
--      if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i830_irq_emit called without lock held\n");
--              return -EINVAL;
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp ); 
- 
-       if ( !dev_priv ) {
-               DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-diff -ur linux-2.6.9/drivers/char/drm/i915_dma.c linux-2.6.9.drm.plasmaroo/drivers/char/drm/i915_dma.c
---- linux-2.6.9/drivers/char/drm/i915_dma.c    2004-10-18 22:53:51.000000000 +0100
-+++ linux-2.6.9.drm.plasmaroo/drivers/char/drm/i915_dma.c      2004-12-19 22:46:33.321445504 +0000
-@@ -545,10 +545,7 @@
- {
-       DRM_DEVICE;
- 
--      if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i915_flush_ioctl called without lock held\n");
--              return DRM_ERR(EINVAL);
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp );
- 
-       return i915_quiescent(dev);
- }
-@@ -574,10 +571,7 @@
-       DRM_DEBUG("i915 batchbuffer, start %x used %d cliprects %d\n",
-                 batch.start, batch.used, batch.num_cliprects);
- 
--      if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i915_batchbuffer called without lock held\n");
--              return DRM_ERR(EINVAL);
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp );
- 
-       if (batch.num_cliprects && DRM_VERIFYAREA_READ(batch.cliprects,
-                                                      batch.num_cliprects *
-@@ -606,10 +600,7 @@
-       DRM_DEBUG("i915 cmdbuffer, buf %p sz %d cliprects %d\n",
-                 cmdbuf.buf, cmdbuf.sz, cmdbuf.num_cliprects);
- 
--      if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i915_cmdbuffer called without lock held\n");
--              return DRM_ERR(EINVAL);
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp );
- 
-       if (cmdbuf.num_cliprects &&
-           DRM_VERIFYAREA_READ(cmdbuf.cliprects,
-@@ -645,10 +636,7 @@
-       DRM_DEVICE;
- 
-       DRM_DEBUG("%s\n", __FUNCTION__);
--      if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i915_flip_buf called without lock held\n");
--              return DRM_ERR(EINVAL);
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp );
- 
-       return i915_dispatch_flip(dev);
- }
-diff -ur linux-2.6.9/drivers/char/drm/i915_irq.c linux-2.6.9.drm.plasmaroo/drivers/char/drm/i915_irq.c
---- linux-2.6.9/drivers/char/drm/i915_irq.c    2004-10-18 22:53:51.000000000 +0100
-+++ linux-2.6.9.drm.plasmaroo/drivers/char/drm/i915_irq.c      2004-12-19 22:46:33.321445504 +0000
-@@ -92,10 +92,7 @@
-       drm_i915_irq_emit_t emit;
-       int result;
- 
--      if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--              DRM_ERROR("i915_irq_emit called without lock held\n");
--              return DRM_ERR(EINVAL);
--      }
-+      LOCK_TEST_WITH_RETURN( dev, filp );
- 
-       if (!dev_priv) {
-               DRM_ERROR("%s called with no initialization\n", __FUNCTION__);

diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r2
similarity index 51%
rename from sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r1
rename to sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r2
index 7b37d339040487a1a7528c7709dcf9e19329a2d2..c54cda55a9bdcb7b2599ba495748da1c83acea89 100644 (file)
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r1
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r2
@@ -1,2 +1,2 @@
 MD5 cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 36533484
-MD5 0435b10fd9ac396601fa6732d7521f11 patch-2.6.10-ck1.bz2 33017
+MD5 7d56bf108c0a8f2459fc5f66da9d454d patch-2.6.10-ck2.bz2 49167