diff options
author | Markos Chandras <hwoarang@gentoo.org> | 2013-03-03 17:13:28 +0000 |
---|---|---|
committer | Markos Chandras <hwoarang@gentoo.org> | 2013-03-03 17:13:28 +0000 |
commit | dcf26c78fbb16778c8c67cac410bfd1784cc1243 (patch) | |
tree | c8509c50b3887c50f2ed4984800a863f11dca355 /sys-kernel | |
parent | removed myself from metadata.xml, added maintainer-needed@gentoo.org (diff) | |
download | gentoo-2-dcf26c78fbb16778c8c67cac410bfd1784cc1243.tar.gz gentoo-2-dcf26c78fbb16778c8c67cac410bfd1784cc1243.tar.bz2 gentoo-2-dcf26c78fbb16778c8c67cac410bfd1784cc1243.zip |
Security bumps/revbumps for #459124. Fixes #459926. Thanks to Eric F. GARIOUD. Removing old ebuilds of the same patch-level
(Portage version: 2.1.11.53/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)
Diffstat (limited to 'sys-kernel')
-rw-r--r-- | sys-kernel/ck-sources/ChangeLog | 16 | ||||
-rw-r--r-- | sys-kernel/ck-sources/ck-sources-3.4.18.ebuild | 101 | ||||
-rw-r--r-- | sys-kernel/ck-sources/ck-sources-3.4.34.ebuild (renamed from sys-kernel/ck-sources/ck-sources-3.4.32.ebuild) | 34 | ||||
-rw-r--r-- | sys-kernel/ck-sources/ck-sources-3.5.7-r1.ebuild | 80 | ||||
-rw-r--r-- | sys-kernel/ck-sources/ck-sources-3.5.7-r2.ebuild (renamed from sys-kernel/ck-sources/ck-sources-3.4.23.ebuild) | 48 | ||||
-rw-r--r-- | sys-kernel/ck-sources/ck-sources-3.6.11-r1.ebuild (renamed from sys-kernel/ck-sources/ck-sources-3.6.11.ebuild) | 39 | ||||
-rw-r--r-- | sys-kernel/ck-sources/ck-sources-3.7.10.ebuild (renamed from sys-kernel/ck-sources/ck-sources-3.7.9.ebuild) | 19 |
7 files changed, 91 insertions, 246 deletions
diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog index 09aa62176d4e..f277b15e5ec5 100644 --- a/sys-kernel/ck-sources/ChangeLog +++ b/sys-kernel/ck-sources/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for sys-kernel/ck-sources # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.214 2013/02/23 18:27:58 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.215 2013/03/03 17:13:28 hwoarang Exp $ + +*ck-sources-3.7.10 (03 Mar 2013) +*ck-sources-3.6.11-r1 (03 Mar 2013) +*ck-sources-3.4.34 (03 Mar 2013) +*ck-sources-3.5.7-r2 (03 Mar 2013) + + 03 Mar 2013; Markos Chandras <hwoarang@gentoo.org> +ck-sources-3.4.34.ebuild, + +ck-sources-3.5.7-r2.ebuild, +ck-sources-3.6.11-r1.ebuild, + +ck-sources-3.7.10.ebuild, -ck-sources-3.4.18.ebuild, + -ck-sources-3.4.23.ebuild, -ck-sources-3.4.32.ebuild, + -ck-sources-3.5.7-r1.ebuild, -ck-sources-3.6.11.ebuild, + -ck-sources-3.7.9.ebuild: + Security bumps/revbumps for #459124. Fixes #459926. Thanks to Eric F. GARIOUD. + Removing old ebuilds of the same patch-level *ck-sources-3.4.32 (23 Feb 2013) *ck-sources-3.7.9 (23 Feb 2013) diff --git a/sys-kernel/ck-sources/ck-sources-3.4.18.ebuild b/sys-kernel/ck-sources/ck-sources-3.4.18.ebuild deleted file mode 100644 index 09ad13901ea3..000000000000 --- a/sys-kernel/ck-sources/ck-sources-3.4.18.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# 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.4.18.ebuild,v 1.1 2012/11/17 19:05:40 hwoarang Exp $ - -EAPI="3" -ETYPE="sources" - -DESCRIPTION="Con Kolivas' high performance patchset + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ - http://users.on.net/~ckolivas/kernel/" - -KEYWORDS="~amd64 ~x86" - -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="12" -K_SECURITY_UNSUPPORTED="1" -K_DEBLOB_AVAILABLE="1" - -inherit kernel-2 versionator -detect_version -detect_arch - -BASE_VERSION="$(get_version_component_range 1-2)" -CK_VERSION="3" -BFS_VERSION="424" - -CK_FILE="patch-${BASE_VERSION}-ck${CK_VERSION}.bz2" -BFS_FILE="3.4-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}/${BASE_VERSION}/${BASE_VERSION}-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}" - -LX_INCP_URL="${KERNEL_BASE_URI}/incr" -LX_INCP_1="patch-3.4.11-12.bz2" -LX_INCP_2="patch-3.4.12-13.bz2" -LX_INCP_3="patch-3.4.13-14.bz2" -LX_INCP_4="patch-3.4.14-15.bz2" -LX_INCP_5="patch-3.4.15-16.bz2" -LX_INCP_6="patch-3.4.16-17.bz2" -LX_INCP_7="patch-3.4.17-18.bz2" -LX_INCP_URI="${LX_INCP_URL}/${LX_INCP_1} ${LX_INCP_URL}/${LX_INCP_2} ${LX_INCP_URL}/${LX_INCP_3} ${LX_INCP_URL}/${LX_INCP_4} ${LX_INCP_URL}/${LX_INCP_5} ${LX_INCP_URL}/${LX_INCP_6} ${LX_INCP_URL}/${LX_INCP_7}" -LX_INCP_LIST="${DISTDIR}/${LX_INCP_1} ${DISTDIR}/${LX_INCP_2} ${DISTDIR}/${LX_INCP_3} ${DISTDIR}/${LX_INCP_4} ${DISTDIR}/${LX_INCP_5} ${DISTDIR}/${LX_INCP_6} ${DISTDIR}/${LX_INCP_7}" - -UNIPATCH_STRICTORDER="yes" - -IUSE="bfsonly deblob experimental urwlocks" - -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} ) )" - -PRE_CK_FIX="${FILESDIR}/ck-sources-3.4-3.5-PreCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch" -POST_CK_FIX="${FILESDIR}/ck-sources-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch" - -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}" - fi -fi - -src_unpack() { - kernel-2_src_unpack -} - -src_prepare() { - -# Working around BUG 436424 - - if use experimental ; then - if use urwlocks ; then - mv "${S}/linux-3.5.2-bfs/include/linux/urwlock.h" "${S}/include/linux/urwlock.h" - fi - fi - -# Dummy definitions for calc_load functions - - epatch "${FILESDIR}"/${PN}-3.4.9-calc_load_idle-aCOSwt_P3.patch - -# Comment out EXTRAVERSION added by CK patch: - - sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} diff --git a/sys-kernel/ck-sources/ck-sources-3.4.32.ebuild b/sys-kernel/ck-sources/ck-sources-3.4.34.ebuild index 6cac5f167f5d..12eda9a5f04a 100644 --- a/sys-kernel/ck-sources/ck-sources-3.4.32.ebuild +++ b/sys-kernel/ck-sources/ck-sources-3.4.34.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.4.32.ebuild,v 1.1 2013/02/23 18:27:58 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.4.34.ebuild,v 1.1 2013/03/03 17:13:28 hwoarang Exp $ EAPI="3" ETYPE="sources" @@ -11,7 +11,7 @@ HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/" K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="15" +K_GENPATCHES_VER="16" K_SECURITY_UNSUPPORTED="1" K_DEBLOB_AVAILABLE="1" @@ -23,7 +23,7 @@ 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 --- +#-- If Gentoo-Sources don't follow then extra incremental patches are needed - XTRA_INCP_MIN="" XTRA_INCP_MAX="" @@ -58,7 +58,10 @@ if [ -n "${XTRA_INCP_MIN}" ]; then done fi -#-- +#-- CK needs sometimes to patch itself... ------------------------------------- + +CK_INCP_URI="" +CK_INCP_LIST="" #-- Local patches needed for the ck-patches to apply smoothly ----------------- @@ -67,18 +70,22 @@ POST_CK_FIX="${FILESDIR}/${PN}-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSw #-- -SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} +SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} !bfsonly? ( ${CK_URI} ) bfsonly? ( ${BFS_URI} ) experimental? ( urwlocks? ( ${XPR_1_URI} ${XPR_2_URI} ) )" +UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}" + if ! use bfsonly ; then - UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${POST_CK_FIX}" + UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}" else - UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${BFS_FILE} ${POST_CK_FIX}" + UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}" fi +UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}" + if use experimental ; then if use urwlocks ; then UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${XPR_1_FILE} ${DISTDIR}/${XPR_2_FILE}:1" @@ -87,15 +94,18 @@ 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" + + elog + elog "For more info on this patchset, see: http://forums.gentoo.org/viewtopic-t-941030-start-0.html" + elog } diff --git a/sys-kernel/ck-sources/ck-sources-3.5.7-r1.ebuild b/sys-kernel/ck-sources/ck-sources-3.5.7-r1.ebuild deleted file mode 100644 index bfe7d9f620d4..000000000000 --- a/sys-kernel/ck-sources/ck-sources-3.5.7-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# 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.5.7-r1.ebuild,v 1.1 2012/10/29 20:48:04 hwoarang Exp $ - -EAPI="3" -ETYPE="sources" - -DESCRIPTION="Con Kolivas' high performance patchset + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ - http://users.on.net/~ckolivas/kernel/" - -KEYWORDS="~amd64 ~x86" - -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="7" -K_SECURITY_UNSUPPORTED="1" -K_DEBLOB_AVAILABLE="1" - -inherit kernel-2 versionator -detect_version -detect_arch - -BASE_VERSION="$(get_version_component_range 1-2)" -CK_VERSION="1" -BFS_VERSION="424" - -CK_FILE="patch-${BASE_VERSION}-ck${CK_VERSION}.bz2" -BFS_FILE="${BASE_VERSION}-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_URI="${CK_BASE_URL}/${BASE_VERSION}/${BASE_VERSION}-ck${CK_VERSION}/${CK_FILE}" -BFS_URI="${CK_BASE_URL}/${BASE_VERSION}/${BASE_VERSION}-ck${CK_VERSION}/patches/${BFS_FILE}" -XPR_1_URI="${CK_BASE_URL}/${BASE_VERSION}/${BASE_VERSION}-ck${CK_VERSION}/patches/${XPR_1_FILE}" -XPR_2_URI="${CK_BASE_URL}/${BASE_VERSION}/${BASE_VERSION}-ck${CK_VERSION}/patches/${XPR_2_FILE}" - -UNIPATCH_STRICTORDER="yes" - -IUSE="bfsonly deblob experimental urwlocks" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} - !bfsonly? ( ${CK_URI} ) - bfsonly? ( ${BFS_URI} ) - experimental? ( - urwlocks? ( ${XPR_1_URI} ${XPR_2_URI} ) )" - -PRE_CK_FIX="${FILESDIR}/ck-sources-3.4-3.5-PreCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch" -POST_CK_FIX="${FILESDIR}/ck-sources-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch" - -if ! use bfsonly ; then - UNIPATCH_LIST="${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${POST_CK_FIX}" -else - UNIPATCH_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}" - fi -fi -src_unpack() { - kernel-2_src_unpack -} - -src_prepare() { -# Working around BUG 436424 - if use experimental ; then - if use urwlocks ; then - mv "${S}/linux-3.5.2-bfs/include/linux/urwlock.h" "${S}/include/linux/urwlock.h" - fi - fi -# Comment out EXTRAVERSION added by CK patch: - sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} diff --git a/sys-kernel/ck-sources/ck-sources-3.4.23.ebuild b/sys-kernel/ck-sources/ck-sources-3.5.7-r2.ebuild index 726c13c527da..05f4dc04010b 100644 --- a/sys-kernel/ck-sources/ck-sources-3.4.23.ebuild +++ b/sys-kernel/ck-sources/ck-sources-3.5.7-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 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.4.23.ebuild,v 1.1 2012/12/13 18:47:56 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.5.7-r2.ebuild,v 1.1 2013/03/03 17:13:28 hwoarang Exp $ EAPI="3" ETYPE="sources" @@ -11,7 +11,7 @@ HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/" K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="12" +K_GENPATCHES_VER="8" K_SECURITY_UNSUPPORTED="1" K_DEBLOB_AVAILABLE="1" @@ -23,18 +23,18 @@ 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 --- +#-- If Gentoo-Sources don't follow then extra incremental patches are needed - -XTRA_INCP_MIN="11" -XTRA_INCP_MAX="22" +XTRA_INCP_MIN="" +XTRA_INCP_MAX="" #-- -CK_VERSION="3" +CK_VERSION="1" BFS_VERSION="424" CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2" -BFS_FILE="3.4-sched-bfs-${BFS_VERSION}.patch" +BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch" XPR_1_FILE="bfs${BFS_VERSION}-grq_urwlocks.patch" XPR_2_FILE="urw-locks.patch" @@ -49,7 +49,7 @@ XPR_2_URI="${CK_LVER_URL}/patches/${XPR_2_FILE}" LX_INCP_URI="" LX_INCP_LIST="" -if [ -n ${XTRA_INCP_MIN} ]; then +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" @@ -58,27 +58,34 @@ if [ -n ${XTRA_INCP_MIN} ]; then 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="${FILESDIR}/${PN}-3.4-3.5-PreCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch" -POST_CK_FIX="${FILESDIR}/${PN}-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch ${FILESDIR}/${PN}-3.4.9-calc_load_idle-aCOSwt_P3.patch" +POST_CK_FIX="${FILESDIR}/${PN}-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch" #-- -SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} +SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} !bfsonly? ( ${CK_URI} ) bfsonly? ( ${BFS_URI} ) experimental? ( urwlocks? ( ${XPR_1_URI} ${XPR_2_URI} ) )" +UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}" + if ! use bfsonly ; then - UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${POST_CK_FIX}" + UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}" else - UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${BFS_FILE} ${POST_CK_FIX}" + UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}" fi +UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}" + if use experimental ; then if use urwlocks ; then UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${XPR_1_FILE} ${DISTDIR}/${XPR_2_FILE}:1" @@ -87,15 +94,18 @@ 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" + + elog + elog "For more info on this patchset, see: http://forums.gentoo.org/viewtopic-t-941030-start-0.html" + elog } diff --git a/sys-kernel/ck-sources/ck-sources-3.6.11.ebuild b/sys-kernel/ck-sources/ck-sources-3.6.11-r1.ebuild index eef0cd9ff79c..11380d5dd5b3 100644 --- a/sys-kernel/ck-sources/ck-sources-3.6.11.ebuild +++ b/sys-kernel/ck-sources/ck-sources-3.6.11-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 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 $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.6.11-r1.ebuild,v 1.1 2013/03/03 17:13:28 hwoarang Exp $ EAPI="3" ETYPE="sources" @@ -11,7 +11,7 @@ HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/" K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="11" +K_GENPATCHES_VER="12" K_SECURITY_UNSUPPORTED="1" K_DEBLOB_AVAILABLE="1" @@ -23,7 +23,7 @@ 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 --- +#-- If Gentoo-Sources don't follow then extra incremental patches are needed - XTRA_INCP_MIN="" XTRA_INCP_MAX="" @@ -36,7 +36,7 @@ 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 ---------------------------------------- +#-- CK messed-up 3.6 branch filenames ----------------------------------------- BFS_FILE="3.5-sched-bfs-${BFS_VERSION}.patch" @@ -65,7 +65,10 @@ if [ -n "${XTRA_INCP_MIN}" ]; then done fi -#-- +#-- CK needs sometimes to patch itself... ------------------------------------- + +CK_INCP_URI="" +CK_INCP_LIST="" #-- Local patches needed for the ck-patches to apply smoothly ----------------- @@ -74,18 +77,22 @@ POST_CK_FIX="" #-- -SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} +SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} !bfsonly? ( ${CK_URI} ) bfsonly? ( ${BFS_URI} ) experimental? ( urwlocks? ( ${XPR_1_URI} ${XPR_2_URI} ) )" +UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}" + if ! use bfsonly ; then - UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${POST_CK_FIX}" + UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}" else - UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${BFS_FILE} ${POST_CK_FIX}" + UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}" fi +UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}" + if use experimental ; then if use urwlocks ; then UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${XPR_1_FILE} ${DISTDIR}/${XPR_2_FILE}:1" @@ -98,20 +105,18 @@ fi UNIPATCH_STRICTORDER="yes" -src_unpack() { - kernel-2_src_unpack -} - src_prepare() { -#-- Comment out ck's EXTRAVERSION in Makefile --------------------------------- +#-- 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" + + elog + elog "For more info on this patchset, see: http://forums.gentoo.org/viewtopic-t-941030-start-0.html" + elog } diff --git a/sys-kernel/ck-sources/ck-sources-3.7.9.ebuild b/sys-kernel/ck-sources/ck-sources-3.7.10.ebuild index 77c73e917063..79a63f9f97c8 100644 --- a/sys-kernel/ck-sources/ck-sources-3.7.9.ebuild +++ b/sys-kernel/ck-sources/ck-sources-3.7.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.7.9.ebuild,v 1.1 2013/02/23 18:27:58 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.7.10.ebuild,v 1.1 2013/03/03 17:13:28 hwoarang Exp $ EAPI="3" ETYPE="sources" @@ -11,7 +11,7 @@ HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/" K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="11" +K_GENPATCHES_VER="13" K_SECURITY_UNSUPPORTED="1" K_DEBLOB_AVAILABLE="1" @@ -96,7 +96,7 @@ UNIPATCH_STRICTORDER="yes" src_prepare() { -#-- Comment out ck's EXTRAVERSION in Makefile --------------------------------- +#-- Comment out CK's EXTRAVERSION in Makefile --------------------------------- sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" } @@ -105,19 +105,6 @@ pkg_postinst() { kernel-2_pkg_postinst - ewarn "" - ewarn "This release is concerned by numerous problems, non exhaustively :" - ewarn " - No current x11-drivers/nvidia-driver officially support it." - ewarn " Their build against this release is likely to break! See https://bugs.gentoo.org/show_bug.cgi?id=447566" - ewarn " - Known regressions concerning several USB peripherals including pcmcia and sound devices." - ewarn " See https://bugs.gentoo.org/show_bug.cgi?id=458600" - ewarn " - The deblobbing fails to complete exhaustively. See https://bugs.gentoo.org/show_bug.cgi?id=458032" - ewarn "" - ewarn "You are aware that, depending on the parameters given to the emerge command which triggered the installation of this package," - ewarn "any future emerge --depclean might remove from your system the ck-sources < ${PVR} distributions." - ewarn "If you decide not to keep this release, you are invited to add the following line to your package.mask file:" - ewarn "=${CATEGORY}/${P}" - elog elog "For more info on this patchset, see: http://forums.gentoo.org/viewtopic-t-941030-start-0.html" elog |