Bug #376467: fix kernel version checks for 3.0 kernel.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index b11433ac1f978ff9a4d3f580253a31bfc180b752..4c24c6e53b04d7430cc816b6dcab7f0391bbd960 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  26 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> gen_arch.sh:
+  Bug #376467: fix kernel version checks for 3.0 kernel.
+
   23 Jul 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
   netboot/linuxrc.x:
   Fix permissions of /dev/pts (bug #375947)

diff --git a/gen_arch.sh b/gen_arch.sh
index 079edb21862dc209449422bfa43d9105a1a2b646..c7bd3ccfffdce92927d231a3ca7a790c29a1ed6e 100755 (executable)
--- a/gen_arch.sh
+++ b/gen_arch.sh
@@ -51,7 +51,10 @@ set_kernel_arch() {
        KERNEL_ARCH=${ARCH}
        case ${ARCH} in
                ppc|ppc64)
-                       if [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ]
+                       if [ "${VER}" -ge "3" ]
+                       then
+                                       KERNEL_ARCH=powerpc
+                       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=x86
+                       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=x86
+                       elif [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ] || [ "${VER}" -gt "2" ]
                        then
                                if [ "${PAT}" -eq "6" -a "${SUB}" -ge "24" ] || [ "${PAT}" -gt "6" ]
                                then