zen-sources: fixed bfq patch not applying properly

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 85 insertions, 15 deletions

diff --git a/sys-kernel/zen-sources/ChangeLog b/sys-kernel/zen-sources/ChangeLog
index 51757a7d17d3..d2b825efb321 100644
--- a/sys-kernel/zen-sources/ChangeLog
+++ b/sys-kernel/zen-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/zen-sources
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.38 2010/07/07 08:04:05 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.39 2010/07/07 12:18:20 wired Exp $
+
+*zen-sources-2.6.34_p1-r1 (07 Jul 2010)
+
+  07 Jul 2010; Alex Alexander <wired@gentoo.org>
+  +zen-sources-2.6.34_p1-r1.ebuild:
+  fixed bfq patch not applying properly
 
   07 Jul 2010; Alex Alexander <wired@gentoo.org>
   zen-sources-2.6.34_p1.ebuild, metadata.xml:
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index ee0e80c45ca8..5ba1ffd8813c 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -34,24 +34,25 @@ EBUILD zen-sources-2.6.33_p1.ebuild 1496 RMD160 82631bfda101b012711e2f908f16e362
 EBUILD zen-sources-2.6.33_p2-r1.ebuild 1609 RMD160 744a37da9c72e8180397fc93dbf7120566178756 SHA1 f6d227aa94ca9f70a7dae0dce5dd648d2b080642 SHA256 63fbf71179b8b8ff930419c1298769a1df5b08ea2e7565a525803a03cd18edc1
 EBUILD zen-sources-2.6.33_p2.ebuild 1494 RMD160 45cce0b45a51e82c6680dc4d2f82ec09139a50c0 SHA1 feddd300d07138e6c21550bba909d8edee4e1e4a SHA256 2b68d0759ba19213ad5212e9db987e48b16badbe924afc314c4a609184302579
 EBUILD zen-sources-2.6.33_p3.ebuild 1497 RMD160 c534f8631d63c8f55544610f0ec2c4b5e7760393 SHA1 4dd64a5750612b6a3de8efba07d0bd6284ba195e SHA256 ed21c5c8b1bf29644c416146658fe577778fd397adbc468c9f482a5e33ed7b83
+EBUILD zen-sources-2.6.34_p1-r1.ebuild 2020 RMD160 769b4c095b9b408c3f3a3551a938d9272e5c22e6 SHA1 67501032e5ece3ef6ef8bb4d9b1cbfa4541d310a SHA256 b90691827f6c8f15c43920419d88889e0e23936845710613fdea0433c6a68278
 EBUILD zen-sources-2.6.34_p1.ebuild 1997 RMD160 8a2b7f630312be6235099db0a4bec0487cb513e2 SHA1 454dfc93c255de5910beb1e5e6ff783cdde3d93f SHA256 4c079a73304af89112971bf13eb7421d6a2968d9f7769cbfa5c3f2bfd43c8e4f
 EBUILD zen-sources-9999.ebuild 1500 RMD160 df7214a80912508665dae186eaa16e1a8208f614 SHA1 8be3a20a092e471efcbd38a54e65d6fcd627d765 SHA256 06319ca9f5485495bf0a66bc188aad54d9a722ca1aadaac050020795271900f8
-MISC ChangeLog 9791 RMD160 1bbead4bf65f28c507c67a9b050ea5a888e1254f SHA1 8910ba6165c68b2c2edcb629531b497786e4cbe6 SHA256 cf79717cf23f74796d18955d8eb60aaff3ff85dade5eed53485715f7da4b488b
+MISC ChangeLog 9958 RMD160 a1afee8a5e0027b761dca2d003bb4f107769c61b SHA1 d6565d538a79b98a8ae3f52dedf9119924a0a844 SHA256 c977370a68fcfc1ce626c1e6011817533fdddd1582bbc623c86530bac53e94fc
 MISC metadata.xml 601 RMD160 158ddb5e66c5148cbe83be32ab4927f53eddecf6 SHA1 f54289a02a556d1a6c72d09f69802a708c56ebc2 SHA256 0ac54bafd7b250c5c41666efa9e1a3842c4bf06bc1e69d0b2e18f12c350fb213
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iQIcBAEBCAAGBQJMNDWkAAoJEDZF8K7rm0r65mgP+QEHTUEhZl8hYWrkAkWl1rNy
-iNHAH7G3xpKyDHbo97lPGzr4rSATFXI2EXer3N4acGgSkTdHao8nj+AFgxGIfCIV
-h1nYVy3Uz8AdcHKdx0miLd183GWweHYl1WgUhiWhHqFt2UJftZ69vl9y14QGeWVD
-1ycM+7h8MCBryPrmLRiZUhZn0zybh+1eKQnZzcdlQG0WpjxKq0ejG69Fx8v9mmS6
-nk1uQC7ndEJ7tp+dVLAgns42I4G8nq9XeL9ZoomExerDs184zIqQUCCtSYedpchF
-VVJILK6KMt7yb/69GIZ6s/EtuYd3E/pr5lyT5AyqZWH/oUf9udbeXJ+V/k22d3Cq
-Tbe435E+SenD92aK3NvpIoJN8mIH7aySgpmrHRFo43FQoceGLikDokh047xOa8Jx
-8I+UO9o+hsgX5mv7+htOaIaSs7V75sVYpDOvknTKDuufxixaTIdIbCHwS0pji9k7
-7ZJof9plUf1D5Zl/s413VdWewP8tu+6erffyVPQr/MvPIAyWt8O044F4AtUgiX2N
-kM5w3i3fHtsJtZBEszbJ5PgCuGeIbKu6x6tiovSLzBXtLMeaNpCXATMkIDIk91xp
-q24v6/xI3fhtinddfPTBanJGxyFvdbhmZEtbncFmmjWmkqj8UVmjvVyc7PVXgrAn
-PIEyTnvw8d8Mp4+7r3Pq
-=pSkP
+iQIcBAEBCAAGBQJMNHE6AAoJEDZF8K7rm0r6htoP/Rgff7NHau8H1H1GPmPSDmqA
+8wPXekzAenh/dyQDD8NIpBMwAFk+2To6oTR5X8WqWLoJuC6BhmuvJ63zqQMEAVHA
+cgICxxChzPUEGgSbnUXLnmrw4yvUfDISFu905nGIP6YU80K6tHitkGamupYdQBff
+hkqSMFxmDZAPnzscj2yBpbLK3q33dzS1GnccixXJCOXHrz3cuqEkAqcxym/zEdDx
+rUCZJMCynH4QqrDoxQ3IfpPZM24bOW45bPGNOA7SzURYxyFtgV8y6RLrvDVYxX9o
+sx8545Yoxv5H5DM00AnRMtOChBpThEhOlWnz1rKCSi/okvwzjSXaz3eFRRudWfBv
+O3dPjwkU07yiLXgqJvXaBSBcT2R5rjcOFyEx4CWDtmMfRwJnvf4mDhOFBozLYl+X
+gPmlVX+fyNVQp0gJ/bcAOyM2ThNP4PhKcdA0sqmkJWjuW4cwStKJ+JiRk5s+tOfV
+P6rzJ/Ufb0kp3HXvZA6sILI088wWEb3oEePbBpifiX0eb3GA55//T5zDOBPJg/U/
+Oys24IDujt5wZ01+N9iBEESKyYhl02Mn2dHN6KpKDw76b9ubLRL9Rc+JCm02LMZN
+UrswvPb1GXNtE31TsHdOXu1hg5QEHjrh2MXbMwRSBZiPgCG/NkKpjA1k1Y+go+P2
+8f98BM59bQ4gM/TCb/6f
+=e5qE
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r1.ebuild b/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r1.ebuild
new file mode 100644
index 000000000000..fa5008fcf510
--- /dev/null
+++ b/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r1.ebuild,v 1.1 2010/07/07 12:18:20 wired Exp $
+
+COMPRESSTYPE=".lzma"
+K_USEPV="yes"
+UNIPATCH_STRICTORDER="yes"
+K_SECURITY_UNSUPPORTED="1"
+
+CKV="${PV/_p[0-9]*}"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+K_NOSETEXTRAVERSION="don't_set_it"
+
+DESCRIPTION="The Zen Kernel Sources v2.6"
+HOMEPAGE="http://zen-kernel.org"
+
+ZEN_PATCHSET="${PV/*_p}"
+ZEN_KERNEL="${PV/_p[0-9]*}"
+ZEN_KERNEL="${ZEN_KERNEL/_/-}"
+ZEN_FILE="${ZEN_KERNEL}-zen${ZEN_PATCHSET}.patch${COMPRESSTYPE}"
+ZEN_URI="http://downloads.zen-kernel.org/$(get_version_component_range 1-3)/${ZEN_FILE}"
+ZEN_PATCHES="
+	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0001-block-prepare-I-O-context-code-for-BFQ.patch
+	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0002-block-add-cgroups-kconfig-and-build-bits-for-BFQ.patch
+	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0003-block-introduce-the-BFQ-I-O-scheduler.patch
+"
+SRC_URI="${KERNEL_URI} ${ZEN_URI} bfq? ( ${ZEN_PATCHES} )"
+
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bfq"
+
+DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )"
+
+KV_FULL="${PVR/_p/-zen}"
+S="${WORKDIR}"/linux-"${KV_FULL}"
+
+pkg_setup(){
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the Zen developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	ebeep 8
+	kernel-2_pkg_setup
+}
+
+src_unpack(){
+	kernel-2_src_unpack
+	cd "${S}"
+	epatch "${DISTDIR}"/"${ZEN_FILE}"
+	if use bfq; then
+		EPATCH_OPTS="-p1"
+		for p in ${ZEN_PATCHES}; do
+			epatch "${DISTDIR}/${p/*\/}"
+		done
+	fi
+}
+
+K_EXTRAEINFO="For more info on zen-sources and details on how to report problems, see: \
+${HOMEPAGE}. You may also visit #zen-sources on irc.rizon.net"