summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-02-12 14:51:51 +0000
committerMichael Lauer <mickey@vanille-media.de>2005-02-12 14:51:51 +0000
commitea605558163ab44a51e471329f7fc93fef92624c (patch)
tree8ad2d078377e46cfda320a079ce8af9a4a67f2fb
parentac6d72376725b52126687287b7c2ff016b34c252 (diff)
allow local.conf overriding TARGET_FPU and TARGET_OS in distro configurations
BKrev: 420e1807OT8rClMNOpsxrgA3Fmm7LA
-rw-r--r--conf/distro/familiar.conf2
-rw-r--r--conf/distro/opensimpad.conf3
-rw-r--r--conf/distro/openzaurus-3.5.3.conf2
-rw-r--r--conf/distro/openzaurus.conf4
-rw-r--r--conf/distro/switchbox.conf2
-rw-r--r--conf/distro/unslung.conf4
6 files changed, 9 insertions, 8 deletions
diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf
index 7fd483620f..095815b183 100644
--- a/conf/distro/familiar.conf
+++ b/conf/distro/familiar.conf
@@ -3,5 +3,5 @@
#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
INHERIT += " package_ipk debian"
-TARGET_OS = "linux"
+TARGET_OS ?= "linux"
diff --git a/conf/distro/opensimpad.conf b/conf/distro/opensimpad.conf
index c8513da48e..3f2ddeaff1 100644
--- a/conf/distro/opensimpad.conf
+++ b/conf/distro/opensimpad.conf
@@ -3,5 +3,6 @@
#@DESCRIPTION: Distribution configuration for OpenSIMpad (http://www.opensimpad.org)
INHERIT += " package_ipk debian"
-TARGET_OS = "linux"
+TARGET_OS ?= "linux"
+TARGET_FPU ?= "soft"
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index 77f7283dbb..d1dfffa4ac 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -38,7 +38,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
# Opie
#
-PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
OPIE_VERSION = "1.2.0"
include conf/distro/preferred-opie-versions.inc
diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf
index 4af0dfc85f..64a1d3469b 100644
--- a/conf/distro/openzaurus.conf
+++ b/conf/distro/openzaurus.conf
@@ -3,5 +3,5 @@
#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org)
INHERIT += " package_ipk debian"
-TARGET_OS = "linux"
-TARGET_FPU = "soft"
+TARGET_OS ?= "linux"
+TARGET_FPU ?= "soft"
diff --git a/conf/distro/switchbox.conf b/conf/distro/switchbox.conf
index 5cb8cfaaaa..bc9100d29b 100644
--- a/conf/distro/switchbox.conf
+++ b/conf/distro/switchbox.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: SwitchBox Linux Distribution for the NSLU2
TARGET_FPU ?= "soft"
-TARGET_OS = "linux-uclibc"
+TARGET_OS ?= "linux-uclibc"
INHERIT += " package_ipk debian"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 8108b2b767..a389155b55 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -4,8 +4,8 @@
FEED_URIS_unslung = "unslung##http://ipkg.nslu2-linux.org/feeds/unslung/unstable"
-TARGET_FPU = "soft"
-TARGET_OS = "linux"
+TARGET_FPU ?= "soft"
+TARGET_OS ?= "linux"
INHERIT += " package_ipk nslu2_flashimg"