From: "Ulrich Mueller (ulm)" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass
Date: Thu, 14 Apr 2011 06:10:32 +0000 (UTC) [thread overview]
Message-ID: <20110414061032.6113220054@flycatcher.gentoo.org> (raw)
ulm 11/04/14 06:10:32
Modified: kernel-2.eclass
Log:
Don't PROVIDE virtual/os-headers, it is a new-style virtual now, bug 358999.
Fix whitespace.
Revision Changes Path
1.249 eclass/kernel-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.249&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.249&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.248&r2=1.249
Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- kernel-2.eclass 22 Mar 2011 00:39:09 -0000 1.248
+++ kernel-2.eclass 14 Apr 2011 06:10:32 -0000 1.249
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.248 2011/03/22 00:39:09 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.249 2011/04/14 06:10:32 ulm Exp $
# Description: kernel.eclass rewrite for a clean base regarding the 2.6
# series of kernel with back-compatibility for 2.4
@@ -53,7 +53,7 @@
# or the license will note the inclusion of freedist
# code.
# K_LONGTERM - If set, the eclass will search for the kernel source
-# in the long term directories on the upstream servers
+# in the long term directories on the upstream servers
# as the location has been changed by upstream
# H_SUPPORTEDARCH - this should be a space separated list of ARCH's which
# can be supported by the headers ebuild
@@ -161,14 +161,14 @@
KV_PATCH=$(get_version_component_range 3- ${OKV})
fi
KV_PATCH=${KV_PATCH/[-_]*}
-
+
local v n=0 missing
- for v in CKV OKV KV_{MAJOR,MINOR,PATCH} ; do
- [[ -z ${!v} ]] && n=1 && missing="${missing}${v} ";
+ for v in CKV OKV KV_{MAJOR,MINOR,PATCH} ; do
+ [[ -z ${!v} ]] && n=1 && missing="${missing}${v} ";
done
[[ $n -eq 1 ]] && \
eerror "Missing variables: ${missing}" && \
- die "Failed to extract kernel version (try explicit CKV in ebuild)!"
+ die "Failed to extract kernel version (try explicit CKV in ebuild)!"
unset v n missing
KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
@@ -223,7 +223,7 @@
# KV_FULL evaluates to MAJ.MIN.PAT.EXT.EXT after EXTRAVERSION
if [[ -n ${KV_EXTRA} ]]; then
OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
- KERNEL_URI="${KERNEL_BASE_URI}/patch-${CKV}.bz2
+ KERNEL_URI="${KERNEL_BASE_URI}/patch-${CKV}.bz2
${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.bz2"
fi
@@ -244,21 +244,21 @@
if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then
OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))"
- KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.bz2
+ KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.bz2
${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.bz2"
fi
if [[ ${RELEASETYPE} == -git ]]; then
- KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.bz2
+ KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.bz2
${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.bz2"
fi
if [[ ${RELEASETYPE} == -rc-git ]]; then
OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))"
- KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2
- ${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2
+ KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2
+ ${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2
${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2 ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2"
@@ -321,7 +321,7 @@
DEPEND="!build? ( sys-apps/sed
>=sys-devel/binutils-2.11.90.0.31 )"
RDEPEND="!build? ( >=sys-libs/ncurses-5.2
- sys-devel/make )"
+ sys-devel/make )"
PDEPEND="!build? ( virtual/dev-manager )"
PROVIDE="virtual/linux-sources"
@@ -355,7 +355,7 @@
fi
DEBLOB_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/${DEBLOB_A}"
HOMEPAGE="${HOMEPAGE} ${DEBLOB_HOMEPAGE}"
-
+
KERNEL_URI="${KERNEL_URI}
deblob? (
${DEBLOB_URI}
@@ -376,8 +376,6 @@
unset KBUILD_OUTPUT
if [[ ${CTARGET} = ${CHOST} ]]; then
- DEPEND="!virtual/os-headers"
- PROVIDE="virtual/os-headers"
SLOT="0"
else
SLOT="${CTARGET}"
next reply other threads:[~2011-04-14 6:10 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-14 6:10 Ulrich Mueller (ulm) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-02-13 1:30 [gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass Mike Pagano (mpagano)
2013-11-22 13:35 Mike Frysinger (vapier)
2013-07-31 21:25 Julian Ospald (hasufell)
2011-12-10 7:57 Mike Frysinger (vapier)
2011-12-08 19:39 Mike Frysinger (vapier)
2011-12-02 4:34 Mike Frysinger (vapier)
2011-12-02 4:19 Mike Frysinger (vapier)
2011-12-02 2:37 Mike Frysinger (vapier)
2011-12-02 2:28 Mike Frysinger (vapier)
2011-12-02 1:54 Mike Frysinger (vapier)
2011-12-02 0:15 Mike Frysinger (vapier)
2011-12-01 23:34 Mike Frysinger (vapier)
2011-12-01 23:32 Mike Frysinger (vapier)
2011-10-24 23:58 Mike Pagano (mpagano)
2011-08-19 13:26 Mike Pagano (mpagano)
2011-08-15 21:38 Mike Pagano (mpagano)
2011-08-11 14:09 Mike Pagano (mpagano)
2011-08-08 23:14 Mike Pagano (mpagano)
2011-08-08 14:14 Mike Pagano (mpagano)
2011-06-03 20:20 Mike Pagano (mpagano)
2011-06-03 13:07 Mike Pagano (mpagano)
2011-04-30 17:07 Ulrich Mueller (ulm)
2011-04-21 12:34 Mike Pagano (mpagano)
2011-03-22 0:39 Mike Pagano (mpagano)
2011-03-19 18:15 Samuli Suominen (ssuominen)
2011-03-15 13:16 Mike Pagano (mpagano)
2011-03-10 1:04 Mike Frysinger (vapier)
2011-02-18 20:07 Mike Pagano (mpagano)
2010-11-28 5:07 Robin H. Johnson (robbat2)
2010-11-26 23:41 Mike Pagano (mpagano)
2010-09-17 21:44 Tomas Chvatal (scarabeus)
2010-08-03 18:31 Robin H. Johnson (robbat2)
2010-08-03 17:22 Robin H. Johnson (robbat2)
2010-07-30 0:44 Mike Pagano (mpagano)
2010-07-19 20:19 Mike Frysinger (vapier)
2010-06-05 18:49 Mike Frysinger (vapier)
2010-05-28 21:00 Robin H. Johnson (robbat2)
2010-05-20 23:11 Robin H. Johnson (robbat2)
2010-05-02 11:05 Ulrich Mueller (ulm)
2010-05-02 8:48 Robin H. Johnson (robbat2)
2010-04-26 8:05 Robin H. Johnson (robbat2)
2010-04-26 7:26 Robin H. Johnson (robbat2)
2010-04-26 7:15 Robin H. Johnson (robbat2)
2010-04-26 6:48 Robin H. Johnson (robbat2)
2010-04-26 6:46 Robin H. Johnson (robbat2)
2010-04-26 6:44 Robin H. Johnson (robbat2)
2010-04-01 21:12 Robin H. Johnson (robbat2)
2009-12-13 18:56 Mike Pagano (mpagano)
2009-11-25 18:46 Mike Pagano (mpagano)
2009-10-20 19:51 Robin H. Johnson (robbat2)
2009-10-20 19:17 Zac Medico (zmedico)
2009-10-11 11:43 Markus Meier (maekke)
2009-08-28 16:28 Mike Pagano (mpagano)
2008-11-13 23:50 Mike Pagano (mpagano)
2008-08-07 2:05 Mike Pagano (mpagano)
2008-07-09 19:52 Friedrich Oslage (bluebird)
2008-06-01 23:29 Mike Pagano (mpagano)
2008-05-03 16:07 Daniel Drake (dsd)
2008-04-28 19:22 Mike Pagano (mpagano)
2008-04-12 22:45 Mike Frysinger (vapier)
2008-04-05 12:29 Mike Pagano (mpagano)
2008-03-01 18:47 Bo Oersted Andresen (zlin)
2007-12-17 16:05 Daniel Drake (dsd)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110414061032.6113220054@flycatcher.gentoo.org \
--to=ulm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox