[gentoo-commits] gentoo-x86 commit in sys-kernel/zen-sources: ChangeLog zen-sources-2.6.34_p1-r2.ebuild zen-sources-2.6.34_p1.ebuild zen-sources-2.6.34_p1-r1.ebuild

[Alex Alexander (wired)]

wired       10/07/27 14:03:21

  Modified:             ChangeLog zen-sources-2.6.34_p1.ebuild
  Added:                zen-sources-2.6.34_p1-r2.ebuild
  Removed:              zen-sources-2.6.34_p1-r1.ebuild
  Log:
  new revision with updated bfq patch. bug #327415. removed bfq from 2.6.34_p1. switched to EAPI 2.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.40                 sys-kernel/zen-sources/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/zen-sources/ChangeLog?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/zen-sources/ChangeLog?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/zen-sources/ChangeLog?r1=1.39&r2=1.40

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ChangeLog	7 Jul 2010 12:18:20 -0000	1.39
+++ ChangeLog	27 Jul 2010 14:03:21 -0000	1.40
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/zen-sources
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.39 2010/07/07 12:18:20 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.40 2010/07/27 14:03:21 wired Exp $
+
+*zen-sources-2.6.34_p1-r2 (27 Jul 2010)
+
+  27 Jul 2010; Alex Alexander <wired@g.o>
+  zen-sources-2.6.34_p1.ebuild, -zen-sources-2.6.34_p1-r1.ebuild,
+  +zen-sources-2.6.34_p1-r2.ebuild:
+  new revision with updated bfq patch. bug #327415. removed bfq from
+  2.6.34_p1. switched to EAPI 2.
 
 *zen-sources-2.6.34_p1-r1 (07 Jul 2010)
 



1.3                  sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild?r1=1.2&r2=1.3

Index: zen-sources-2.6.34_p1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zen-sources-2.6.34_p1.ebuild	7 Jul 2010 08:04:05 -0000	1.2
+++ zen-sources-2.6.34_p1.ebuild	27 Jul 2010 14:03:21 -0000	1.3
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild,v 1.2 2010/07/07 08:04:05 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild,v 1.3 2010/07/27 14:03:21 wired Exp $
+
+EAPI="2"
 
 COMPRESSTYPE=".lzma"
 K_USEPV="yes"
@@ -21,15 +23,10 @@
 ZEN_KERNEL="${ZEN_KERNEL/_/-}"
 ZEN_FILE="${ZEN_KERNEL}-zen${ZEN_PATCHSET}.patch${COMPRESSTYPE}"
 ZEN_URI="http://downloads.zen-kernel.org/$(get_version_component_range 1-3)/${ZEN_FILE}"
-ZEN_PATCHES="
-	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0001-block-prepare-I-O-context-code-for-BFQ.patch
-	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0002-block-add-cgroups-kconfig-and-build-bits-for-BFQ.patch
-	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0003-block-introduce-the-BFQ-I-O-scheduler.patch
-"
-SRC_URI="${KERNEL_URI} ${ZEN_URI} bfq? ( ${ZEN_PATCHES} )"
+SRC_URI="${KERNEL_URI} ${ZEN_URI}"
 
 KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bfq"
+IUSE=""
 
 DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )"
 
@@ -47,15 +44,8 @@
 	kernel-2_pkg_setup
 }
 
-src_unpack(){
-	kernel-2_src_unpack
-	cd "${S}"
+src_prepare(){
 	epatch "${DISTDIR}"/"${ZEN_FILE}"
-	if use bfq; then
-		for p in ${ZEN_PATCHES}; do
-			epatch "${DISTDIR}/${p/*\/}"
-		done
-	fi
 }
 
 K_EXTRAEINFO="For more info on zen-sources and details on how to report problems, see: \



1.1                  sys-kernel/zen-sources/zen-sources-2.6.34_p1-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r2.ebuild?rev=1.1&content-type=text/plain

Index: zen-sources-2.6.34_p1-r2.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r2.ebuild,v 1.1 2010/07/27 14:03:21 wired Exp $

EAPI="2"

COMPRESSTYPE=".lzma"
K_USEPV="yes"
UNIPATCH_STRICTORDER="yes"
K_SECURITY_UNSUPPORTED="1"

CKV="${PV/_p[0-9]*}"
ETYPE="sources"
inherit kernel-2
detect_version
K_NOSETEXTRAVERSION="don't_set_it"

DESCRIPTION="The Zen Kernel Sources v2.6"
HOMEPAGE="http://zen-kernel.org"

ZEN_PATCHSET="${PV/*_p}"
ZEN_KERNEL="${PV/_p[0-9]*}"
ZEN_KERNEL="${ZEN_KERNEL/_/-}"
ZEN_FILE="${ZEN_KERNEL}-zen${ZEN_PATCHSET}.patch${COMPRESSTYPE}"
ZEN_URI="http://downloads.zen-kernel.org/$(get_version_component_range 1-3)/${ZEN_FILE}"
ZEN_PATCHES="
	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0001-block-prepare-I-O-context-code-for-BFQ.patch
	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0002-block-add-cgroups-kconfig-and-build-bits-for-BFQ.patch
	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0003-block-introduce-the-BFQ-I-O-scheduler.patch -> 0003-block-introduce-the-BFQ-I-O-scheduler-r1.patch
"
SRC_URI="${KERNEL_URI} ${ZEN_URI} bfq? ( ${ZEN_PATCHES} )"

KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
IUSE="bfq"

DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )"

KV_FULL="${PVR/_p/-zen}"
S="${WORKDIR}"/linux-"${KV_FULL}"

pkg_setup(){
	ewarn
	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
	ewarn "If you need support, please contact the Zen developers directly."
	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
	ewarn "the ebuilds. Thank you."
	ewarn
	ebeep 8
	kernel-2_pkg_setup
}

src_prepare(){
	epatch "${DISTDIR}"/"${ZEN_FILE}"
	if use bfq; then
		EPATCH_OPTS="-p1"
		epatch "${DISTDIR}/0001-block-prepare-I-O-context-code-for-BFQ.patch"
		epatch "${DISTDIR}/0002-block-add-cgroups-kconfig-and-build-bits-for-BFQ.patch"
		epatch "${DISTDIR}/0003-block-introduce-the-BFQ-I-O-scheduler-r1.patch"
	fi
}

K_EXTRAEINFO="For more info on zen-sources and details on how to report problems, see: \
${HOMEPAGE}. You may also visit #zen-sources on irc.rizon.net"