Add patch to compile with post-2.6.26 kernels

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo i686

4 files changed, 122 insertions, 2 deletions

diff --git a/sys-fs/btrfs/ChangeLog b/sys-fs/btrfs/ChangeLog
index 5a039f14d0de..b972bbcbcf47 100644
--- a/sys-fs/btrfs/ChangeLog
+++ b/sys-fs/btrfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/btrfs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/ChangeLog,v 1.11 2008/08/06 04:04:52 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/ChangeLog,v 1.12 2008/08/18 17:10:32 lavajoe Exp $
+
+*btrfs-0.16-r1 (18 Aug 2008)
+
+  18 Aug 2008; Joe Peterson <lavajoe@gentoo.org>
+  +files/btrfs-0.16-new-kernels.patch, +btrfs-0.16-r1.ebuild:
+  Add patch to compile with post-2.6.26 kernels
 
 *btrfs-0.16 (05 Aug 2008)
 
diff --git a/sys-fs/btrfs/Manifest b/sys-fs/btrfs/Manifest
index 54867ab2439a..0f7bd10828e0 100644
--- a/sys-fs/btrfs/Manifest
+++ b/sys-fs/btrfs/Manifest
@@ -1,9 +1,11 @@
 AUX btrfs-0.15-acl-disable.patch 1260 RMD160 3700cd0baa293d02ff2ec490e081e8919ee64119 SHA1 8c02e30e6b844e837d2ce31109a7e50739cc9522 SHA256 8b410a8eea96d54b5cfc3d683d7fae9d8f9f8fdbff008289e37380cdf16a6808
 AUX btrfs-0.15-r2-hotfix.patch 7478 RMD160 adb3238cf17e1af33b4ab17ee5ece40addec5995 SHA1 3e48fe2ea46d172cb6cf555ba5821e4cd15c20cf SHA256 2c7edfeea3f2e2ff746cd185b3692cb23019879862c87652399b35c81dbeb9d1
+AUX btrfs-0.16-new-kernels.patch 1829 RMD160 f1972f0670208438c35b538982f215abbf71c66f SHA1 b6b354260914d9fc95f61b17b1dfbf8ec499396b SHA256 ea4e13df40b912b85f1d620138f3aa96cafdc67d2627e4b7db02e93d9a72bb59
 DIST btrfs-0.15.tar.bz2 107545 RMD160 ad8fbe78395d1f425a769eec9719bb60b63b73e6 SHA1 37930ab229b9795db41b02e25713f886758f3b42 SHA256 f6e0d004c0c13d375718c3ab063e1386e8e6262d78f958b15fad13a8d301433e
 DIST btrfs-0.16.tar.bz2 125070 RMD160 9b448a06ce290ff9e5da58264e96842da2d4c69b SHA1 ae4cd2f3951523d81ef5ee61267ea58ee3cf8d87 SHA256 535838e2053e02ba15fdc6dada4ffdf9d639edc62b99c619f8e09cb4de6bae60
 EBUILD btrfs-0.15-r2.ebuild 1627 RMD160 9a19b5966c1118be0e09ee11ac2667ed9f56bb67 SHA1 b5a67561fc2d2efc03d2417ee70ee178940bdab6 SHA256 c153fd509c83f707b4ee8473c1f578ce7ffe9cd2fc0d0a6d53046a3fe7f1eaa3
+EBUILD btrfs-0.16-r1.ebuild 1677 RMD160 2cd1a22c83a28a121b5ee999c8e6381813ffda7f SHA1 ad35ff6f5054b876867c0ac9f15c126162cda2be SHA256 7634bd224c4e2945acf9f91490fd2ecf905da4598b4c374761581356a86b99ab
 EBUILD btrfs-0.16.ebuild 1629 RMD160 6f1c1c48d1334e84f640778826eb1c6e0839d585 SHA1 4ea59f227cfd4f80beb61eb7992a034f40525213 SHA256 f136a67297db62b2f9bdcb954e354c977aca1d89d1df9eb1fba9481ddc01ef9c
 EBUILD btrfs-9999.ebuild 1591 RMD160 08679e65eb8865374431b221aff40850c6b57b49 SHA1 0a6e5c58ebbb29217e1b65bb5e1c8d8010529825 SHA256 10c33ba11ddcadc3e406d0325bfabb8ebd214597e4598c8f8417c92109d8e325
-MISC ChangeLog 2096 RMD160 c91b245820c9eb7dda05a1d58614bb85bd755b77 SHA1 7b58609b1bab7fd54022a09838fafe5cb272e9de SHA256 1ee8e91d0fdd87f32821c65aea50a0385abe31495b6719e34423db5de6dbd9f9
+MISC ChangeLog 2286 RMD160 c3d21c8d98ff55fd6d7804388541080da1677030 SHA1 f8e6a8b7694422d848432df2daf4d0b744926fe3 SHA256 8dde0b17aaed74cacc9720cb8ce76c0077f2b0a1386bcde13ab774c0d7d84ca1
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
diff --git a/sys-fs/btrfs/btrfs-0.16-r1.ebuild b/sys-fs/btrfs/btrfs-0.16-r1.ebuild
new file mode 100644
index 000000000000..bd9773ca51dc
--- /dev/null
+++ b/sys-fs/btrfs/btrfs-0.16-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-0.16-r1.ebuild,v 1.1 2008/08/18 17:10:33 lavajoe Exp $
+
+inherit eutils linux-mod
+
+DESCRIPTION="A checksumming copy-on-write filesystem"
+HOMEPAGE="http://btrfs.wiki.kernel.org/"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+pkg_setup()
+{
+	linux-mod_pkg_setup
+
+	BUILD_TARGETS="all"
+	BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}"
+	MODULE_NAMES="btrfs(fs:${S}/"
+
+	if ! kernel_is 2 6; then
+		eerror "Need a 2.6 kernel to compile against!"
+		die "Need a 2.6 kernel to compile against!"
+	fi
+
+	if ! linux_chkconfig_present LIBCRC32C; then
+		eerror "You need to enable LIBCRC32C in your kernel!"
+		die "You need to enable LIBCRC32C in your kernel!"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Apply hot fixes
+	#epatch "${FILESDIR}/${P}-hotfix.patch"
+	epatch "${FILESDIR}/${P}-new-kernels.patch"
+}
+
+src_install()
+{
+	linux-mod_src_install
+
+	dodoc INSTALL TODO
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	ewarn "WARNING: Btrfs is under heavy development and is not suitable for"
+	ewarn "         any uses other than benchmarking and review."
+	ewarn "         The Btrfs disk format is not yet finalized."
+	ewarn
+	ewarn "         Also, it is highly recommended that the versions of"
+	ewarn "         btrfs and btrfs-progs match."
+	ewarn
+	ewarn "Note: THE DISK FORMAT HAS CHANGED!"
+	ewarn "      You must backup your data and re-create your btrfs"
+	ewarn "      filesystem(s) for use with this version."
+}
diff --git a/sys-fs/btrfs/files/btrfs-0.16-new-kernels.patch b/sys-fs/btrfs/files/btrfs-0.16-new-kernels.patch
new file mode 100644
index 000000000000..ef992a765453
--- /dev/null
+++ b/sys-fs/btrfs/files/btrfs-0.16-new-kernels.patch
@@ -0,0 +1,45 @@
+diff -Nurp /var/tmp/portage/sys-fs/btrfs-0.16/work/btrfs-0.16/compat.h ./compat.h
+--- /var/tmp/portage/sys-fs/btrfs-0.16/work/btrfs-0.16/compat.h	2008-08-05 12:13:37.000000000 -0600
++++ ./compat.h	2008-08-18 10:59:06.974647262 -0600
+@@ -1,6 +1,9 @@
+ #ifndef _COMPAT_H_
+ #define _COMPAT_H_
+ 
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,26)
++#define trylock_page(page) (!TestSetPageLocked(page))
++#endif
+ 
+ /*
+  * Even if AppArmor isn't enabled, it still has different prototypes.
+diff -Nurp /var/tmp/portage/sys-fs/btrfs-0.16/work/btrfs-0.16/ctree.h ./ctree.h
+--- /var/tmp/portage/sys-fs/btrfs-0.16/work/btrfs-0.16/ctree.h	2008-08-05 12:13:37.000000000 -0600
++++ ./ctree.h	2008-08-18 10:59:07.004646324 -0600
+@@ -1648,7 +1648,7 @@ int btrfs_csum_truncate(struct btrfs_tra
+ /* inode.c */
+ 
+ /* RHEL and EL kernels have a patch that renames PG_checked to FsMisc */
+-#ifdef ClearPageFsMisc
++#if defined(ClearPageFsMisc) && !defined(ClearPageChecked)
+ #define ClearPageChecked ClearPageFsMisc
+ #define SetPageChecked SetPageFsMisc
+ #define PageChecked PageFsMisc
+diff -Nurp /var/tmp/portage/sys-fs/btrfs-0.16/work/btrfs-0.16/extent_io.c ./extent_io.c
+--- /var/tmp/portage/sys-fs/btrfs-0.16/work/btrfs-0.16/extent_io.c	2008-08-05 12:13:37.000000000 -0600
++++ ./extent_io.c	2008-08-18 10:59:07.044650492 -0600
+@@ -14,6 +14,7 @@
+ #include <linux/pagevec.h>
+ #include "extent_io.h"
+ #include "extent_map.h"
++#include "compat.h"
+ 
+ /* temporary define until extent_map moves out of btrfs */
+ struct kmem_cache *btrfs_cache_create(const char *name, size_t size,
+@@ -3055,7 +3056,7 @@ int read_extent_buffer_pages(struct exte
+ 	for (i = start_i; i < num_pages; i++) {
+ 		page = extent_buffer_page(eb, i);
+ 		if (!wait) {
+-			if (TestSetPageLocked(page))
++			if (!trylock_page(page))
+ 				goto unlock_exit;
+ 		} else {
+ 			lock_page(page);