summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2012-12-19 17:14:14 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2012-12-19 17:14:14 +0000
commita58712df399b3bc77e563faa97674f2a3bd0cd63 (patch)
treec5d634672231b03c2d9aa6db2da73d3e9c31a3e2 /sys-kernel
parentAdd ~ia64, wrt bug #436668 (diff)
downloadhistorical-a58712df399b3bc77e563faa97674f2a3bd0cd63.tar.gz
historical-a58712df399b3bc77e563faa97674f2a3bd0cd63.tar.bz2
historical-a58712df399b3bc77e563faa97674f2a3bd0cd63.zip
Version bump. Bug 447718 thanks to Eric F. GARIOUD <eric-f.garioud@wanadoo.fr>
Package-Manager: portage-2.1.11.37/cvs/Linux x86_64 Manifest-Sign-Key: 0xB4AFF2C2
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/ck-sources/ChangeLog7
-rw-r--r--sys-kernel/ck-sources/Manifest31
-rw-r--r--sys-kernel/ck-sources/ck-sources-3.6.11.ebuild117
3 files changed, 140 insertions, 15 deletions
diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 757dec57b7f8..46d89202d353 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-kernel/ck-sources
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.212 2012/12/13 18:47:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.213 2012/12/19 17:14:13 hwoarang Exp $
+
+*ck-sources-3.6.11 (19 Dec 2012)
+
+ 19 Dec 2012; Markos Chandras <hwoarang@gentoo.org> +ck-sources-3.6.11.ebuild:
+ Version bump. Bug 447718 thanks to Eric F. GARIOUD <eric-f.garioud@wanadoo.fr>
*ck-sources-3.4.23 (13 Dec 2012)
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index f21ecc5ced3e..81f25117765e 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-3.4-12.base.tar.bz2 254541 SHA256 310038d879e0bd7c3cbd4b69a76ff5
DIST genpatches-3.4-12.extras.tar.bz2 17502 SHA256 2b537431a408445cd1091562755234e840016f26ad63ab3a73812ac7f7e1c8d9 SHA512 29ca4fc4de0c1c87eabb2fa55ae856721ac10a4d70758efa9d90379f0b0b0c9def9cabcb50601a1d128471cf97d891ed0965486c85b4dc06dd9ac4058ed78ce4 WHIRLPOOL de947d2d305d79250922795c094db3d4a90d295d28e819fbf2c1c207ba365bf6cd194eb315935fa52f4b8cd135049d9838aad00cb52e7e4802ebbbd87eea61ab
DIST genpatches-3.5-7.base.tar.bz2 255694 SHA256 3c76c5f6fce8b10e6546788047ee03cc07f7b20bf31b66b73db916d9877effe1 SHA512 6b54b39b576c7b8a9de5540fc98b0f07b542cf0afc9e4cdeca1be915d8fe2c39d00d0a002f50a76dc67cdf971d3fa8a75a90041ef10a56c042b1bc82eedb0b7a WHIRLPOOL eb1f15081915bf51a90a9e80bd8e26df89162973343328e3ed2fc8d623e49a4433c18d2889bc407f4f8f61d857a21ec118071036041f53daed0882fef24c423b
DIST genpatches-3.5-7.extras.tar.bz2 17507 SHA256 1b2294687e842e6450184ce2800ba3df8006ca47d75f95437a1e1d2976162727 SHA512 2eefd45f853e9bab3f89701e470309471b5b2c9ed651dba03776a47d11e26c00170d32aaac547889ae7cee435278bb5ffa4ddc1dc769e6440d454008f62ce23d WHIRLPOOL 43dfd1c6a046e3dc07db72e8d7f062689366112ccf080a17b84bc7adda3e5257d7be551e0a34b6c79c9016b5b04bad5bdf8c52589dcc362dc675f72ca7681135
+DIST genpatches-3.6-11.base.tar.bz2 244398 SHA256 464238ceee9aee5a292dc4c5c8311a47d086995b920bb68fc223a7f65ad3c44e SHA512 826413a3a87fdf29a764b75c6cb07e58aca47481ba7c60d4789e7c38d6d9a6ba8343cb8be2c3e5fbcc54b5efd5b55c6fee61feebf6a8568e2c31aa9eed0239fc WHIRLPOOL db2967f5545090a5e33b296c92bd62cc2f8294ad5c03d07f6a9635cabdca3725fa0d1d25f4e0a8458797b325f3467ece70154c7eb3aa9ebcd09c1ac7c28594a8
+DIST genpatches-3.6-11.extras.tar.bz2 17038 SHA256 bf6be402ec3ef125ecaf626379f777a262e2f6776d8f5115ac0834f1e3d18b25 SHA512 614c845d474890ad0fd4271ea133464626498c3877d49c1df9940cfb2bc2a68a13828b6cae590a0d5619cf21521fe119fab782714d0bc37c287e0bba29f22fdf WHIRLPOOL ef8c9a76be1ac027b3d01e47bf22dbe178b2b68e85f4ace1186aedd89e513ff010d6e50e1392e17dde3bfebabcff07c348b04163398c43c045d6e37e78caf954
DIST genpatches-3.6-4.base.tar.bz2 62335 SHA256 dc72b6c3c4a025f7a1090e8d479ea9a5279584932c34c888920cc65e47f972a7 SHA512 030cd199a872f3185d03f22062cf162ef0d7468733c2abbf321044f75d36f0f3fb52c96020ebbc53f3570af7c97a9847dfe7b0551fad17cb64aebebdd4c898f6 WHIRLPOOL 613c1dd125e357093438ae797ca3f2f98fe8bc83e836a0eef1ac588173c5c0e6f1efbac8a3014e5a9c832e9cfbac0896c9699fb569cbac2cf980d189e9a4b6d0
DIST genpatches-3.6-4.extras.tar.bz2 17029 SHA256 7e22574a6618fbb2eade0610fd130a06a322891f109d5ad79b1b8674da5321c8 SHA512 243ac5d7b78e0e308cfb5536439eb6da01f46bebc1a549c61eb9cb0b1199ccabfad2a7d6186a3b1387417dc40082fc931d37d07ed31bb0e78a0e9afc0e4bf655 WHIRLPOOL 71f32176b12b1b08450854afc52e603ba687628a21d18b1ffb83063cd5db159e53b729901085b57dd969fcf731f3ebdb191a1015c6c98bb1a6015f965d23e543
DIST linux-2.6.38.tar.bz2 74739098 SHA256 72f0cfaefb8dc86b219d5a742dd0375332627641ecbdf5badd3158e2127b9304
@@ -54,23 +56,24 @@ EBUILD ck-sources-3.4.18.ebuild 3221 SHA256 cc8194e704c63b1291622add57570290428f
EBUILD ck-sources-3.4.23.ebuild 2935 SHA256 3c2f94d43de604798c2ffb062fac95066de9145b5b178a080325b246fd2fd511 SHA512 d5ac7c6726de7afe600cea6e5246707cd8e87011bdf87c52c1acc232607b43818a822005316f6ac1775b57256c00e32106afa56e7a14801f6a11054bc7a5ee6f WHIRLPOOL 5bcc9300e412235b72b02e59ef8f20d5fbe3f4b9b518576f813dc6afb40c9fcdb9f3eb3ce2a293c149e5b2b00186d23f82a4289344e9bc5479d2f8d0ddf82d3e
EBUILD ck-sources-3.4.9-r1.ebuild 1312 SHA256 c4495a1db388d5064d6e93e474fb231ef7a22af914b374a3bffd28a8a5bd4641 SHA512 0c4a26e125d0fa4641f01043bb028262b60395b223015a433447ddc4d40915642fd2d3b94a118b98e2bbff9ac590472e9e58d8ccf78a7180b14f1fa1b672a486 WHIRLPOOL 7a6d6ad8ca2613a25636af6fc876f5a20940b09da684c4f5cd9b7a065072733a91eafe36f45a2e94b65b7de9bcf81508e0a5f44ed99dd7430b1a2c65fa250617
EBUILD ck-sources-3.5.7-r1.ebuild 2530 SHA256 fc6ea32ff7821b2d29a3c912b8d4b5ebdbaf5d0d9db28b15cd370a6382b61e46 SHA512 169c5cba28b45b4bdc9e05d435d9a942ee58fab417c349999cd9e33e872645c7c3267f576a588f90deca2226482c3b6106d180ba4506459f1fa38a4b3de4e136 WHIRLPOOL 0e72b1a2a1db83f7e09d72f22889928f44fe469253dbf469c2f0b1f8b3e3fdb282ca088dc07bc8b8979a5d13abfbf91e5d5b77cbd92432b9f2486fc1c4d52587
+EBUILD ck-sources-3.6.11.ebuild 3076 SHA256 3bd7eac116a974a6b692d24d5341638907a2dc6786e1e68082c2cbf8e5d0b94a SHA512 65f9eb492b1504579c1fc6d80c1745a37915d77c01d8ec8f3df67baec381069fb5269bd2732d6bd26dea75e5ebbeb833a8340dc7041ee1d03cbd32e098a01ed2 WHIRLPOOL d550f9d82d1074b5d54d9fb5bfd03feaf4d3caba20d8a21e6a7aca2bc08ccad31863edc4f4ee7214d04d7bee4e05642d7e7e8ef8a9d668a7f82c2fea8fbc1b9e
EBUILD ck-sources-3.6.2.ebuild 2474 SHA256 4a4251768b3aea9be32efaeaf154e6ef974e806fcfb0bd141293e288b14461da SHA512 711e99eb76a36ab192cd5b54a932d8ada603a07f2f6e4e7ebbb29ab3ff2d6ccb25482e61dbca6c04ec52a5916f1081e7aa5cf1614aad27cd263aadc211a732d2 WHIRLPOOL 691c1758837dd6e72bb6657683a2c38d4019003a4b5e52e31f21461d96203df71d50d3c31fffcd143675188f9146db955c7eb26c896bde66f887d96db0b206d3
-MISC ChangeLog 10131 SHA256 1a70ac024e10fdba13d0896149541e57e6fda8b0f8805a01da5069bdb57a7aad SHA512 966cdb34b1e5cb4df0daea2e005799423b05a96768e9d408ccdb4fbea5a3b31687b1ade8ca4a2cd3e78a3cc19f5c35b23d21e6ae348042ea7721f958f2b43523 WHIRLPOOL a7339d0d35358ff8d8a963b73985f775537574770553b16f67894b507b2483d723dc1d92a43bbd778d3bdeb6c3bd1537bcf45f8e02673940ad0a8afe2928a0ba
+MISC ChangeLog 10327 SHA256 0ef656fed7ccce538eb6b5e177e751fa0e9232403f82b7c2f0108d53e0557669 SHA512 505ad80bdb69b7b65f17aef719e16b57d892c423bb188cd4009aa19012f25852d1eaac92925d5978874a550f688357c0392362fd82dc7fc103fe816de5ac40a3 WHIRLPOOL 31940f93be58c84022024c9d579ea4645f7e151af30b896ff288219f09edf43dd4f2d30c873e7a3b15b7b07dd410bc491b539d71736d773a6eb8280adb79f94b
MISC metadata.xml 725 SHA256 36e4a97340d48664bf5dfddaac9ef94f4a3d9d4f50e18a086fa589f8badb0985 SHA512 0d9e3cc5dd33994d35701c7f89aa75e5c01cae38ca36c9b8dda285e494634bcbec9d6fc8aef5a41779057596b9cf1893d638e8bdd91041ee4353f511ab2f3ef4 WHIRLPOOL bcf9cbe18363d207ac3a41dc27b32fa9cb8040292f0cb9a9cfc054bb9626b9cd6d11e27aa7448bac9273d2d1f8c1d673eb75d2661505f6edaefbfc8821de62a8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQyiLZAAoJEPqDWhW0r/LC+toP/0CwmnWSkflYibrlJyCeDynR
-rXk00E5zZL/QaBjnlwN9FMfCIDMIXmr37FIiwminowzL8+Aak5ltPqp9yHBLxdOJ
-t6pHZLZoWkL4BgAPQdgyfzm9MmLZnsdWp/33msyqDwmAPQuIGx0fEZOd7v24ttiv
-sy7OvfSzyPMf/nE2WEs67Vp0RgzxoeM2owIJWM4112wpsUtNA0M1uzolsXCmJoep
-NTYZ7pAAXiRXRTOE+C2efr+VCMOnf0/8hD9QfEaryg+UzGs4y7k3JTznvgUhWP3C
-WRYmYoCv4RaUT2JqyPePYx6z5DBhnY/TYySbf4bGglhx2WWQ5M7Kzgu7V9pCVO/u
-LSU+7RTCF3sAJ5HIh/D7TJ+rhJplfEAXg7GGRKBo3hSDh8ZneUweFc1NJBmK8Xet
-w0eZcesmY9ZTL5pI5xFG2w5qOZT316CNmekmF3QLA1oOGhhniAZZoKb1SURKEGN9
-MuuBo4PgPx+jWmNcYZtdcL5VtmrAl+vAuf4V3cZzlKuwI/I7EQ1wabxMIQnRtdd+
-yCbK2lRKyzDr75FYYxMDPZu/KTR18jS383smd91kHNNWzt63Z7SY0zW2TWejQ/Z2
-Nbwzlw6wJ+Roj6vR68iMyxuFbJ3oVYB2LzD/X6oplipAinHIrsp63cqSlIp3epmY
-Mx8b0EtaUEihSh/NvN1L
-=58X8
+iQIcBAEBCAAGBQJQ0fXeAAoJEPqDWhW0r/LC9mEP/j8cClLBgtx+2u82xGYZ2bjU
+B/CruQk9OIr5Z/Sbjf1dHTedh/TjMbYXu5KiOJLLioCrQBNbvWYY7LJipW30X6iw
+PX+eQb/EarssK2jhsiXjorz/vm1LYIKAsgo399UfTBsk8JIdSH7rJlIeOq4mwX+x
+qhizN/yTPFe1e8pl6Y5HOJDhEb/dA5wH8oYqbGd3a09E8lSDbT0OQCXzmnRk+Nu2
+reQNShVa/c1Xaz5ELCqZ0BSrJ7FMwINHIchsQA4Z0uZtOCARkd1asIQewd6TfzG1
+mcpAfAKYDnC5m1K3KgTe6ru51fi+ET6jmickxv5sxOzwPbGabVyz48QBnxY1glI5
+fhSMljULVAAwZwcbrnEL/JuKS5DJ1e+E4I3jeREf/nlo66OrZtEQEL61+Z3c8RBz
+dFePgL+i5YcQLb4bswvFwMSWJnfqgb40IXKWwvNRc62VqQgj09ySX9ssjETqYHSZ
+IFMaMIe9wTg2zQhZswHM4g8XpL8zqNfyOHmipT38Rc8dWMg4Zk6MXdUIi5vFf+lh
+2/e3GJcZGIkAHivRsikh9nGmLJwuR/XPvRWWZpDkd7cginlc+8OPBLQ1EjRlTNyY
+mHa+UvO9LlhK5V+qalntzJJLm7gN6jg9hb6KgdEhOkI34Ftx7m5jE1rzl76s8ZG0
+KjY1hg5UYBiJ13Bb3Sa3
+=EKQl
-----END PGP SIGNATURE-----
diff --git a/sys-kernel/ck-sources/ck-sources-3.6.11.ebuild b/sys-kernel/ck-sources/ck-sources-3.6.11.ebuild
new file mode 100644
index 000000000000..eef0cd9ff79c
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-3.6.11.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.6.11.ebuild,v 1.1 2012/12/19 17:14:13 hwoarang Exp $
+
+EAPI="3"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+IUSE="bfsonly experimental kvm urwlocks"
+
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
+ http://users.on.net/~ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="11"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches."
+
+#-- If Gentoo-Sources don't follow then extra incremental patches are needed ---
+
+XTRA_INCP_MIN=""
+XTRA_INCP_MAX=""
+
+#--
+
+CK_VERSION="1"
+BFS_VERSION="425"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
+BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
+
+#-- CK messed-up 3.6 branch filenames ----------------------------------------
+
+BFS_FILE="3.5-sched-bfs-${BFS_VERSION}.patch"
+
+#--
+
+XPR_1_FILE="bfs${BFS_VERSION}-grq_urwlocks.patch"
+XPR_2_FILE="urw-locks.patch"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
+XPR_1_URI="${CK_LVER_URL}/patches/${XPR_1_FILE}"
+XPR_2_URI="${CK_LVER_URL}/patches/${XPR_2_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
+
+#--
+
+#-- 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}
+ !bfsonly? ( ${CK_URI} )
+ bfsonly? ( ${BFS_URI} )
+ experimental? (
+ urwlocks? ( ${XPR_1_URI} ${XPR_2_URI} ) )"
+
+if ! use bfsonly ; then
+ UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${POST_CK_FIX}"
+else
+ UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${BFS_FILE} ${POST_CK_FIX}"
+fi
+
+if use experimental ; then
+ if use urwlocks ; then
+ UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${XPR_1_FILE} ${DISTDIR}/${XPR_2_FILE}:1"
+ fi
+fi
+
+if use kvm ; then
+ UNIPATCH_LIST="${UNIPATCH_LIST} ${FILESDIR}/${PN}-3.6-Fix_Boot_Issue_On_Kvm-aCOSwt_P6.patch"
+fi
+
+UNIPATCH_STRICTORDER="yes"
+
+src_unpack() {
+ kernel-2_src_unpack
+}
+
+src_prepare() {
+
+#-- Comment out ck's EXTRAVERSION in Makefile ---------------------------------
+
+ sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
+
+#--
+}
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, see: http://forums.gentoo.org/viewtopic-t-941030-start-0.html"
+}