From 9fbe0f97da234d8a4b1afd6c2a24ea14d1d1108d Mon Sep 17 00:00:00 2001 From: kuzetsa Date: Thu, 14 Dec 2017 07:37:00 -0500 Subject: sys-kernel/ck-sources: v.bump (4.9.69 & 4.14.6). Package-Manager: Portage-2.3.13, Repoman-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/6548 --- sys-kernel/ck-sources/Manifest | 6 +++ sys-kernel/ck-sources/ck-sources-4.14.6.ebuild | 61 ++++++++++++++++++++++++ sys-kernel/ck-sources/ck-sources-4.9.69.ebuild | 65 ++++++++++++++++++++++++++ 3 files changed, 132 insertions(+) create mode 100644 sys-kernel/ck-sources/ck-sources-4.14.6.ebuild create mode 100644 sys-kernel/ck-sources/ck-sources-4.9.69.ebuild (limited to 'sys-kernel') diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest index 4f98cb595f0e..edb3bd54a064 100644 --- a/sys-kernel/ck-sources/Manifest +++ b/sys-kernel/ck-sources/Manifest @@ -17,6 +17,9 @@ DIST genpatches-4.14-5.extras.tar.xz 17488 BLAKE2B 16281a8110e0e1156aeaa1b5bc219 DIST genpatches-4.14-6.base.tar.xz 135424 BLAKE2B 28b59fc433c1b4d5c4fa4fd5bc71192eda5da51ce63a4af245b746425bac1abe9313a1cbc760396fcaa160c1c6333e756697923d45f114da94eaa2ed3ae8659b SHA512 460e38c9895156c2a16d3aadcaa4a2c9974a14e561155b914da143b14c726d9e8ad74cb435bd2ee51ad2a0966166e3705f943bd3831e3e33932373b2e04ace36 DIST genpatches-4.14-6.experimental.tar.xz 5176 BLAKE2B e28358bab3de6aa0274d537ca15239154bb69e5819ada8cb050ee35bb5885ff3ef5610988ebb1afa2bab3500c28300299c65e58aa302a6cfacad0aa2a8cb0244 SHA512 bdca000c196e1db78b27d16bf1abda0872d982375a5e33d4a9cbb5610df384f08692120460cda43ae06e0b9a6ea9c2c1c565697fbffdc9cb46e92d1ad628c74a DIST genpatches-4.14-6.extras.tar.xz 17488 BLAKE2B 39d46c202139f9d4b19eee37e711c81e95ce3b25924a70a3f75e6e4c6d4c665c1c73890fb0f61ea4ecad04cf9d9e2ad4788bad1e9c9e0e2fd03a07c3f5f8c713 SHA512 0fc7403ab27bc6a7ca1ff641bee8e8ea92bd04913e84c9559ac210cb6ecebb08dc4be9fdba6176c4c2d543990ea23d68a9f403dede6f1b2b56456d63d992faf3 +DIST genpatches-4.14-7.base.tar.xz 170916 BLAKE2B 176af85faceb355a6a62f701f8f99eed90a1099e8c2a73808e2c96274398fbb94668a516f51675412865f1f5b8069b80db368b9829f57f9e6e46d356e446e8a9 SHA512 55615b8d48d3266e2b392c5bd6cf3d1a52167e1ea0e6f20681ba738a8db8c25a0aca47fe4d33ff592fbb1e58a59d611e5af49f4a2f4f7363e83ae63f1097daf9 +DIST genpatches-4.14-7.experimental.tar.xz 5180 BLAKE2B c1eb32bb2c1a0bb253b624bf9b825cb35ae174b372c1048fead1c019f6f72f6d0e39d1c5767c79fe380216e8cc61b0a47a25993cc50e144312249a8683088f21 SHA512 6a0d1206c7bea440cb7ac93719d972a7e8ad0c33817ff383ed8318a6c8904a701e84bc63d8618c36075176c5228420ae5b8935342b887cd5a54187f504d6413b +DIST genpatches-4.14-7.extras.tar.xz 17488 BLAKE2B dffe838e8913976777080d5e7123e2341506ef3127a8889c5cde24a0662f54c62823780e4fc75c2d12cf55cfa50a591726981cad5d39046ee96e66156d6bafea SHA512 a22d9505e769d09fc996945cbeb35cb765493cbbcffd981e0b6afafdb9a03159be9acde754dce0f2bcf414242b2a62aa6b74b9d7762ffc169492e90fa495d35c 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 @@ -26,6 +29,9 @@ DIST genpatches-4.9-69.extras.tar.xz 17352 BLAKE2B e9a8c063812acf2155ebd6241e606 DIST genpatches-4.9-70.base.tar.xz 1296720 BLAKE2B 77d1f7205ecf185b1ba438737d5601b178c2bf7a7abb495eba32b96cc0431827ae7a4c3a8b2a5a694c72e266fbb9a403b1be910c161c0f07c575ddc010edcda6 SHA512 5359503b833430531a75e6a67d841031d1275034db9cc885180eea6569bd5ac52325fde6a650902f988850b87ee2e184b9449020ad197278814cad75e38a490e DIST genpatches-4.9-70.experimental.tar.xz 106392 BLAKE2B 8fa9653f9bdec9a2104730fad3e2d7133da1ff08d8469c79386fd133e3de46a5562d4efa9087f4e7202143357d8f0fe777a1ed04e8267939f9eecdb333298f27 SHA512 fe319fb330fdde6c172df864b9ffcfe3b7449d31b66af7a739dbd6f1f721a64e94c450af077594e208d5c52cd0fe9bd60f320b73898c2e5c21ae2b0ab97cf1bc DIST genpatches-4.9-70.extras.tar.xz 17352 BLAKE2B e466ca37103e8ed9eef13095b939a2adb0827da183bfdb866e3fd6b99f8821dbe77fdf0e64f597d1c09c9e916825a1563211c5620af2ce9aa383c64ac4e1bd4c SHA512 9bfbc48de9c0b460429fe51de7122b7961907bcb66d7acd7a1e93a2bc29960e824737bac3fed8193758f50a0f6f5b540ef58a8364bb7948e0103f64bb950c8a4 +DIST genpatches-4.9-71.base.tar.xz 1324744 BLAKE2B 7a47aa8381c09f3f0a6898576c7338db56056c564f63e62e5c0e5d2dead50df94d3735b388913b68fef04365d459488621db18eaac3f5fe3d3ad02624644486f SHA512 fa80e013125dfbea5fb5d3a6fd907110001c08d8e521b0491a17c9f0496f1e37b7c7d0272115648212e530b639807845d52212bf64dc8db38b1d74381066ba8a +DIST genpatches-4.9-71.experimental.tar.xz 106376 BLAKE2B 12c185207671d701640a1850ca77c851404ff71028a37af6da30c04dbe3b12553626ed04518f83b97545afd144bc0808b3de9f34eac29fb108720e3e27e1b4ca SHA512 d7036273e39b14bdcb843332630ec6ff3360bd3f402ed724fafd1ec424b846ca30ff6e7c2e99bcbf5c53c65f19de92641d4acf0d1553e04eef8a8c39fc25209f +DIST genpatches-4.9-71.extras.tar.xz 17356 BLAKE2B 7459d34097707897e114b58b3402d4ba7603156deb7fd3444e1ae777a38a821a743b9267405b738b2af9421702e2a46a5927ce39c700950e9940e69f0dcef010 SHA512 572cbf8b83b2a43e8a49b7316495dbb027a14bdc74febba9629026e31ebaf0496b48104212f694be3cd1a37a28290da6564dfcac711db1d4ba84b7ab78d3123a 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.6.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.6.ebuild new file mode 100644 index 000000000000..837efc3bb2be --- /dev/null +++ b/sys-kernel/ck-sources/ck-sources-4.14.6.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="7" +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.69.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.69.ebuild new file mode 100644 index 000000000000..53709b1248a3 --- /dev/null +++ b/sys-kernel/ck-sources/ck-sources-4.9.69.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="71" +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 +} -- cgit v1.2.3-65-gdbad