[oe-commits] org.oe.dev merge of '320cd49f6ce7994ee9c34b9b23d6c3feaf3889fc'

[pfalcon commit]

merge of '320cd49f6ce7994ee9c34b9b23d6c3feaf3889fc'
     and '43dea0134aceb7d9e9b13bdaf025552aeef1fa64'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 67283511b56a658029528bf05ae322e2ad1c5337
ViewMTN: http://monotone.openembedded.org/revision/info/67283511b56a658029528bf05ae322e2ad1c5337
Files:
1
packages/images/minimal-gpe-image.bb
conf/machine/include/collie-2.6.inc
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
Diffs:

#
# mt diff -r320cd49f6ce7994ee9c34b9b23d6c3feaf3889fc -r67283511b56a658029528bf05ae322e2ad1c5337
#
# 
# 
# add_file "packages/images/minimal-gpe-image.bb"
#  content [e8665528258e599e44b51e8574508562e66d7af9]
# 
# patch "conf/machine/include/collie-2.6.inc"
#  from [45eae6d23b69ac8c4c6345c230a28c7b03316d5e]
#    to [4c2267c98964a40d4dd4216de14ec06eb578694d]
# 
============================================================
--- packages/images/minimal-gpe-image.bb	e8665528258e599e44b51e8574508562e66d7af9
+++ packages/images/minimal-gpe-image.bb	e8665528258e599e44b51e8574508562e66d7af9
@@ -0,0 +1,22 @@
+#Angstrom minimal gpe image
+# This image provides a barebone dm and 'desktop' 
+# Very angstrom and ipkg centric
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "minimalist-gpe-image"
+
+DEPENDS = "task-boot"
+IMAGE_INSTALL = "\
+    ${XSERVER} \
+    task-boot \
+    gpe-session-scripts gpe-login \
+    matchbox-wm \
+    angstrom-feed-configs \
+    ipkg \
+    "
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
============================================================
--- conf/machine/include/collie-2.6.inc	45eae6d23b69ac8c4c6345c230a28c7b03316d5e
+++ conf/machine/include/collie-2.6.inc	4c2267c98964a40d4dd4216de14ec06eb578694d
@@ -1,6 +1,33 @@ MACHINE_EXTRA_RDEPENDS = "kernel-modules
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
 SERIAL_CONSOLE = "115200 ttySA0"
 MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi"
 
 MACHINE_EXTRA_RDEPENDS = "kernel-modules"
+
+MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
+
+zaurus_make_installkit () {
+    cd ${DEPLOY_DIR_IMAGE}
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+    mkdir ${IMAGE_NAME}-installkit/
+    # Get the latest kernel using the zImage-<machine>.bin symlink
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+    if [ "${MACHINE}" = "spitz" ]; then
+        cp gnu-tar ${IMAGE_NAME}-installkit/
+        cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
+    else
+        [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+    fi
+
+    # All zaurus machines except collie need updater.sh
+    if [ "${MACHINE}" != "collie" ]; then
+        cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+    fi
+
+    tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
+    md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+}
+
+


#
# mt diff -r43dea0134aceb7d9e9b13bdaf025552aeef1fa64 -r67283511b56a658029528bf05ae322e2ad1c5337
#
# 
# 
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
#  from [093b78dbcd548a0f00e99d0e61927ec61afc124b]
#    to [0443c38b2e1463c513fd3a12fa5c0d213e337cec]
# 
============================================================
--- packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb	093b78dbcd548a0f00e99d0e61927ec61afc124b
+++ packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb	0443c38b2e1463c513fd3a12fa5c0d213e337cec
@@ -6,10 +6,15 @@ PV = "0.0+svnr${SRCREV}"
 #DEFAULT_PREFERENCE = "-1"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \
 	file://smallscreen-fontsize.patch;patch=1 \
+        file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
+        file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
+        file://4-Add-rendering-debug-logging.patch;patch=1 \
+        file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \
+        file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \
 	file://80matchboxkeyboard"
 
 SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1"