commit: b03f2553bf4d45690a0c1e37a0d54512b182e119 Author: kuzetsa <kuzetsa <AT> gmail <DOT> com> AuthorDate: Fri Mar 31 23:10:20 2017 +0000 Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> CommitDate: Sat Apr 1 06:23:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b03f2553
sys-kernel/ck-sources: v.bump (4.9.20 & 4.10.8) Package-Manager: Portage-2.3.3, Repoman-2.3.1 sys-kernel/ck-sources/Manifest | 6 ++ sys-kernel/ck-sources/ck-sources-4.10.8.ebuild | 60 ++++++++++++++++ sys-kernel/ck-sources/ck-sources-4.9.20.ebuild | 96 ++++++++++++++++++++++++++ 3 files changed, 162 insertions(+) diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest index e494ed29bff..43af36fffc0 100644 --- a/sys-kernel/ck-sources/Manifest +++ b/sys-kernel/ck-sources/Manifest @@ -15,6 +15,9 @@ DIST genpatches-4.10-6.extras.tar.xz 17352 SHA256 2e5ff399880724d82b96df31a6832c DIST genpatches-4.10-7.base.tar.xz 136436 SHA256 c7e29f5a1e51d28e4375e491bf4a7735fb486098d80e2110a5eeac9adf09fb5d SHA512 fc469b6dcc08c26b28ef13ac8f13fa2e24db66d0d8e164fd5ded36679464db87d28b810290d0c5f275f918c115a1c80d7e48b7cdac0a067a9586a2c751f035a2 WHIRLPOOL 139e2343d3c19630d909387e44d99dd292b0cfae8927c9b665e26bbb01370b2feb8e5023a7d3bfffd4b84913fcd4a3d1b966f8347fc9b6071b7c7e89c621db1f DIST genpatches-4.10-7.experimental.tar.xz 105420 SHA256 86adde54281381f7795fc5114d7c763d2a81d936870c77b80e4039ca687d124c SHA512 ba7f0395da98fb21717f8fa895bbe5b7c23c2982804371c7c9587dc4f9af9a462af3c034adde9517726d96948ab8227b97c1bb59cb8d8b74eb3e42fb3642eaeb WHIRLPOOL b494e137c93a19ed7784daad706f8afae2c83f26085a0b56163d0a188565d323010fe59b4f9bf8c9da387d3bd2da03830221f1ca351852eb8e79be0d47410256 DIST genpatches-4.10-7.extras.tar.xz 17352 SHA256 91ac2b1add9a0a7129b1358cd731999b4dd4f2ae3f0438e74b9b1bf3c580a6c4 SHA512 f734a880ec55892b86274ab1b01dbd78d2301b321a36cf6de9e6fc9927a8e03c034ef873a84dd445f29274def7247bd606ffad5e16124bc848fd04c906678d02 WHIRLPOOL 0e3692fc1cb71ba7dd5a4cc45dbce1bdbc0a6793a4f7e82ad2a203a4501f9386d97886196d54216633725c7b112319908716090f5381373f527e13a9d18f5841 +DIST genpatches-4.10-8.base.tar.xz 177928 SHA256 d2a1baa7500946ad36849709bcc0430836fc9c050e0b85b094eb3de4f6a4a5e8 SHA512 38a0323484c88d1767962bb4327253e7aa47724f6f57e7fa94d559025c57bcceafaec4c5f6d13b1c2dc7e9cd80a917b8017d6cf1aac88c1212caf9cbd13cd7cd WHIRLPOOL c7503ceb8f870cf4fe2bf88f2ceb8b72b206c15d6e3d6fb8efe8198f8e8818eaf07a24e80969477f64b5ab9103f23bda1e152a3085f401305fe5f54520335356 +DIST genpatches-4.10-8.experimental.tar.xz 105420 SHA256 1018517fff821f903912e118a5490c9513da476892aa72dca01f650a8920e951 SHA512 1f498c23affa95d2ba77588d178c09c2181c24e35ebd57ccd18ae48db9155c56b19ab48c39dba7dc98530881a29b64233015cf4c290f2c23432611bee58d64d6 WHIRLPOOL ac48d4c8a18222e968e2e553569733a462f847331ad99cdffcd2d9e919a415dd0140adaa80ba98d75123bd3df2e6439466628973a650e7b82fba406664a8babb +DIST genpatches-4.10-8.extras.tar.xz 17348 SHA256 3444b846c3232541152db3bb2d9ff5aa66c7c7249d346fd990ed304489e19d02 SHA512 a655184d0dfc4327a18b8e170bfad077818b7064d4c3b682c478835f297fac1d1f3cc3c611111f51275a9a5edabdfe7837954e7ab112b0480c60b1936a37b35e WHIRLPOOL 360df1ae85469913c9236147e2f5e4d38f1e109a35d4961a2cab271ef79049101680058c5a99430829de7e895ef5ca89e81a59dbf83deccb5d49daca4d1d5159 DIST genpatches-4.9-17.base.tar.xz 375092 SHA256 aa60be6abf48139e2f4646aa66a3f146bde37d06abbf2e5682986e480f11f3ac SHA512 1944972a8bb3677ea5cf8314757bc0eb970abea41b0ea923f83eb88fd99aaccb98112f24147542bae39c0da913f7c3be607980fa5fcacbb3a0c3e65ee2c178e1 WHIRLPOOL c876ee565d2171c7877e1a80f0500a5e3b8dc51c079133b32c82c33d1799c4600a25a96fa84f5636ff3391d18ac0f989c3784a2f885d0f66aec4d45d21e06a63 DIST genpatches-4.9-17.experimental.tar.xz 105612 SHA256 2236ccc47ac7e0b7e77fd062de9adfb9f95ed44db26fed794965c4226e076249 SHA512 13ff54171516aeee99ef5643c6b486c3069184ac3f71012185fffad71ba822a42aa97651ff3a777c12748e5ce1555a60dd5cb560f34a0931911732f5fdbf9719 WHIRLPOOL 6d13a08ee0f5771307faceff5f5131a8958531efe9c9e3c3596825181bc42d990317f916fd038587b3bf6861d5cc7414a6b95537bca163a27db564f3bbc30165 DIST genpatches-4.9-17.extras.tar.xz 17352 SHA256 7a61c27163b6f0b5f517a819b31ece63ce72a8dac00a1df750e0b80c652a3fc7 SHA512 cbc2c679741499b509102c95ff7f2ae9964cd3ab75c4f2902239573114dfdc0c676d9ff6922035ab39f141ef3d815224651b1d4d63280afad7e2a970cf146651 WHIRLPOOL 0e816fe3675bf26270d6be3c2f1188ba3e1048fe4b8c9b3b00867bac584dfdf2f905442977d87a4e4ca877bb9a1fd3144f7a9637d6e5c061a15fbfb249a391d3 @@ -27,6 +30,9 @@ DIST genpatches-4.9-19.extras.tar.xz 17348 SHA256 21a0716823ebe74c997fdbf56e8037 DIST genpatches-4.9-20.base.tar.xz 427100 SHA256 a7346ab49ac9eae72b627b3779c29dd636b4c412473a0bfe35d91678c6a4d853 SHA512 0b9773d58f6e140e55bd6d3d46e144e4273d7b313958fdcd21b4eb8e8294b18164d95203259eddf6bdd4485c20b1f57cdd863ad313235207c05d894551bd15e6 WHIRLPOOL ad5fc950eb886024d914973dd49a4077672ef0fde90a437f82912318ac433f624533291fc3307c1fb189f0588ca52a56e000d10538d412634451f4015ebcc989 DIST genpatches-4.9-20.experimental.tar.xz 106416 SHA256 ba236b5f039288d762956146600f133fcba58e90ab3dbd30c799ac6e75fe2cb3 SHA512 d863fd523d0633f78c1b1e911d1714511b43818117296a265e6b58f9c258aa045d8b09562856d84ea3dadb8814e8e73517c653d878f03082fa4c4e7679a44bb7 WHIRLPOOL 8aeff2374985d07933099f11ed391c0cb9ff35273d183602563e10cda3546a03699edadac78df8003fdbb7ed3830ff4b2b7246a0527e712d75641d7650833975 DIST genpatches-4.9-20.extras.tar.xz 17352 SHA256 91ac2b1add9a0a7129b1358cd731999b4dd4f2ae3f0438e74b9b1bf3c580a6c4 SHA512 f734a880ec55892b86274ab1b01dbd78d2301b321a36cf6de9e6fc9927a8e03c034ef873a84dd445f29274def7247bd606ffad5e16124bc848fd04c906678d02 WHIRLPOOL 0e3692fc1cb71ba7dd5a4cc45dbce1bdbc0a6793a4f7e82ad2a203a4501f9386d97886196d54216633725c7b112319908716090f5381373f527e13a9d18f5841 +DIST genpatches-4.9-21.base.tar.xz 451684 SHA256 5ed957a995b91d0b6c434c821b8505b86f13a7cdbe204b89302c0cbeaa35ba39 SHA512 c6260fdf7d6e144556499bc8a9be1e0507ae88cdedc1918f8e35de91f653a4b05deaab46d3a96413fc346aa03589116e1ebe62dce18fe8af55e6dce4fc7634b9 WHIRLPOOL 8b5d754119ba1c4b0ec73de4d6c07e0cdcb66e780d502a59c23b42860e75e146d4d573c5b2c50e1c8e48d1ea6fc4351e59a934d216140ab22e7cf4fffc8c0c11 +DIST genpatches-4.9-21.experimental.tar.xz 106400 SHA256 e7a5bb31a88655fc7c5d7174ba78ce6b42e6816955f6cca677caba99cd4ff488 SHA512 20ee5e84049ac7c6a31f967161e82e235003eca7224e1c1eede94122b8ad992f210fc6332f94cc7cd47d1c34b0e87786eac53bd4f4febca20f01346cc4269ddc WHIRLPOOL f547623918d44a91757c8d690a3922b0b8bf205509b15039a9aa000023f3460fd1c6293d333679d010cf52ab6064c2f743677e1bb805aa1892a069bd488cc28a +DIST genpatches-4.9-21.extras.tar.xz 17348 SHA256 3444b846c3232541152db3bb2d9ff5aa66c7c7249d346fd990ed304489e19d02 SHA512 a655184d0dfc4327a18b8e170bfad077818b7064d4c3b682c478835f297fac1d1f3cc3c611111f51275a9a5edabdfe7837954e7ab112b0480c60b1936a37b35e WHIRLPOOL 360df1ae85469913c9236147e2f5e4d38f1e109a35d4961a2cab271ef79049101680058c5a99430829de7e895ef5ca89e81a59dbf83deccb5d49daca4d1d5159 DIST linux-4.10.tar.xz 94231404 SHA256 3c95d9f049bd085e5c346d2c77f063b8425f191460fcd3ae9fe7e94e0477dc4b SHA512 c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90 WHIRLPOOL 86d021bae2dbfc4ef80c22d9e886bed4fbd9476473a2851d7beaf8ed0c7f7fbc1fa0da230eb9e763eb231b7c164c17b2a73fd336ab233543f57be280d6173738 DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a DIST patch-4.10-ck1.xz 154200 SHA256 1913eeb921bbef3733b53f4004a3013289fa85a26409610bb14fcff3bbd7ef72 SHA512 b998cfe44b5bd89b362fe299ae799cd5caceef5114b954fbf10be0553c21234a949417459f848e75b029a4089760aafe212efadddd8c2d65d054c0d367fc7816 WHIRLPOOL 2056718b1b1e1b8bccfbe5fcafd01d24179fae05653fac3e7553b4dab38789f694a050990e8e99ea38c4f9074ab339640980d433bdd411c0deb84f7bd698ab10 diff --git a/sys-kernel/ck-sources/ck-sources-4.10.8.ebuild b/sys-kernel/ck-sources/ck-sources-4.10.8.ebuild new file mode 100644 index 00000000000..32412b46672 --- /dev/null +++ b/sys-kernel/ck-sources/ck-sources-4.10.8.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +ETYPE="sources" +KEYWORDS="~amd64 ~x86" + +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ + http://users.tpg.com.au/ckolivas/kernel/"; + +K_WANT_GENPATCHES="base extras experimental" +K_EXP_GENPATCHES_PULL="1" +K_EXP_GENPATCHES_NOUSE="1" +K_GENPATCHES_VER="8" +K_SECURITY_UNSUPPORTED="1" +K_DEBLOB_AVAILABLE="1" + +PYTHON_COMPAT=( python2_7 ) +inherit python-any-r1 kernel-2 +detect_version +detect_arch + +DEPEND="deblob? ( ${PYTHON_DEPS} )" + +K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}" + +DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}" + +CK_VERSION="1" + +CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz" + +CK_BASE_URL="http://ck.kolivas.org/patches/4.0"; +CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}" +CK_URI="${CK_LVER_URL}/${CK_FILE}" + +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}" + +UNIPATCH_LIST="${DISTDIR}/${CK_FILE}" +UNIPATCH_STRICTORDER="yes" + +# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag) +# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental + +K_EXP_GENPATCHES_LIST="5010_*.patch*" + +pkg_setup() { + use deblob && python-any-r1_pkg_setup + kernel-2_pkg_setup +} + +src_prepare() { + +#-- Comment out CK's EXTRAVERSION in Makefile --------------------------------- + + # linux-info eclass cannot handle recursively expanded variables in Makefile #490328 + sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die + + kernel-2_src_prepare +} diff --git a/sys-kernel/ck-sources/ck-sources-4.9.20.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.20.ebuild new file mode 100644 index 00000000000..c89aebd980e --- /dev/null +++ b/sys-kernel/ck-sources/ck-sources-4.9.20.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +ETYPE="sources" +KEYWORDS="~amd64 ~x86" + +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ + http://users.tpg.com.au/ckolivas/kernel/"; + +K_WANT_GENPATCHES="base extras experimental" +K_EXP_GENPATCHES_PULL="1" +K_EXP_GENPATCHES_NOUSE="1" +K_GENPATCHES_VER="21" +K_SECURITY_UNSUPPORTED="1" +K_DEBLOB_AVAILABLE="1" + +PYTHON_COMPAT=( python2_7 ) +inherit python-any-r1 kernel-2 +detect_version +detect_arch + +DEPEND="deblob? ( ${PYTHON_DEPS} )" + +K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}" + +DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}" + +#-- If Gentoo-Sources don't follow then extra incremental patches are needed - + +XTRA_INCP_MIN="" +XTRA_INCP_MAX="" + +#-- + +CK_VERSION="1" + +CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz" + +CK_BASE_URL="http://ck.kolivas.org/patches/4.0"; +CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}" +CK_URI="${CK_LVER_URL}/${CK_FILE}" + +# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x) +FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc" +FRZR_FILE="${PN}-4.9-freezer-fix.patch" +FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}" + +#-- Build extra incremental patches list -------------------------------------- + +LX_INCP_URI="" +LX_INCP_LIST="" +if [ -n "${XTRA_INCP_MIN}" ]; then + LX_INCP_URL="${KERNEL_BASE_URI}/incr" + for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do + LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2" + LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}" + LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}" + done +fi + +#-- CK needs sometimes to patch itself... --------------------------- + +CK_INCP_URI="" +CK_INCP_LIST="" + +#-- Local patches needed for the ck-patches to apply smoothly ------- + +PRE_CK_FIX="" +POST_CK_FIX="" + +#-- + +SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI} ${FRZR_URI}" + +UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${CK_INCP_LIST} ${POST_CK_FIX} ${DISTDIR}/${FRZR_FILE}" +UNIPATCH_STRICTORDER="yes" + +#-- Starting with 4.8, CK patches include BFQ, so exclude genpatches experimental BFQ patches - + +K_EXP_GENPATCHES_LIST="5010_*.patch*" + +pkg_setup() { + use deblob && python-any-r1_pkg_setup + kernel-2_pkg_setup +} + +src_prepare() { + +#-- Comment out CK's EXTRAVERSION in Makefile --------------------------------- + + # linux-info eclass cannot handle recursively expanded variables in Makefile #490328 + sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die + + kernel-2_src_prepare +}
