summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/base.bbclass2
-rw-r--r--conf/machine/h3900.conf2
-rw-r--r--conf/machine/ipaq-pxa270.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 1da58a924e..37254b94ba 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -187,7 +187,7 @@ oe_libinstall() {
__runcmd install -m 0644 $dota $destpath/
fi
dotlai=$libname.lai
- if [ -f "$dotlai" -o -n "$libtool" ]; then
+ if [ -f "$dotlai" -a -n "$libtool" ]; then
__runcmd install -m 0644 $dotlai $destpath/$libname.la
fi
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index a095f15cdf..37dd0a52f2 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -5,7 +5,7 @@
KERNEL ?= "kernel24"
#KERNEL ?= "kernel26"
-OVERRIDES_prepend = "${KERNEL}:"
+OVERRIDES := "${KERNEL}:${OVERRIDES}"
TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm ipaqpxa h3900"
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index c860ea414d..9470fe009c 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -5,7 +5,7 @@
KERNEL ?= "kernel24"
#KERNEL ?= "kernel26"
-OVERRIDES_prepend = "${KERNEL}:"
+OVERRIDES := "${KERNEL}:${OVERRIDES}"
TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm ipaqpxa h3900"