8 files changed, 30 insertions, 11 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index a08ba97fde..53139e19fa 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -51,6 +51,13 @@ def base_conditional(variable, checkvalue, truevalue, falsevalue, d):
 	else:
 		return falsevalue
 
+def base_less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
+	import bb
+	if float(bb.data.getVar(variable,d,1)) <= float(checkvalue):
+		return truevalue
+	else:
+		return falsevalue
+
 def base_contains(variable, checkvalues, truevalue, falsevalue, d):
 	import bb
 	matches = 0
diff --git a/classes/opie.bbclass b/classes/opie.bbclass
index d858439688..c3b9d13226 100644
--- a/classes/opie.bbclass
+++ b/classes/opie.bbclass
@@ -19,6 +19,10 @@ OPIE_CVS_PV = "1.2.2+cvs${SRCDATE}"
 
 DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}"
 
+FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \
+                     ${palmtopdir}/bin/.debug \
+                     ${palmtopdir}/plugins/*/.debug "
+
 # to be consistent, put all targets into workdir
 # NOTE: leave one space at the end, other files are expecting that
 EXTRA_QMAKEVARS_POST += "DESTDIR=${S} "
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index a6293794dc..f3c4a63217 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.3"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "33"
+DISTRO_REVISION = "34"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -23,7 +23,8 @@ DISTRO_TYPE ?= "debug"
 # will RRECOMMEND as much as possible content for a given language
 # (locales, UI transalations, help, etc. - useless for pros, but really 
 # helpful for common users).
-IMAGE_LINGUAS = "en-gb"
+# Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
+IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}'
 
 #Set the right arch for the feeds
 #Alphabetically sorted
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index 1bab2f5fc7..6f0d5b20eb 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -4,6 +4,8 @@
 
 MACHINE_FEATURES = "kernel26 usbhost ext2"
 
+ROOT_FLASH_SIZE ?= "12"
+
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf
index 3ca3baf952..87fab62b65 100644
--- a/conf/machine/nslu2be.conf
+++ b/conf/machine/nslu2be.conf
@@ -10,6 +10,9 @@ MACHINE_ARCH = "ixp4xxbe"
 
 OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
+ROOT_FLASH_SIZE ?= "6"
+
 require conf/machine/include/ixp4xx.conf
 
 EXTRA_IMAGECMD_jffs2 += "--big-endian"
+
diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf
index bbbd6cdeb4..16114a80fa 100644
--- a/conf/machine/nslu2le.conf
+++ b/conf/machine/nslu2le.conf
@@ -10,6 +10,8 @@ MACHINE_ARCH = "ixp4xxle"
 
 OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
+ROOT_FLASH_SIZE ?= "6"
+
 require conf/machine/include/ixp4xx.conf
 
 EXTRA_IMAGECMD_jffs2 += "--little-endian"
diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc
index bbd6215539..2124bfe6c1 100644
--- a/packages/madwifi/madwifi-ng_r.inc
+++ b/packages/madwifi/madwifi-ng_r.inc
@@ -4,17 +4,16 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
 DEPENDS = "virtual/kernel"
-PR="r1"
+PR="r3"
+
+WACKELF_SRC_URI = ""
+WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch;patch=1"
 
 SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \
 	   file://10-xscale-be-elf-copts.patch;patch=1 \
 	   file://10-xscale-le-elf-copts.patch;patch=1 \
-	   file://10-sh4-le-elf-copts.patch;patch=1"
-
-SRC_URI_slugos = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \
-		  file://slugos-xscale-be-elf-copts.patch;patch=1 \
-		  file://slugos-xscale-le-elf-copts.patch;patch=1 \
-		  file://slugos-VFP-wackelf.patch;patch=1"
+           file://10-sh4-le-elf-copts.patch;patch=1 \
+	   ${WACKELF_SRC_URI}"
 
 S = "${WORKDIR}/${PN}-${PV}"
 
diff --git a/packages/opie-handwriting/opie-handwriting.inc b/packages/opie-handwriting/opie-handwriting.inc
index caecc65d58..86b9ab51c6 100644
--- a/packages/opie-handwriting/opie-handwriting.inc
+++ b/packages/opie-handwriting/opie-handwriting.inc
@@ -3,6 +3,7 @@ SECTION = "opie/inputmethods"
 PRIORITY = "optional"
 LICENSE = "GPL"
 APPNAME = "qhandwriting"
+PR = "r1"
 
 
 S = "${WORKDIR}/handwriting"
@@ -35,9 +36,9 @@ do_install() {
 	done
 }
 
-PACKAGES = " opie-handwriting-classicset opie-handwriting-graffitiset opie-handwriting "
+PACKAGES += " opie-handwriting-classicset opie-handwriting-graffitiset "
 
-FILES_opie-handwriting = "${palmtopdir}/plugins/inputmethods/libqhandwriting.so*"
+FILES_${PN} = "${palmtopdir}/plugins/inputmethods/libqhandwriting.so*"
 FILES_opie-handwriting-classicset = "${palmtopdir}/etc/qimpen/default.conf \
 	${palmtopdir}/etc/qimpen/combining.qpt \
 	${palmtopdir}/etc/qimpen/asciilower.qpt \