commit: 419ffb0785df95cf1463ad3ddf6981ced95a4a79 Author: kuzetsa <kuzetsa <AT> gmail <DOT> com> AuthorDate: Tue Dec 5 18:36:54 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Wed Dec 6 12:31:58 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419ffb07
sys-kernel/ck-sources: v.bump (4.9.67 & 4.14.4) 4.9 branch: simple bump 4.14 branch: squashed earlier -r1 commit: user-facing einfo message for genpatches-related USE removal of legacy K_EXP_* (workaround) behavior converted to IUSE experimental (via kernel-2.eclass) Closes: https://github.com/gentoo/gentoo/pull/6428 Package-Manager: Portage-2.3.13, Repoman-2.3.3 sys-kernel/ck-sources/Manifest | 6 +++ sys-kernel/ck-sources/ck-sources-4.14.4.ebuild | 61 ++++++++++++++++++++++++ sys-kernel/ck-sources/ck-sources-4.9.67.ebuild | 65 ++++++++++++++++++++++++++ 3 files changed, 132 insertions(+) diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest index c9083fe6035..cd57437e333 100644 --- a/sys-kernel/ck-sources/Manifest +++ b/sys-kernel/ck-sources/Manifest @@ -29,6 +29,9 @@ DIST genpatches-4.14-3.extras.tar.xz 17480 BLAKE2B 346a3292223a5e046c019a50cce2b DIST genpatches-4.14-4.base.tar.xz 87480 BLAKE2B 753bc9a5145ae32f1d4562862449f798ac9c78111819c7c279327039f74142fd0ae6955d559801736b6d2a0b074cae56d53226e5745cb8c85e76b0bd42ea0673 SHA512 8c0d8d864dea85f6730cc8c5bb1bcefefc8ef3ee5254ba62f0d4e90c5787ea6423988f4c303e0e32aa41fc9e5d4fc01103136556daa826a57403522066c3c949 DIST genpatches-4.14-4.experimental.tar.xz 5184 BLAKE2B f1d9938a476a958a5fb42b60589234df5c85211b2ebfe59316dd32036ce2a93fdd405f02976ed8eb9312841a4853bac0baec4df52cfc09278b7cdd1fe76e0718 SHA512 85f3055ce8ee187fc7105bf338dc18fbbf02e9cec27aedec10a6fde4db89dec70e666e63dd24497decfefb4b1f59c74789079614025304df67484d80f81d7ede DIST genpatches-4.14-4.extras.tar.xz 17488 BLAKE2B ddab5ff81dc6cfe85ce3805846d8d74ce1eb8a2c79b2156e4363fa9592d1a0edec9f9812b9f41bd9ed955ac7030188776a7da5ff4a59408a0d5cf74bf0e629d6 SHA512 7ab148e3db28367ac7d8e56f75e65cafc3b80fd0932018d5ebd1ba1ba1b97521c94e30055fd653803806825bbc8be65e4fff2924907f9144b5ccdb48a53b00c8 +DIST genpatches-4.14-5.base.tar.xz 115968 BLAKE2B d48a56eef5c045c79a355b765f7b569280b741f5879b7ae2ffd411922a27225d8150554f42f70503218bb7ac674434c01f0e2350e7c7e8da256cd36be11a502c SHA512 67c9b9c295ec90137c05385be239b6d2d0e79465a3f1e9f92ac3d0e6d8bb50a9107885a009a185d0cb2102e31d773cfd690f0d8ccafc0bacdcfab607ae556872 +DIST genpatches-4.14-5.experimental.tar.xz 5184 BLAKE2B 13611ce70740cae179fd732ddab8b5daa1f8feab9d5fe80081753020e0df42dd76c8c8696522769a950f9eded8a92b80c93dece78a9c959a1fb9ac5ee61af101 SHA512 c6725e6728c9fbe923472116977136a13bf6ee4e4e450478ab2eb2e7c91d88fb50961b017d9c57335bd329543a830ba629bd064975326f187d72ae7376687d5e +DIST genpatches-4.14-5.extras.tar.xz 17488 BLAKE2B 16281a8110e0e1156aeaa1b5bc219e3bad364b22da6ef3a540e16c0f0a2a9fd1fd3fd550d002e79b4095916863f93cfdf4b49617b9b1c3bea8263c54702205a0 SHA512 f15a3b545b5d4c1359f57046cc2dcd273508737129b181ab3a8c7eb7ee65f5ddb82ecf8b1f96095da87d5fb9659ec4f0eb4826aab63b45bfda2530ed8a609605 DIST genpatches-4.9-63.base.tar.xz 1183404 BLAKE2B 4e49c39b91a86ec1d7cb0bdf24c9cb9c66bbd3fbf9847c1d2246e98618f49f57b4702699fddad6595003b146f35b2b4416ac788410d4dd5076342ae470834c65 SHA512 cb8e7ee1e8cf88e08bad0ec7078667f8cb044a5369a7bda6db68846ac56696d888125527b3dc0d4b5fc90bc072cbd31a75c327c6317036ba697ffa235c1c074e DIST genpatches-4.9-63.experimental.tar.xz 106440 BLAKE2B ece4f2c9cba523a9eb44a59a4ae8f3bbfcba22660f9143fb2ba23ddbafd6468459b1a70cafc373145a33c07d0a881c4d1b4f3a262e3ddd59b39deb17a58d95d3 SHA512 3c03fadd3a532cf0db5e3b7a319f8ffa6a96e3d304f31cf017baba5766da4af619daacb08749ec12bf8d62ce7439d2087de05b07f42ae0a41d81540f130a615a DIST genpatches-4.9-63.extras.tar.xz 17348 BLAKE2B 613eef1455b723fa71d79d9df0c71f29cc7e1507ae0e2ac588e1410576d18d1320107d37c9f462477adb62c6f8c3460b557b11d6235c47d5ef2e85f2bcaa0940 SHA512 26e91da7d56177e7d0ec5c0c58e1acdddb99432978551a60cd48b58800c6f286054fbfabb87cf15b56ac4b7102c12f2c3edc2865f8fecce89e7eb0e7191ef1fa @@ -47,6 +50,9 @@ DIST genpatches-4.9-67.extras.tar.xz 17352 BLAKE2B c56b8e7483fc9f44fcaf930313614 DIST genpatches-4.9-68.base.tar.xz 1266744 BLAKE2B 287306aeecbab6cf9b9c08440ee333e729d0af555fec354400c54e407a1c3b8a723ea95c28b7d3c13fe37f4c7fb78c273eec8d6a68f31b68ec24ba45a374bef7 SHA512 4ba94ae3f592cdc466ab58e4bba9781fee915df4994beb6c9dec4efd3622b180cf0d145de585ec9a7361ed2ec636910a42b449d937dca50983bd7f13494edd16 DIST genpatches-4.9-68.experimental.tar.xz 106380 BLAKE2B e360ddf86cc6db981937c188ccd5106754c7533ec01e6e4d4c9dcef72092b11c4d9accf0389414c3f20032977e010d29344f1014f490e9e13cc51b59d1f59d1b SHA512 000567fef478babbe86b706bc9532756bf42f2c2e09aa3f4e39f7fff8d90fd9dfe65929fb1b9473031d6529ce4ea4a9a8dd8bb7dc615a58f5157ccb2ad4b9249 DIST genpatches-4.9-68.extras.tar.xz 17352 BLAKE2B 215a823f33f6d5cccbfd9597ae123a885abaf1bd2deef215b1f4c76dbd0652c4160152b96b62cfaa7523899f49263a48d49c9bfc43cab3fd44ca3aabadb54605 SHA512 549e8fc65d62b5197ffd047b7c281c183d267a7d93dbe4c46fe19c161fa84db9a00db9e4cf254431303dbfc8652dc360aa53af8057ab5a433fcc98dbc3748c9f +DIST genpatches-4.9-69.base.tar.xz 1274148 BLAKE2B 732076c76dc8c5077ea804065c86e3c384004b484d661c60a5534964fe94a07ea86e6cec9e47d1484ace04a22123f88ac9a511e90998da948869c266f3b2c3be SHA512 5db83495c9b9757822df7a3733a29cb897163ce51bbb143fdfd31d42f9e5fab73dcd5c4ef18fa0c502838359ad3d9b9c9de625041042119df46f68d847eb26e6 +DIST genpatches-4.9-69.experimental.tar.xz 106392 BLAKE2B a8025d5b3c4a86240beaca7237f8876d9690a6029dfbed72ad86b4e64ae69103717b034d3071a13d70e966ded9bd5847f40c9a81003380b0e0c6530dc0f404a6 SHA512 b91c383adb79de67fca53d4c729cd449973544d5d0c9c03cbd4fb2eeab37db4c018d460e15c985a8bd63ce6294dad160ad44dd9cfaf860a35e911b4a31594291 +DIST genpatches-4.9-69.extras.tar.xz 17352 BLAKE2B e9a8c063812acf2155ebd6241e6061ab40328194c3a158feb8e53d4dc464b011184892ad8a0f240ef8cd8e5e1569981999fc46fda9d23b8e8ce9e1a05d8a7109 SHA512 5d48f1dc65bd352fe77793f3e8f5b3f689582aaa649a423b62ffc4d4e84113d6cb305d60bc09d37c191c46daf85e5021b27b4c7097b10a7df0aa5335d5e8116c DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a diff --git a/sys-kernel/ck-sources/ck-sources-4.14.4.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.4.ebuild new file mode 100644 index 00000000000..36caf42619e --- /dev/null +++ b/sys-kernel/ck-sources/ck-sources-4.14.4.ebuild @@ -0,0 +1,61 @@ +# 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://kernel.kolivas.org/"; + +IUSE="experimental" + +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="5" +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" + +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 +} + +pkg_postinst() { + elog "ck-sources previously enabled CPU optimizations by default." + elog "USE=\"experimental\" is now required to enable this patch." + elog "this can be set in /etc/portage/package.use (or make.conf)" +} diff --git a/sys-kernel/ck-sources/ck-sources-4.9.67.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.67.ebuild new file mode 100644 index 00000000000..b368c07ddf5 --- /dev/null +++ b/sys-kernel/ck-sources/ck-sources-4.9.67.ebuild @@ -0,0 +1,65 @@ +# 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://kernel.kolivas.org/"; + +K_WANT_GENPATCHES="base extras experimental" +K_EXP_GENPATCHES_PULL="1" +K_EXP_GENPATCHES_NOUSE="1" +K_GENPATCHES_VER="69" +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}" + +# 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}" + +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${FRZR_URI}" + +UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${FRZR_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 +}
