diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-01-08 13:59:40 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-01-08 13:59:40 +0000 |
| commit | 7634c94d152d3257973bd3c301db4234762ea24d (patch) | |
| tree | 205a00894030abc8f462c3571e878d90bcc674f6 /sys-fs/loop-aes | |
| parent | Delete older ebuild. (diff) | |
| download | gentoo-2-7634c94d152d3257973bd3c301db4234762ea24d.tar.gz gentoo-2-7634c94d152d3257973bd3c301db4234762ea24d.tar.bz2 gentoo-2-7634c94d152d3257973bd3c301db4234762ea24d.zip | |
Fix building with Linux 2.6.37 (bug #350781).
(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/loop-aes')
| -rw-r--r-- | sys-fs/loop-aes/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/loop-aes/files/loop-AES-v3.5b-20101231.diff | 39 | ||||
| -rw-r--r-- | sys-fs/loop-aes/loop-aes-3.5b.ebuild | 7 |
3 files changed, 49 insertions, 3 deletions
diff --git a/sys-fs/loop-aes/ChangeLog b/sys-fs/loop-aes/ChangeLog index 22bf5daa2a6c..aa4892e8da23 100644 --- a/sys-fs/loop-aes/ChangeLog +++ b/sys-fs/loop-aes/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/loop-aes # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/ChangeLog,v 1.67 2011/01/02 15:04:49 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/ChangeLog,v 1.68 2011/01/08 13:59:40 arfrever Exp $ + + 08 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + loop-aes-3.5b.ebuild, +files/loop-AES-v3.5b-20101231.diff: + Fix building with Linux 2.6.37 (bug #350781). 02 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> loop-aes-3.5b.ebuild: x86 stable wrt bug #350167 diff --git a/sys-fs/loop-aes/files/loop-AES-v3.5b-20101231.diff b/sys-fs/loop-aes/files/loop-AES-v3.5b-20101231.diff new file mode 100644 index 000000000000..b654127eae05 --- /dev/null +++ b/sys-fs/loop-aes/files/loop-AES-v3.5b-20101231.diff @@ -0,0 +1,39 @@ +--- ../loop-AES-v3.5b/loop.c-2.6b.patched 2010-11-11 08:09:58.000000000 +0200 ++++ ./loop.c-2.6b.patched 2010-12-30 08:27:16.000000000 +0200 +@@ -1306,7 +1306,11 @@ + blk_queue_segment_boundary(lo->lo_queue, PAGE_CACHE_SIZE - 1); + blk_queue_max_segments(lo->lo_queue, BLK_MAX_SEGMENTS); + blk_queue_max_hw_sectors(lo->lo_queue, BLK_SAFE_MAX_SECTORS); ++#if defined(QUEUE_FLAG_CLUSTER) + lo->lo_queue->queue_flags &= ~(1 << QUEUE_FLAG_CLUSTER); ++#else ++ lo->lo_queue->limits.cluster = 0; ++#endif + blk_queue_flush(lo->lo_queue, 0); + + /* +--- ../loop-AES-v3.5b/kernel-2.6.37-rc1.diff 2010-11-11 08:22:07.000000000 +0200 ++++ ./kernel-2.6.37-rc1.diff 2010-12-30 08:31:22.000000000 +0200 +@@ -76,8 +76,8 @@ + + diff -urN linux-2.6.37-rc1-noloop/drivers/block/loop.c linux-2.6.37-rc1-AES/drivers/block/loop.c + --- linux-2.6.37-rc1-noloop/drivers/block/loop.c 1970-01-01 02:00:00.000000000 +0200 +-+++ linux-2.6.37-rc1-AES/drivers/block/loop.c 2010-11-11 08:16:47.000000000 +0200 +-@@ -0,0 +1,3133 @@ +++++ linux-2.6.37-rc1-AES/drivers/block/loop.c 2010-12-30 08:27:16.000000000 +0200 ++@@ -0,0 +1,3137 @@ + +/* + + * linux/drivers/block/loop.c + + * +@@ -2456,7 +2456,11 @@ + + blk_queue_segment_boundary(lo->lo_queue, PAGE_CACHE_SIZE - 1); + + blk_queue_max_segments(lo->lo_queue, BLK_MAX_SEGMENTS); + + blk_queue_max_hw_sectors(lo->lo_queue, BLK_SAFE_MAX_SECTORS); +++#if defined(QUEUE_FLAG_CLUSTER) + + lo->lo_queue->queue_flags &= ~(1 << QUEUE_FLAG_CLUSTER); +++#else +++ lo->lo_queue->limits.cluster = 0; +++#endif + + blk_queue_flush(lo->lo_queue, 0); + + + + /* diff --git a/sys-fs/loop-aes/loop-aes-3.5b.ebuild b/sys-fs/loop-aes/loop-aes-3.5b.ebuild index 48d968cfe3a4..5d78ed10e69e 100644 --- a/sys-fs/loop-aes/loop-aes-3.5b.ebuild +++ b/sys-fs/loop-aes/loop-aes-3.5b.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.5b.ebuild,v 1.3 2011/01/02 15:04:49 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.5b.ebuild,v 1.4 2011/01/08 13:59:40 arfrever Exp $ EAPI="3" -inherit linux-mod +inherit eutils linux-mod MY_P="${PN/aes/AES}-v${PV}" @@ -47,6 +47,9 @@ pkg_setup() { src_prepare() { sed -e 's/make/$(MAKE)/g' -i Makefile || die "sed failed" + + # http://loop-aes.sourceforge.net/updates/loop-AES-v3.5b-20101231.diff.bz2 + epatch "${FILESDIR}/loop-AES-v3.5b-20101231.diff" } src_install() { |