zen-sources: added optional bfq patch

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

4 files changed, 45 insertions, 7 deletions

diff --git a/sys-kernel/zen-sources/ChangeLog b/sys-kernel/zen-sources/ChangeLog
index 5397acc52325..51757a7d17d3 100644
--- a/sys-kernel/zen-sources/ChangeLog
+++ b/sys-kernel/zen-sources/ChangeLog
@@ -1,6 +1,10 @@
 # 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.37 2010/06/23 20:40:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.38 2010/07/07 08:04:05 wired Exp $
+
+  07 Jul 2010; Alex Alexander <wired@gentoo.org>
+  zen-sources-2.6.34_p1.ebuild, metadata.xml:
+  added optional bfq patch
 
 *zen-sources-2.6.34_p1 (23 Jun 2010)
 
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index edb2237dd573..ee0e80c45ca8 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,6 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX powernow-k8-family10-model10_fix.patch 1365 RMD160 68c4ac1eb9d10aaa60d957bfa7a535bc242b2b90 SHA1 7363a0975573ae25609e45be87bdb0913963e195 SHA256 a9050bbc110a22d9412ca194100aaf0f19e5b5424bf75ae0e8e31dcb496f6fc3
 AUX zen-sources-2.6.31_p5-config_fb_fix.patch 416 RMD160 30c076002b76ee99bffca08a4a0f1346b52045c4 SHA1 7b36c837fc71c8929efcb335b9a7b13051730392 SHA256 cebc41750c46446d2edcfb506dc60a5bcc6f200bb7ecf499dc4db9b1fc45da74
 AUX zen-sources-2.6.33_rc2_p1-kernel-sysctl.c.patch 711 RMD160 76699719dc16cc697063b1f965d6e570283c5d20 SHA1 1ee4d7d9e8b60ea103727e056e84061e4ed827d1 SHA256 ac0b48dc3d1ea730bb4591bafb721802520608b8a77c95d59578ded7d574e8ae
+DIST 0001-block-prepare-I-O-context-code-for-BFQ.patch 7150 RMD160 7b527be679bd7dd8e6bf2da4897015c47bcd3e3e SHA1 ea10f40c10a6bccc647d1a59d5f4ea2f8d97db40 SHA256 aefb805538d43e23738b8c3d9e1f18dcb5a1cc63bd5aec76292368a6f009873c
+DIST 0002-block-add-cgroups-kconfig-and-build-bits-for-BFQ.patch 2978 RMD160 6faafd13bd51a05dfb2647aa2a48eb95ed670c9c SHA1 6608752f10289bb2682f20890568d987f3d1d3b9 SHA256 5b420b4e48abeafb98dd56e58741deee3727d82f569b4de9ad66a951e8db11f2
+DIST 0003-block-introduce-the-BFQ-I-O-scheduler.patch 150485 RMD160 8a627add36f29daf725b39ed9aef4a95da631a6d SHA1 d4d598da8063e73d8a5947f219b7b320406af932 SHA256 7f23a11797425efc300daaca5be6e4ec6f7a151a792df9edc2d8602ef7c2aa9e
 DIST 2.6.30-zen11.patch.lzma 1844571 RMD160 2dd6c496bd425c34399a631ffa84c5af273b894a SHA1 6fe33e05c1f608711bd9d1d9e92b6b861dd9ced1 SHA256 d7894256b08c9766252b0575fc1ac298791194a8f298bcc929643aa92cd31949
 DIST 2.6.31-zen12.patch.lzma 2043347 RMD160 06685aac849dc7cfd3a412c1ceaac56b8e406add SHA1 106ab0acdda6e03b99002c83897287726b8067e5 SHA256 8d45633592f439be873b4888cb263f5011bced2f14607b64ef80961b2b8185e0
 DIST 2.6.32-zen6.patch.lzma 1347329 RMD160 0ec3fd0d2f3f7bcacd6777266e9c70b1243dd8d6 SHA1 1752ecfe172ac78a5a6d0409e5f28e4861ac1b1a SHA256 187558571dbddeb33a5d7aca3f65b421cde3642457f7d2520ab0f1bfcd4187b7
@@ -28,7 +34,24 @@ 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.ebuild 1497 RMD160 337ab38530ac7d7dcab4182687cb832f7843b3ee SHA1 ba541fe2eb62c36c42508e1a47f77fb5a0df2025 SHA256 c947b286baf1a31f61a0b9c8b65827f32d9b4c591b21705ee84cf21202dcadfa
+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 9671 RMD160 16a9ad22e434a6bab8c4ad0f3cb938fb2ddfa5a8 SHA1 f9392120062c2c688b01d34384f35fbddcf64c09 SHA256 835371c7a3191d239e5024a4c5ebd3701455171b3b53c1505776ae1558278fc1
-MISC metadata.xml 511 RMD160 53c16cae3eb78b74c5e806589c5dbe5330ce27f7 SHA1 1929871223eb271dc366bd149be6e5ccdc0a326a SHA256 08dc24a26fe1498ff2fb805aebecc1f14c8a4c5c33b1aebf99de20366b16fc48
+MISC ChangeLog 9791 RMD160 1bbead4bf65f28c507c67a9b050ea5a888e1254f SHA1 8910ba6165c68b2c2edcb629531b497786e4cbe6 SHA256 cf79717cf23f74796d18955d8eb60aaff3ff85dade5eed53485715f7da4b488b
+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
+-----END PGP SIGNATURE-----
diff --git a/sys-kernel/zen-sources/metadata.xml b/sys-kernel/zen-sources/metadata.xml
index 4f5d2cfeee27..42265cf31942 100644
--- a/sys-kernel/zen-sources/metadata.xml
+++ b/sys-kernel/zen-sources/metadata.xml
@@ -11,6 +11,7 @@
 	<name>Alex Alexander</name>
 </maintainer>
 <use>
+	<flag name="bfq">Make the BFQ IO Scheduler available by applying upstream patches</flag>
 	<flag name="stable">Clone stable git tree</flag>
 	<flag name='deblob'>Remove binary blobs from kernel sources to provide libre license compliance.</flag>
 </use>
diff --git a/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild b/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild
index 10e0796ac97d..9b4a777fd2ab 100644
--- a/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2010/06/23 20:40:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild,v 1.2 2010/07/07 08:04:05 wired Exp $
 
 COMPRESSTYPE=".lzma"
 K_USEPV="yes"
@@ -21,10 +21,15 @@ 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}"
-SRC_URI="${KERNEL_URI} ${ZEN_URI}"
+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=""
+IUSE="bfq"
 
 DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )"
 
@@ -46,6 +51,11 @@ src_unpack(){
 	kernel-2_src_unpack
 	cd "${S}"
 	epatch "${DISTDIR}"/"${ZEN_FILE}"
+	if use bfq; then
+		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: \