diff options
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 2 | ||||
| -rw-r--r-- | conf/local.conf.sample | 7 | ||||
| -rw-r--r-- | conf/machine/native.conf | 2 | ||||
| -rw-r--r-- | conf/machine/poodle.conf | 4 | ||||
| -rw-r--r-- | conf/machine/simpad.conf | 4 | ||||
| -rw-r--r-- | conf/machine/tosa.conf | 4 |
6 files changed, 12 insertions, 11 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 5c1ed1296d..9c1208c690 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -52,7 +52,7 @@ PREFERRED_PROVIDER_libx11 = "diet-x11" #Make sure we use 2.6 on machines with a 2.4/2.6 selector KERNEL = "kernel26" -ZKERNEL_VERSION = "2.6" +MACHINE_KERNEL_VERSION = "2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 4417b67862..9d23b654cf 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -88,9 +88,10 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # ENABLE_BINARY_LOCALE_GENERATION = "0" # ASSUME_PROVIDED += "qemu-native" -# Uncomment this to select a particular kernel version if supported by -# your MACHINE setting. Currently only supported by poodle and tosa. -# ZKERNEL_VERSION = "2.6" +# Uncomment this to select a particular major kernel version if the MACHINE setting +# supports more than one major kernel version. Currently this is suported by the +# following MACHINE types: poodle, tosa and simpad. +# MACHINE_KERNEL_VERSION = "2.6" # Uncomment one of these to build packages during the build process. # This is done automatically if you set DISTRO (see above) diff --git a/conf/machine/native.conf b/conf/machine/native.conf index 92c3072c8c..d3c77bf9bd 100644 --- a/conf/machine/native.conf +++ b/conf/machine/native.conf @@ -7,7 +7,7 @@ TARGET_PREFIX = "" VENDOR = "-oe" PREFERRED_PROVIDER_virtual/kernel = "native-kernel" -ASSUME_PROVIDED += "virtual/gcc-initial virtual/gcc virtual/g++" +ASSUME_PROVIDED += "virtual/gcc-initial virtual/gcc virtual/g++ virtual/libc virtual/libintl virtual/libiconv" ASSUME_PROVIDED += "binutils-cross" ASSUME_PROVIDED += "virtual/libiconv virtual/libintl virtual/libc" diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index 79915e4f74..49eaf1ef4b 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -5,8 +5,8 @@ TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv5te" -ZKERNEL_VERSION ?= "2.4" -include conf/machine/include/poodle-${ZKERNEL_VERSION}.conf +MACHINE_KERNEL_VERSION ?= "2.4" +include conf/machine/include/poodle-${MACHINE_KERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index b928c72ca7..b227312589 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -2,8 +2,8 @@ #@NAME: SIEMENS SIMpad SL4, SIEMENS SIMpad CL4, SIEMENS SIMpad SLC, Telekom T-Sinus PAD #@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices -ZKERNEL_VERSION ?= "2.4" -require conf/include/simpad-${ZKERNEL_VERSION}.conf +MACHINE_KERNEL_VERSION ?= "2.4" +require conf/include/simpad-${MACHINE_KERNEL_VERSION}.conf TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 751b498f14..2652004f82 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -5,8 +5,8 @@ TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv5te" -ZKERNEL_VERSION ?= "2.4" -include conf/machine/include/tosa-${ZKERNEL_VERSION}.conf +MACHINE_KERNEL_VERSION ?= "2.4" +include conf/machine/include/tosa-${MACHINE_KERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" |