summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Redaelli <drizzt@gentoo.org>2007-07-10 22:29:26 +0000
committerTimothy Redaelli <drizzt@gentoo.org>2007-07-10 22:29:26 +0000
commit74690bdff4f04b0a50dd92904a26044a684aa02e (patch)
tree371a37afaf7fd359d434d80f45a12ef83ab909e5 /sys-fs/cdfs
parentalpha/ia64/x86 stable (diff)
downloadgentoo-2-74690bdff4f04b0a50dd92904a26044a684aa02e.tar.gz
gentoo-2-74690bdff4f04b0a50dd92904a26044a684aa02e.tar.bz2
gentoo-2-74690bdff4f04b0a50dd92904a26044a684aa02e.zip
Add patch for kernel 2.6.22
Thanks to dsd and Marek Rychly wrt bug #184816 (Portage version: 2.1.3_rc6)
Diffstat (limited to 'sys-fs/cdfs')
-rw-r--r--sys-fs/cdfs/ChangeLog7
-rw-r--r--sys-fs/cdfs/cdfs-2.6.19.ebuild11
-rw-r--r--sys-fs/cdfs/files/cdfs-2.6.19-kernel-2.6.22.patch24
3 files changed, 39 insertions, 3 deletions
diff --git a/sys-fs/cdfs/ChangeLog b/sys-fs/cdfs/ChangeLog
index 8a9800dabed6..5c1f9fb6dd9e 100644
--- a/sys-fs/cdfs/ChangeLog
+++ b/sys-fs/cdfs/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-fs/cdfs
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/ChangeLog,v 1.6 2007/01/30 22:45:18 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/ChangeLog,v 1.7 2007/07/10 22:29:26 drizzt Exp $
+
+ 10 Jul 2007; Timothy Redaelli <drizzt@gentoo.org>
+ +files/cdfs-2.6.19-kernel-2.6.22.patch, cdfs-2.6.19.ebuild:
+ Add patch for kernel 2.6.22
+ Thanks to dsd and Marek Rychly wrt bug #184816
30 Jan 2007; Timothy Redaelli <drizzt@gentoo.org>
-files/cdfs-2.6.18-kernel-2.6.19.patch, -cdfs-2.6.18.ebuild:
diff --git a/sys-fs/cdfs/cdfs-2.6.19.ebuild b/sys-fs/cdfs/cdfs-2.6.19.ebuild
index 6c6e30c669fd..3cd729b9b0f3 100644
--- a/sys-fs/cdfs/cdfs-2.6.19.ebuild
+++ b/sys-fs/cdfs/cdfs-2.6.19.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/cdfs-2.6.19.ebuild,v 1.2 2007/01/23 11:07:42 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/cdfs-2.6.19.ebuild,v 1.3 2007/07/10 22:29:26 drizzt Exp $
-inherit linux-mod
+inherit eutils linux-mod
DESCRIPTION="A file system for Linux systems that 'exports' all tracks and boot images on a CD as normal files."
HOMEPAGE="http://www.elis.rug.ac.be/~ronsse/cdfs/"
@@ -19,3 +19,10 @@ MODULE_NAMES="cdfs(fs)"
CONFIG_CHECK="BLK_DEV_LOOP"
BUILD_TARGETS="all"
BUILD_PARAMS="KDIR=\"${KERNEL_DIR}\""
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${P}-kernel-2.6.22.patch
+}
diff --git a/sys-fs/cdfs/files/cdfs-2.6.19-kernel-2.6.22.patch b/sys-fs/cdfs/files/cdfs-2.6.19-kernel-2.6.22.patch
new file mode 100644
index 000000000000..804dd44ba8db
--- /dev/null
+++ b/sys-fs/cdfs/files/cdfs-2.6.19-kernel-2.6.22.patch
@@ -0,0 +1,24 @@
+diff -urN root.c.old root.c
+--- root.c.old 2007-07-10 17:06:55.000000000 +0200
++++ root.c 2007-07-10 17:15:27.000000000 +0200
+@@ -26,6 +26,8 @@
+
+ #include <linux/module.h>
+
++#include <linux/sched.h>
++
+
+ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*
+ * Robert W. Boone (November, 2002) *
+diff -urN daemon.c.old daemon.c
+--- daemon.c.old 2007-07-10 17:07:58.000000000 +0200
++++ daemon.c 2007-07-10 17:15:03.000000000 +0200
+@@ -29,6 +29,8 @@
+
+ #include "cdfs.h"
+
++#include <linux/sched.h>
++
+ int kcdfsd_pid = 0;
+ static int kcdfsd_running = 0;
+ static DECLARE_WAIT_QUEUE_HEAD(kcdfsd_wait);