summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2004-11-24 21:21:32 +0000
committerPhil Blundell <philb@gnu.org>2004-11-24 21:21:32 +0000
commitb26bc7401d1dd01062b6022c51f4d16bf4e88ea3 (patch)
treeb476221aca76ff165e93c03a38ecf146a974137b
parent7ff29c463d5184385d32675ba12fc57b4b892b21 (diff)
downloadopenembedded-b26bc7401d1dd01062b6022c51f4d16bf4e88ea3.tar.gz
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into stealth.nexus.co.uk:/home/pb/oe/oe-packages 2004/11/24 21:20:11+00:00 nexus.co.uk!pb disable IMAGE_LINGUAS again on 16MB builds, since not apparently related to gconv crash drama BKrev: 41a4fb5c38uswCh-MdfgEOQKvxB9LQ
-rw-r--r--conf/machine/collie.conf2
-rw-r--r--conf/machine/h3600.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index c619313c14..1730a5e507 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -19,7 +19,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-IMAGE_LINGUAS = "en-gb"
+IMAGE_LINGUAS = ""
include conf/machine/handheld-common.conf
include conf/machine/tune-strongarm.conf
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index e7780208f9..83769104d6 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -32,7 +32,7 @@ usb-eth"
USE_DEVFS = "1"
-IMAGE_LINGUAS = "en-gb"
+IMAGE_LINGUAS = ""
include conf/machine/ipaq-common.conf
include conf/machine/handheld-common.conf