Fix building with recent kernels, bug #373489 by Mathieu Zhang, Guy and Karata. Drop old.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

5 files changed, 40 insertions, 60 deletions

diff --git a/sys-fs/cdfs/ChangeLog b/sys-fs/cdfs/ChangeLog
index d2dfb863cd58..ea328697d9b9 100644
--- a/sys-fs/cdfs/ChangeLog
+++ b/sys-fs/cdfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/cdfs
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/ChangeLog,v 1.12 2010/06/15 07:26:00 tove Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/ChangeLog,v 1.13 2012/02/25 12:36:04 pacho Exp $
+
+  25 Feb 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/cdfs-2.6.27-kernel-2.6.39.patch, -cdfs-2.6.19.ebuild,
+  -cdfs-2.6.23.ebuild, cdfs-2.6.27.ebuild:
+  Fix building with recent kernels, bug #373489 by Mathieu Zhang, Guy and
+  Karata. Drop old.
 
   15 Jun 2010; Torsten Veller <tove@gentoo.org> cdfs-2.6.19.ebuild,
   cdfs-2.6.23.ebuild, cdfs-2.6.27.ebuild:
diff --git a/sys-fs/cdfs/cdfs-2.6.19.ebuild b/sys-fs/cdfs/cdfs-2.6.19.ebuild
deleted file mode 100644
index a4e40608ac18..000000000000
--- a/sys-fs/cdfs/cdfs-2.6.19.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 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.5 2010/06/15 07:26:00 tove Exp $
-
-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://users.elis.ugent.be/~mronsse/cdfs/"
-SRC_URI="http://users.elis.ugent.be/~mronsse/cdfs/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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/cdfs-2.6.23.ebuild b/sys-fs/cdfs/cdfs-2.6.23.ebuild
deleted file mode 100644
index 3eac2a9c8600..000000000000
--- a/sys-fs/cdfs/cdfs-2.6.23.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/cdfs-2.6.23.ebuild,v 1.3 2010/06/15 07:26:00 tove Exp $
-
-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://users.elis.ugent.be/~mronsse/cdfs/"
-SRC_URI="http://users.elis.ugent.be/~mronsse/cdfs/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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}"/${PN}-2.6.19-kernel-2.6.22.patch
-}
diff --git a/sys-fs/cdfs/cdfs-2.6.27.ebuild b/sys-fs/cdfs/cdfs-2.6.27.ebuild
index a97b5d5ab2e8..5a7cd081f328 100644
--- a/sys-fs/cdfs/cdfs-2.6.27.ebuild
+++ b/sys-fs/cdfs/cdfs-2.6.27.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/cdfs-2.6.27.ebuild,v 1.3 2010/06/15 07:26:00 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/cdfs-2.6.27.ebuild,v 1.4 2012/02/25 12:36:04 pacho Exp $
+
+EAPI=4
 
 inherit eutils linux-mod
 
@@ -18,10 +20,8 @@ CONFIG_CHECK="BLK_DEV_LOOP"
 BUILD_TARGETS="all"
 BUILD_PARAMS="KDIR=\"${KERNEL_DIR}\""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.6.19-kernel-2.6.22.patch
 	epatch "${FILESDIR}"/${P}-kernel-2.6.28.patch
+	epatch "${FILESDIR}"/${P}-kernel-2.6.39.patch
 }
diff --git a/sys-fs/cdfs/files/cdfs-2.6.27-kernel-2.6.39.patch b/sys-fs/cdfs/files/cdfs-2.6.27-kernel-2.6.39.patch
new file mode 100644
index 000000000000..c61be073bbf1
--- /dev/null
+++ b/sys-fs/cdfs/files/cdfs-2.6.27-kernel-2.6.39.patch
@@ -0,0 +1,26 @@
+--- root.c.old	2011-12-12 20:07:18.000000000 +0800
++++ root.c	2011-12-12 20:10:38.000000000 +0800
+@@ -597,7 +597,10 @@
+ #ifdef OLD_KERNEL
+ static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount);
+ #else
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
++static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
++  return mount_bdev(fs_type, flags, dev_name, data, cdfs_fill_super);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+ static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
+   return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
+ #else
+@@ -609,7 +612,11 @@
+ static struct file_system_type cdfs_fs_type = {
+   .owner    = THIS_MODULE,
+   .name     = "cdfs",
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
++  .mount    = cdfs_get_sb,
++#else
+   .get_sb   = cdfs_get_sb,
++#endif
+   .kill_sb  = kill_block_super,
+   .fs_flags = FS_REQUIRES_DEV
+ };