From: Stefan Schweizer Date: Mon, 5 Feb 2007 08:07:41 +0000 (+0000) Subject: Add 2.6.20 patch, bug 159573 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f72283f8f8630e944e317a6d3f11c2074a75ea48;p=gentoo.git Add 2.6.20 patch, bug 159573 Package-Manager: portage-2.1.2-r7 --- diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog index 010e2caa8d78..8c72706aa510 100644 --- a/sys-fs/fuse/ChangeLog +++ b/sys-fs/fuse/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/fuse # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.71 2007/01/24 07:31:00 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.72 2007/02/05 08:07:41 genstef Exp $ + + 05 Feb 2007; +files/fuse-2.6.20.patch, + fuse-2.6.1.ebuild: + Add 2.6.20 patch, bug 159573 24 Jan 2007; +files/fuse.init, fuse-2.6.1.ebuild: Gentooify init script thanks to David B. Ferguson diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest index e9292761f496..a5f416cb43fa 100644 --- a/sys-fs/fuse/Manifest +++ b/sys-fs/fuse/Manifest @@ -2,6 +2,10 @@ AUX fuse-2.6.0_rc3-no-mknod.patch 476 RMD160 c21064b080b70fb3757638b4e98e5d83a25 MD5 69d0114b2cdbf042c20325071bf6db38 files/fuse-2.6.0_rc3-no-mknod.patch 476 RMD160 c21064b080b70fb3757638b4e98e5d83a25a9d57 files/fuse-2.6.0_rc3-no-mknod.patch 476 SHA256 a9181c2e453680680105eb3799806eb2f5a54094568c1998f843651a34ce82fc files/fuse-2.6.0_rc3-no-mknod.patch 476 +AUX fuse-2.6.20.patch 1443 RMD160 06847bb8d4442d88132237dc21924bf8c4f79bf2 SHA1 71e410ef0b8e02254c3e7d9ec875009327b65c08 SHA256 41c931e893fcb21a266581f72161c6ec747e41572ba750926105e324ae815a17 +MD5 29d96bad0ea391dc858beecfae58bee9 files/fuse-2.6.20.patch 1443 +RMD160 06847bb8d4442d88132237dc21924bf8c4f79bf2 files/fuse-2.6.20.patch 1443 +SHA256 41c931e893fcb21a266581f72161c6ec747e41572ba750926105e324ae815a17 files/fuse-2.6.20.patch 1443 AUX fuse-fix-lazy-binding.patch 398 RMD160 e8663cdbf720378839bf3ac786a49a9927b81afe SHA1 59a923f6263e954a7db488021005448cefcc8f5a SHA256 d9733aaece65a0c864edbfebae205cdec096174165e943a569adb216ec73f9e1 MD5 c1ef6366ba5892111ddef08887328663 files/fuse-fix-lazy-binding.patch 398 RMD160 e8663cdbf720378839bf3ac786a49a9927b81afe files/fuse-fix-lazy-binding.patch 398 @@ -21,14 +25,14 @@ EBUILD fuse-2.6.0_rc1.ebuild 1853 RMD160 274fa3ae72a0b26d7b3cff35e8a89e09b7d8854 MD5 2651e3fce08d95f7fbb553838de1f1b8 fuse-2.6.0_rc1.ebuild 1853 RMD160 274fa3ae72a0b26d7b3cff35e8a89e09b7d88544 fuse-2.6.0_rc1.ebuild 1853 SHA256 5b0a3f2009a74a5cd0f27c5ee2de1fd3d96ffd308d6871092a8572a1c250dd59 fuse-2.6.0_rc1.ebuild 1853 -EBUILD fuse-2.6.1.ebuild 1899 RMD160 de6cdf6ea395b155f59829966895d7675eb3c2af SHA1 fe2b5d424d00e18ad46f548f556fb6383d49a524 SHA256 60ff7b48801d663ab55f86697bd576297d97c00bf9be18792a54911e57dc7e85 -MD5 331732ac60da779e9988f118890cd76e fuse-2.6.1.ebuild 1899 -RMD160 de6cdf6ea395b155f59829966895d7675eb3c2af fuse-2.6.1.ebuild 1899 -SHA256 60ff7b48801d663ab55f86697bd576297d97c00bf9be18792a54911e57dc7e85 fuse-2.6.1.ebuild 1899 -MISC ChangeLog 10276 RMD160 88101035948a3c071f391c2e06d3c93338eaa053 SHA1 088f735582d38a11699c015b78c37a8450610284 SHA256 a91d4ffeb2dda42c577292c34de01f7da56cb0f1a8043bc3afc589e6a4c2d02b -MD5 e8015562199d97cf1d45c2a7c17365de ChangeLog 10276 -RMD160 88101035948a3c071f391c2e06d3c93338eaa053 ChangeLog 10276 -SHA256 a91d4ffeb2dda42c577292c34de01f7da56cb0f1a8043bc3afc589e6a4c2d02b ChangeLog 10276 +EBUILD fuse-2.6.1.ebuild 2058 RMD160 e20dc6b9a357fa9771570544bbd377e318376819 SHA1 7590a9072dde50ee3dfe7062df1b2ceb7183de70 SHA256 824690cf5ee5537a1f6ba04123b3cb8fc31d5341a78990dd7418ee60d442dff4 +MD5 39849f219cca545147a9c2381532b880 fuse-2.6.1.ebuild 2058 +RMD160 e20dc6b9a357fa9771570544bbd377e318376819 fuse-2.6.1.ebuild 2058 +SHA256 824690cf5ee5537a1f6ba04123b3cb8fc31d5341a78990dd7418ee60d442dff4 fuse-2.6.1.ebuild 2058 +MISC ChangeLog 10391 RMD160 aa7e1d36b5e2b8c9204039adb4b733fd6239fa6b SHA1 87520a8468f2eb8847f3ae48663369fba14bd3a1 SHA256 b23d20b32ee7f054ea597e1947c0d0b6eb53292be567870394ccdd19065b572e +MD5 808fb1050bbd9297ce52365c502aab5b ChangeLog 10391 +RMD160 aa7e1d36b5e2b8c9204039adb4b733fd6239fa6b ChangeLog 10391 +SHA256 b23d20b32ee7f054ea597e1947c0d0b6eb53292be567870394ccdd19065b572e ChangeLog 10391 MISC metadata.xml 264 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 SHA1 310c846802ac0f01334ee8677c428e2962594d01 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 metadata.xml 264 diff --git a/sys-fs/fuse/files/fuse-2.6.20.patch b/sys-fs/fuse/files/fuse-2.6.20.patch new file mode 100644 index 000000000000..66b7df4dba9c --- /dev/null +++ b/sys-fs/fuse/files/fuse-2.6.20.patch @@ -0,0 +1,35 @@ +diff -Naud fuse-2.6.1/work/fuse-2.6.1/kernel/dev.c fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/dev.c +--- fuse-2.6.1/work/fuse-2.6.1/kernel/dev.c 2006-11-19 17:02:34.000000000 +0100 ++++ fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/dev.c 2006-12-30 18:52:07.000000000 +0100 +@@ -43,7 +43,7 @@ + + struct fuse_req *fuse_request_alloc(void) + { +- struct fuse_req *req = kmem_cache_alloc(fuse_req_cachep, SLAB_KERNEL); ++ struct fuse_req *req = kmem_cache_alloc(fuse_req_cachep, GFP_KERNEL); + if (req) + fuse_request_init(req); + return req; +diff -Naud fuse-2.6.1/work/fuse-2.6.1/kernel/file.c fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/file.c +--- fuse-2.6.1/work/fuse-2.6.1/kernel/file.c 2006-10-20 19:33:56.000000000 +0200 ++++ fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/file.c 2006-12-30 19:00:13.000000000 +0100 +@@ -501,7 +501,6 @@ + spin_unlock(&fc->lock); + + if (offset == 0 && to == PAGE_CACHE_SIZE) { +- clear_page_dirty(page); + SetPageUptodate(page); + } + } +diff -Naud fuse-2.6.1/work/fuse-2.6.1/kernel/inode.c fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/inode.c +--- fuse-2.6.1/work/fuse-2.6.1/kernel/inode.c 2006-11-28 15:04:45.000000000 +0100 ++++ fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/inode.c 2006-12-30 18:52:26.000000000 +0100 +@@ -52,7 +52,7 @@ + struct inode *inode; + struct fuse_inode *fi; + +- inode = kmem_cache_alloc(fuse_inode_cachep, SLAB_KERNEL); ++ inode = kmem_cache_alloc(fuse_inode_cachep, GFP_KERNEL); + if (!inode) + return NULL; + diff --git a/sys-fs/fuse/fuse-2.6.1.ebuild b/sys-fs/fuse/fuse-2.6.1.ebuild index 2dbd237c6fb6..01ea0cc8dae1 100644 --- a/sys-fs/fuse/fuse-2.6.1.ebuild +++ b/sys-fs/fuse/fuse-2.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.1.ebuild,v 1.4 2007/01/24 07:31:00 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.1.ebuild,v 1.5 2007/02/05 08:07:41 genstef Exp $ inherit linux-mod eutils libtool @@ -24,13 +24,18 @@ FUSE_FS_ERROR="We have detected FUSE already built into the kernel. We will continue, but we wont build the module this time." pkg_setup() { - use kernel_linux && linux-mod_pkg_setup + if use kernel_linux ; then + linux-mod_pkg_setup + kernel_is 2 4 && die "kernel 2.4 is not supported by this ebuild. Get an + older version from viewcvs" + fi } src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/fuse-fix-lazy-binding.patch + epatch "${FILESDIR}"/fuse-2.6.20.patch elibtoolize }