merge of '33abb5c4baf70a48836aa488bb5c4229e5b3d9b8'

     and '33dc2a587b8be8674e81f177135b2766463febfb'

8 files changed, 28 insertions, 16 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 9f6814e526..947afc3018 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -198,7 +198,7 @@ IMAGE_CMD_ext3 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_
 IMAGE_CMD_ext3.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
 IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
 IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend"
-IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
+IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."
 IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ."
 IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
 IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 02d54686f8..daffdda6de 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -90,6 +90,12 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 # ENABLE_BINARY_LOCALE_GENERATION = "0"
 # ASSUME_PROVIDED += "qemu-native"
 
+# If ENABLE_BINARY_LOCALE_GENERATION is set to "1", you can limit locales
+# generated to the list provided by GLIBC_GENERATE_LOCALES. This is huge
+# time-savior for developmental builds. Format: list of locale.encoding pairs
+# with spaces as separators.
+# GLIBC_GENERATE_LOCALES = "en_GB.UTF-8 de_DE.UTF-8"
+
 # Uncomment this to select a particular major kernel version if the MACHINE setting
 # supports more than one major kernel version. Currently this is suported by the
 # following MACHINE types: poodle, tosa and simpad.
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
index 93325d253b..f66502eff1 100644
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -1,13 +1,13 @@
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
 
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
-		   --output=${T}/${IMAGE_NAME}.rootfs.jffs2; \
-                   sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
+                   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
+                   && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
                    -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
                    --eraseblock=${ERASEBLOCKSIZE} -l -p; \
-		   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-		   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
+                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+                   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
                    rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
                    cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-		   ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
+                   ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
                    rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index 5783ab1fcf..4bd4223657 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -202,9 +202,14 @@ python package_do_split_gconvs () {
 	do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
 	bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' glibc-gconv', d)
 
-	f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r")
-	supported = f.readlines()
-	f.close()
+	supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1)
+	if not supported or supported == "all":
+	    f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r")
+	    supported = f.readlines()
+	    f.close()
+	else:
+	    supported = supported.split()
+	    supported = map(lambda s:s.replace(".", " ") + "\n", supported)
 
 	dot_re = re.compile("(.*)\.(.*)")
 
diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb
index a0f4a7f484..5022afa41a 100644
--- a/packages/matchbox2/matchbox-panel-2_svn.bb
+++ b/packages/matchbox2/matchbox-panel-2_svn.bb
@@ -3,11 +3,11 @@ LICENSE = "GPL"
 SECTION = "x11/panels"
 DEPENDS = "gtk+"
 
-RREPLACES = "matchbox-panel"
-RCONFLICTS = "matchbox-panel"
+RREPLACES_${PN} = "matchbox-panel"
+RCONFLICTS_${PN} = "matchbox-panel"
 
 PV = "0.1+svn${SRCDATE}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 S = "${WORKDIR}/${PN}"
diff --git a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchd
index 5919f5eb2c..5919f5eb2c 100644
--- a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd
+++ b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchd
diff --git a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchg
index b9943b4c76..b9943b4c76 100644
--- a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg
+++ b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchg
diff --git a/packages/uboot/u-boot-linkstationppc_git.bb b/packages/uboot/u-boot-linkstationppc_git.bb
index 2fe2f9e7ff..7baac2ba7c 100644
--- a/packages/uboot/u-boot-linkstationppc_git.bb
+++ b/packages/uboot/u-boot-linkstationppc_git.bb
@@ -3,15 +3,16 @@ PROVIDES = "virtual/bootloader"
 SECTION = "bootloader"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
-COMPATIBLE_MACHINE = "linkstationppc"
+COMPATIBLE_MACHINE = "(lsppchd|lsppchg)"
 
 SRC_URI = "git://www.jdl.com/software/u-boot-86xx.git;protocol=git \
 	   file://u-boot-kurobox.patch;patch=1 \
 	   file://u-boot-kurobox-fdt.patch;patch=1 \
-	   file://defconfig_linkstationppchg \
-	   file://defconfig_linkstationppchd \
+	   file://defconfig_lsppchg \
+	   file://defconfig_lsppchd \
 		"
 
 S = "${WORKDIR}/git"