summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-06-14 23:57:56 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-06-14 23:57:56 +0000
commitfc9beec2c099a3179d3407aeb18a6f84e1696e93 (patch)
treeaea3533e4d93d6a8a1fdef5fa848483f3faa6189 /conf/distro
parent57ad8dc08734e9ecb1026af0a712efabea4f611a (diff)
parent18d8eeb8c0504dbfdfe7f11931dd30dcdd5fbcb8 (diff)
merge of 619c2a2f86cda6fa47d337c32bb59fd59bfd2697
and 6c5f6dd92dc9e167c3598305801931820379802a
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2006.9.conf2
-rw-r--r--conf/distro/generic-uclibc.conf3
-rw-r--r--conf/distro/generic.conf3
-rw-r--r--conf/distro/openzaurus-unstable.conf2
4 files changed, 6 insertions, 4 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/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf
index d9ace6d629..b26238e66e 100644
--- a/conf/distro/generic-uclibc.conf
+++ b/conf/distro/generic-uclibc.conf
@@ -19,6 +19,7 @@ DISTRO_NAME = "generic-uClibC"
# Target OS and FPU system
#
TARGET_OS = "linux-uclibc"
-TARGET_FPU = "soft"
+TARGET_FPU_arm = "soft"
+TARGET_FPU_armeb = "soft"
PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
PREFERRED_PROVIDER_virtual/libintl = "libintl"
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index e6671d1337..594958600f 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -45,7 +45,8 @@ PREFERRED_VERSION_binutils = "2.15.94.0.1"
# Target OS and FPU system
#
TARGET_OS = "linux"
-TARGET_FPU = "soft"
+TARGET_FPU_arm = "soft"
+TARGET_FPU_armeb = "soft"
PREFERRED_PROVIDER_virtual/libiconv = "glibc"
PREFERRED_PROVIDER_virtual/libintl = "glibc"
PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 9f79c32118..89944023ad 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -25,7 +25,7 @@ DISTRO_TYPE = "debug"
# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
-SRCDATE = "20060514"
+SRCDATE ?= "20060514"
#
# Zaurus
#