diff --git a/base/linux26/linux-conf.in b/base/linux26/linux-conf.in index ea11e4a87..8f5e0b9a6 100644 --- a/base/linux26/linux-conf.in +++ b/base/linux26/linux-conf.in @@ -24,11 +24,7 @@ done [ "$lx_cpu" ] || # powerpc and mips share the same arch for 32/64, maybe more follow lx_cpu=`echo $arch | arch2uname | sed -e s/ppc.*/powerpc/ -e s/mips64/mips/` -lx_arch=`echo $lx_cpu | sed 's/i386/x86/;s/x86_64/x86/;s/ppc.*/powerpc/'` -lx_subarch=`echo $lx_cpu | sed 's/i.86/i386/;s/sun4u/sparc64/;\ - s/arm.*/arm/;s/sa110/arm/;\ - s/s390x/s390/;s/parisc64/parisc/;\ - s/ppc.*/powerpc/;s/mips.*/mips/'` + lx_extraversion= lx_kernelrelease= lx_customconf="$base/config/$config/linux.cfg" @@ -68,11 +64,8 @@ makeopt= # we need +1 to really saturate the CPUs during the kernel build [ $SDECFG_PARALLEL_MAX -gt 1 ] && var_append makeopt ' ' -j$(( $SDECFG_PARALLEL_MAX + 1 )) -if [ $lx_mergedarch = 1 ]; then - var_append makeopt ' ' "ARCH=$lx_arch CROSS_COMPILE=$archprefix KCC=$KCC" -else - var_append makeopt ' ' "ARCH=$lx_cpu CROSS_COMPILE=$archprefix KCC=$KCC" -fi + +var_append makeopt ' ' "ARCH=$lx_cpu CROSS_COMPILE=$archprefix KCC=$KCC" makeinstopt="$makeopt" auto_config_merge() {