From 24f79c1975fb1530fd61c43e24d50d0faef4a426 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Fri, 2 Jan 2004 01:32:54 +0000 Subject: [PATCH] sparc fixes: do not (yet) build a sun4 kernel by default (can be a package- split in 2.1 ...) and only try to create the 64bit headers if a 64bit gcc should be present git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2094 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/linux24-header/linux24-header.conf | 5 +++-- package/base/linux24/linux24.conf | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package/base/linux24-header/linux24-header.conf b/package/base/linux24-header/linux24-header.conf index b02c193d6..f7191c27a 100644 --- a/package/base/linux24-header/linux24-header.conf +++ b/package/base/linux24-header/linux24-header.conf @@ -45,8 +45,9 @@ main_lx_header() { # build two generated headers first ... make ARCH=sparc TOPDIR=$PWD HPATH=$PWD/include \ arch/sparc/kernel/Makefile check_asm - make ARCH=sparc64 TOPDIR=$PWD HPATH=$PWD/include \ - arch/sparc64/kernel/Makefile check_asm + [ $lx_cpu = sparc64 ] && \ + make ARCH=sparc64 TOPDIR=$PWD HPATH=$PWD/include \ + arch/sparc64/kernel/Makefile check_asm fi cp -rv include/{asm-{sparc{,64},generic},linux} $root/$prefix/include/ diff --git a/package/base/linux24/linux24.conf b/package/base/linux24/linux24.conf index de54fbc4c..9febf5c72 100644 --- a/package/base/linux24/linux24.conf +++ b/package/base/linux24/linux24.conf @@ -90,13 +90,13 @@ main_lx() { [ "$default" ] && \ cp -vf vmlinux $root/boot/vmlinux # build a sun4 kernel ... - echo "CONFIG_SUN4=y" >> .config - yes '' | eval $MAKE oldconfig > /dev/null - eval $MAKE vmlinux - cp -vf vmlinux $root/boot/vmlinux4_$ver-rock + #echo "CONFIG_SUN4=y" >> .config + #yes '' | eval $MAKE oldconfig > /dev/null + #eval $MAKE vmlinux + #cp -vf vmlinux $root/boot/vmlinux4_$ver-rock [ "$default" ] && \ - cp -vf vmlinux $root/boot/vmlinux4 - echo "# CONFIG_SUN4 is not set" >> .config + # cp -vf vmlinux $root/boot/vmlinux4 + #echo "# CONFIG_SUN4 is not set" >> .config yes '' | eval $MAKE oldconfig > /dev/null ;; *)