Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: /, defaults/
Date: Tue, 31 May 2011 10:59:02
Message-Id: 6b92c54c1ecc90735f101fafab65d993938d8ee6.sping@gentoo
1 commit: 6b92c54c1ecc90735f101fafab65d993938d8ee6
2 Author: Nelson Batalha <nelson.batalha <AT> gmail <DOT> com>
3 AuthorDate: Tue May 31 10:57:09 2011 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Tue May 31 10:57:09 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6b92c54c
7
8 Add Kernel 3.0.0 support (bug #369481)
9
10 ---
11 ChangeLog | 3 +++
12 defaults/initrd.defaults | 4 ++--
13 2 files changed, 5 insertions(+), 2 deletions(-)
14
15 diff --git a/ChangeLog b/ChangeLog
16 index 6c402d6..03f20db 100644
17 --- a/ChangeLog
18 +++ b/ChangeLog
19 @@ -5,6 +5,9 @@
20 # Distributed under the GPL v2
21 # $Id$
22
23 + 31 May 2011; Nelson Batalha <nelson.batalha@×××××.com> defaults/initrd.defaults:
24 + Add Kernel 3.0.0 support (bug #369481)
25 +
26 31 May 2011; Sebastian Pipping <sping@g.o> genkernel:
27 Output warning in warning color
28
29
30 diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
31 index fd6d9fc..72e8376 100755
32 --- a/defaults/initrd.defaults
33 +++ b/defaults/initrd.defaults
34 @@ -50,7 +50,7 @@ KMINOR=`echo $KV | cut -f2 -d.`
35 KVER="${KMAJOR}.${KMINOR}"
36 MISCOPTS='debug detect'
37
38 -if [ "${KMAJOR}" -eq 2 -a "${KMINOR}" -ge '6' ]
39 +if [ "${KMAJOR}" -ge 3 ] || [ "${KMAJOR}" -eq 2 -a "${KMINOR}" -eq '6' ]
40 then
41 KV_2_6_OR_GREATER="yes"
42 fi
43 @@ -59,7 +59,7 @@ QUIET='1'
44 ROOT_LINKS='bin sbin lib lib32 lib64 boot usr opt emul'
45 ROOT_TREES='etc root home var'
46 INSMOD='insmod'
47 -if [ "${KMINOR}" -gt '4' ]
48 +if [ "${KMAJOR}" -ge 3 ] || [ "${KMAJOR}" -eq 2 -a "${KMINOR}" -gt '4' ]
49 then
50 KSUFF='.ko'
51 else