[oe-commits] org.oe.dev merge of '33abb5c4baf70a48836aa488bb5c4229e5b3d9b8'

rwhitby commit openembedded-commits at lists.openembedded.org
Thu Jun 21 17:29:19 UTC 2007 

merge of '33abb5c4baf70a48836aa488bb5c4229e5b3d9b8'
     and '33dc2a587b8be8674e81f177135b2766463febfb'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 53028d18d16b3a9d612f8bfb2622942c63c8d639
ViewMTN: http://monotone.openembedded.org/revision.psp?id=53028d18d16b3a9d612f8bfb2622942c63c8d639
Files:
1
packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd
packages/uboot/u-boot-linkstationppc/defconfig_lsppchd
packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg
packages/uboot/u-boot-linkstationppc/defconfig_lsppchg
conf/bitbake.conf
conf/local.conf.sample
conf/machine/include/zaurus-clamshell.conf
packages/glibc/glibc-package.bbclass
packages/matchbox2/matchbox-panel-2_svn.bb
packages/uboot/u-boot-linkstationppc_git.bb
Diffs:

#
# mt diff -r33abb5c4baf70a48836aa488bb5c4229e5b3d9b8 -r53028d18d16b3a9d612f8bfb2622942c63c8d639
#
# 
# 
# rename "packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd"
#     to "packages/uboot/u-boot-linkstationppc/defconfig_lsppchd"
# 
# rename "packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg"
#     to "packages/uboot/u-boot-linkstationppc/defconfig_lsppchg"
# 
# patch "conf/bitbake.conf"
#  from [9f598a7aa98cca7931d49745669212b07e4eab99]
#    to [e051cf22975d32a726e9852aadd54cb488d0beb6]
# 
# patch "conf/local.conf.sample"
#  from [8396feaa1c9772ecb13b511fb788690db557fcf9]
#    to [1ff6d0cc7db3274777e6a8ed833701e308a6cb07]
# 
# patch "conf/machine/include/zaurus-clamshell.conf"
#  from [aa365f064bbb372a593b0714b360ff9fb69a639d]
#    to [460b6649ab7636b92a7031abd0f2850fcb6700f5]
# 
# patch "packages/glibc/glibc-package.bbclass"
#  from [35080b06da7ed29f923561784770ee574894cbc2]
#    to [45250e3b9ed0bf25df8e696bed6078f4e20730ac]
# 
# patch "packages/matchbox2/matchbox-panel-2_svn.bb"
#  from [13d29cfac48c70941b2756e36611a2cc476e5649]
#    to [f75c4e730635bd288228386baa031b5c62f26da1]
# 
# patch "packages/uboot/u-boot-linkstationppc_git.bb"
#  from [468a5b720894c0d41ff75f3fee33604c91720737]
#    to [fbb7cba2b01f828ddaabadbb7380194aaf6db0c7]
# 
============================================================
--- conf/bitbake.conf	9f598a7aa98cca7931d49745669212b07e4eab99
+++ conf/bitbake.conf	e051cf22975d32a726e9852aadd54cb488d0beb6
@@ -198,7 +198,7 @@ IMAGE_CMD_squashfs-lzma = "mksquashfs-lz
 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)"
============================================================
--- conf/local.conf.sample	8396feaa1c9772ecb13b511fb788690db557fcf9
+++ conf/local.conf.sample	1ff6d0cc7db3274777e6a8ed833701e308a6cb07
@@ -90,6 +90,12 @@ PREFERRED_PROVIDERS += " virtual/${TARGE
 # 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.
============================================================
--- conf/machine/include/zaurus-clamshell.conf	aa365f064bbb372a593b0714b360ff9fb69a639d
+++ conf/machine/include/zaurus-clamshell.conf	460b6649ab7636b92a7031abd0f2850fcb6700f5
@@ -1,13 +1,13 @@ EXTRA_IMAGEDEPENDS += "sharp-flash-heade
 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;"
============================================================
--- packages/glibc/glibc-package.bbclass	35080b06da7ed29f923561784770ee574894cbc2
+++ packages/glibc/glibc-package.bbclass	45250e3b9ed0bf25df8e696bed6078f4e20730ac
@@ -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("(.*)\.(.*)")
 
============================================================
--- packages/matchbox2/matchbox-panel-2_svn.bb	13d29cfac48c70941b2756e36611a2cc476e5649
+++ packages/matchbox2/matchbox-panel-2_svn.bb	f75c4e730635bd288228386baa031b5c62f26da1
@@ -1,13 +1,13 @@ DEPENDS = "gtk+"
 DESCRIPTION = "matchbox-panel-2 is a lightweight dock (system tray) application based on Gtk+"
 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}"
============================================================
--- packages/uboot/u-boot-linkstationppc_git.bb	468a5b720894c0d41ff75f3fee33604c91720737
+++ packages/uboot/u-boot-linkstationppc_git.bb	fbb7cba2b01f828ddaabadbb7380194aaf6db0c7
@@ -1,17 +1,18 @@ LICENSE = "GPL"
 DESCRIPTION = "U-boot bootloader"
 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"


#
# mt diff -r33dc2a587b8be8674e81f177135b2766463febfb -r53028d18d16b3a9d612f8bfb2622942c63c8d639
#
# 
# no changes
#

More information about the Openembedded-commits mailing list