From: Robin H. Johnson Date: Tue, 26 Jul 2011 22:34:00 +0000 (+0000) Subject: Bug #376467: fix kernel version checks for 3.0 kernel. X-Git-Tag: v3.4.18~2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d7de35394a704c993b9986c2e70adcd4083ee6b;p=genkernel.git Bug #376467: fix kernel version checks for 3.0 kernel. Signed-off-by: Robin H. Johnson --- diff --git a/ChangeLog b/ChangeLog index b11433a..4c24c6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ # Distributed under the GPL v2 # $Id$ + 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.scripts, 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=${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