diff options
| -rw-r--r-- | sys-kernel/zen-sources/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-kernel/zen-sources/Manifest | 34 | ||||
| -rw-r--r-- | sys-kernel/zen-sources/zen-sources-2.6.34_p1-r2.ebuild (renamed from sys-kernel/zen-sources/zen-sources-2.6.34_p1-r1.ebuild) | 16 | ||||
| -rw-r--r-- | sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild | 22 |
4 files changed, 40 insertions, 42 deletions
diff --git a/sys-kernel/zen-sources/ChangeLog b/sys-kernel/zen-sources/ChangeLog index d2b825efb321..83b46bc4a196 100644 --- a/sys-kernel/zen-sources/ChangeLog +++ b/sys-kernel/zen-sources/ChangeLog @@ -1,6 +1,14 @@ # 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.39 2010/07/07 12:18:20 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.40 2010/07/27 14:03:21 wired Exp $ + +*zen-sources-2.6.34_p1-r2 (27 Jul 2010) + + 27 Jul 2010; Alex Alexander <wired@gentoo.org> + zen-sources-2.6.34_p1.ebuild, -zen-sources-2.6.34_p1-r1.ebuild, + +zen-sources-2.6.34_p1-r2.ebuild: + new revision with updated bfq patch. bug #327415. removed bfq from + 2.6.34_p1. switched to EAPI 2. *zen-sources-2.6.34_p1-r1 (07 Jul 2010) diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest index 5ba1ffd8813c..5f0f0a0368c1 100644 --- a/sys-kernel/zen-sources/Manifest +++ b/sys-kernel/zen-sources/Manifest @@ -6,7 +6,7 @@ AUX zen-sources-2.6.31_p5-config_fb_fix.patch 416 RMD160 30c076002b76ee99bffca08 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 0003-block-introduce-the-BFQ-I-O-scheduler-r1.patch 150480 RMD160 a6afc22b3aca8a47d79aba69874267dd1a40a794 SHA1 3cb8f59b88b4fdc64417e52eaa5c56422919168f SHA256 e41b2a88dde9afd01c1a66f5e9aa5ec0daf1f15c11d58d0f8a69668fbfb99907 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 @@ -34,25 +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-2.6.34_p1-r2.ebuild 2213 RMD160 0ec248377d1dab3de351bb18fcd113c124b2da80 SHA1 0ec260b21c932b7e2037c8fd92498774e55d5bb9 SHA256 4e77213a9ae544772ad192d0249899571fd46eac8c68f3d68404cb89cdb5ce03 +EBUILD zen-sources-2.6.34_p1.ebuild 1473 RMD160 0f93ab0e0425834008304603b7451b69231c1ab5 SHA1 f3e719625ddd4058d75a2763a4c1899b62b530fe SHA256 5d91227cb99fd6c53b6ede72a990760aa7136415d31a6ac4d37d6eaa1f1cab4a EBUILD zen-sources-9999.ebuild 1500 RMD160 df7214a80912508665dae186eaa16e1a8208f614 SHA1 8be3a20a092e471efcbd38a54e65d6fcd627d765 SHA256 06319ca9f5485495bf0a66bc188aad54d9a722ca1aadaac050020795271900f8 -MISC ChangeLog 9958 RMD160 a1afee8a5e0027b761dca2d003bb4f107769c61b SHA1 d6565d538a79b98a8ae3f52dedf9119924a0a844 SHA256 c977370a68fcfc1ce626c1e6011817533fdddd1582bbc623c86530bac53e94fc +MISC ChangeLog 10253 RMD160 5bbbfcf8c0aa47189abe1126e67d2e77827186c7 SHA1 c6c7837e2225c885ff15085f046bfa0d6e532095 SHA256 46b0e05f5304160f42032062467586ed6fce503455a206dbf2bb67e8de3d22f0 MISC metadata.xml 601 RMD160 158ddb5e66c5148cbe83be32ab4927f53eddecf6 SHA1 f54289a02a556d1a6c72d09f69802a708c56ebc2 SHA256 0ac54bafd7b250c5c41666efa9e1a3842c4bf06bc1e69d0b2e18f12c350fb213 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (GNU/Linux) -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 +iQIcBAEBCAAGBQJMTufxAAoJEDZF8K7rm0r6glAP/iLeE/vLfu98kEfqb2S8l9Gi +VbHGQ+0TsdoqnyPwoeKUk/91+SXeF3z8D/3EuI/Rrbn5233K1acAVKsPAmZZjbT/ ++BAVqNNy/RKdyx6b0i3q7bdsV7sAH7jRZcjCBxSUG8BMDtXglEfJlLQ4jpEcSLlE +xtndtayTkmjavW7nS79aKkcvi/0DEY26JESBntVReFv7zwYN0lgWErJ+1A3szm8y +MZxK9QowboiHT0JruBdZPfWH8ezs55d6K4f08Hwq2DRgS1fJYStD69JbU+9f8pmi +9V99gd2MfDRRidUQzxIHL1AwooFqJjSIliDc6OnZYErZPeLlHtCdD9UFKjWAgJfp +9ZA/MlvJfHJ97lhl1rh9kmKDKnOM6crr5QnLt42clhSPCmZSMTCDkhe390vgEVtq +2fWe2GBed2hAAZ3a1dl5h5nSKwqROwKDIMW385zKQAn2d2nQIIXnnj4ijVlzPYit +5TXr3fJve0YNcBwfZ0GGaAp4zkbyc5Jeiia/BO7k5FKhPntiDrk8Y1Rklo7/e2Mg +IYEXgYvwBlHFItEomWrPVHAGNU2lc1yBEmNqftPVA/Zsu7895Pr9mfBEboHa1YOu +QLix6OorM5IbWoaSv5gHu8ZiP1/weFLbqK88ZN3LMDAqYzRR9wrrzo0ccAJ09FEU +8WIvx6iEdUltLBcYI+f8 +=19Jv -----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-r2.ebuild index fa5008fcf510..029c8ba8a994 100644 --- a/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r1.ebuild +++ b/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r2.ebuild @@ -1,6 +1,8 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r2.ebuild,v 1.1 2010/07/27 14:03:21 wired Exp $ + +EAPI="2" COMPRESSTYPE=".lzma" K_USEPV="yes" @@ -24,7 +26,7 @@ ZEN_URI="http://downloads.zen-kernel.org/$(get_version_component_range 1-3)/${ZE 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 + http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0003-block-introduce-the-BFQ-I-O-scheduler.patch -> 0003-block-introduce-the-BFQ-I-O-scheduler-r1.patch " SRC_URI="${KERNEL_URI} ${ZEN_URI} bfq? ( ${ZEN_PATCHES} )" @@ -47,15 +49,13 @@ pkg_setup(){ kernel-2_pkg_setup } -src_unpack(){ - kernel-2_src_unpack - cd "${S}" +src_prepare(){ epatch "${DISTDIR}"/"${ZEN_FILE}" if use bfq; then EPATCH_OPTS="-p1" - for p in ${ZEN_PATCHES}; do - epatch "${DISTDIR}/${p/*\/}" - done + epatch "${DISTDIR}/0001-block-prepare-I-O-context-code-for-BFQ.patch" + epatch "${DISTDIR}/0002-block-add-cgroups-kconfig-and-build-bits-for-BFQ.patch" + epatch "${DISTDIR}/0003-block-introduce-the-BFQ-I-O-scheduler-r1.patch" fi } 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 9b4a777fd2ab..3fcfd04fab7d 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,8 @@ # 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.2 2010/07/07 08:04:05 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild,v 1.3 2010/07/27 14:03:21 wired Exp $ + +EAPI="2" COMPRESSTYPE=".lzma" K_USEPV="yes" @@ -21,15 +23,10 @@ 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} )" +SRC_URI="${KERNEL_URI} ${ZEN_URI}" KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86" -IUSE="bfq" +IUSE="" DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )" @@ -47,15 +44,8 @@ pkg_setup(){ kernel-2_pkg_setup } -src_unpack(){ - kernel-2_src_unpack - cd "${S}" +src_prepare(){ 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: \ |