From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QlqCd-0002v8-V5 for garchives@archives.gentoo.org; Tue, 26 Jul 2011 22:34:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBBC421C0D6; Tue, 26 Jul 2011 22:34:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BECE221C0FF for ; Tue, 26 Jul 2011 22:34:06 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 442242AC016 for ; Tue, 26 Jul 2011 22:34:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 681378003D for ; Tue, 26 Jul 2011 22:34:05 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <3d7de35394a704c993b9986c2e70adcd4083ee6b.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog gen_arch.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 3d7de35394a704c993b9986c2e70adcd4083ee6b Date: Tue, 26 Jul 2011 22:34:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1eeb506e75b4b29cc72e6fd879f1015f commit: 3d7de35394a704c993b9986c2e70adcd4083ee6b Author: Robin H. Johnson gentoo org> AuthorDate: Tue Jul 26 22:34:00 2011 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Jul 26 22:34:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D3d7de353 Bug #376467: fix kernel version checks for 3.0 kernel. Signed-off-by: Robin H. Johnson gentoo.org> --- ChangeLog | 3 +++ gen_arch.sh | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b11433a..4c24c6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ # Distributed under the GPL v2 # $Id$ =20 + 26 Jul 2011; Robin H. Johnson gen_arch.sh: + Bug #376467: fix kernel version checks for 3.0 kernel. + 23 Jul 2011; Sebastian Pipping defaults/initrd.scri= pts, netboot/linuxrc.x: Fix permissions of /dev/pts (bug #375947) diff --git a/gen_arch.sh b/gen_arch.sh index 079edb2..c7bd3cc 100755 --- a/gen_arch.sh +++ b/gen_arch.sh @@ -51,7 +51,10 @@ set_kernel_arch() { KERNEL_ARCH=3D${ARCH} case ${ARCH} in ppc|ppc64) - if [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ] + if [ "${VER}" -ge "3" ] + then + KERNEL_ARCH=3Dpowerpc + elif [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ] then if [ "${PAT}" -eq "6" -a "${SUB}" -ge "16" ] || [ "${PAT}" -gt "6" ] then @@ -60,7 +63,10 @@ set_kernel_arch() { fi ;; x86) - if [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ] || [ "${VER}" -gt "2" ] + if [ "${VER}" -ge "3" ] + then + KERNEL_ARCH=3Dx86 + elif [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ] || [ "${VER}" -gt "2" ] then if [ "${PAT}" -eq "6" -a "${SUB}" -ge "24" ] || [ "${PAT}" -gt "6" ] then @@ -71,7 +77,10 @@ set_kernel_arch() { fi ;; x86_64) - if [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ] || [ "${VER}" -gt "2" ] + if [ "${VER}" -ge "3" ] + then + KERNEL_ARCH=3Dx86 + elif [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ] || [ "${VER}" -gt "2" ] then if [ "${PAT}" -eq "6" -a "${SUB}" -ge "24" ] || [ "${PAT}" -gt "6" ] then