Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

5 files changed, 61 insertions, 21 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 3a129b7924..bb29499183 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -258,6 +258,10 @@ sha256=2c0de0243ce1853bf62ed9b2da122472b6682a117843af0cce4b4cf9588194ff
 md5=7030996497f3cf012bc9e99b4ca3e920
 sha256=be21e3d5fa2edd1f5ff5952f67e6574dae15a027b26415910dfe813902fd5985
 
+[http://downloads.sourceforge.net/freeimage/FreeImage3110.zip]
+md5=ad1db36414391417654ba7bf1c0277d3
+sha256=84021b8c0b86e5801479474ad9a99c18d121508ee16d363e02ddcbf24195340c
+
 [http://www.urban.ne.jp/home/kanemori/zaurus/FreeNote_1.12.0.tar.gz]
 md5=06b5aeb6cc97107090438a364f0ce89b
 sha256=e6a0a5b674c4803bfd1ffda9660c29f4399294623ed095b0d1c554367c7db73c
@@ -1434,6 +1438,10 @@ sha256=7d70ff17bec733bdb04a6653a8e9c15ab7d88429dac91a4ae58c1db5caaee07f
 md5=c3702668a640be1695956115857ec22e
 sha256=8cd84eb2031a91572e1be2975f4171730a9be72c4cd88718c4c40ac7dc4fd7d3
 
+[http://www.apache.org/dist/apr/apr-util-1.3.4.tar.gz]
+md5=a10e2ca150ff07f484c724c36142211f
+sha256=3f07ffdb18fb853290c9b83e82cd5cae66b8fbc357bd391e846c0afdd24fed7e
+
 [ftp://ftp.debian.org/debian/pool/main/a/apt/apt_0.5.28.6.tar.gz]
 md5=26b37525371cdaaec552237e0667305d
 sha256=57de084860870cccf510de62eb8ded252f5951a6e59e34a963d61d69de3aff10
@@ -2754,6 +2762,10 @@ sha256=cf3957b4548df051cd0971d179cb92dc0fcab3839977ddb70aae81c14cd04b03
 md5=d113f2777e4f508faa8b674ece87a37b
 sha256=f2b433270f22aad86f61cef61d95338aaa63dbe2f9468b9ed5defd1c01c9645f
 
+[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-depmod.patch]
+md5=7c9dfb5dcd66a1d6e837e72ad0cb05d4
+sha256=35e3854599a074ce1b47872ab1b97a625ed7d1ab3345b918f7f60524f5e390c5
+
 [http://www.busybox.net/downloads/busybox-1.13.2.tar.gz]
 md5=aeb526108f13b91c02b115c8d86f9659
 sha256=03fc9dbdc6f44afd2da55c0ab36646d2d063708cc35f3f4569b913b064f11d83
@@ -10138,6 +10150,10 @@ sha256=a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f
 md5=03a0f63b997ce7b83a1eeaa6b80f4388
 sha256=a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f
 
+[http://jackaudio.org/downloads/jack-audio-connection-kit-0.116.2.tar.gz]
+md5=9c0ae9880e9b6e081f1a238fe6a28bd5
+sha256=ce6e1f61a3b003137af56b749e5ed4274584167c0877ea9ef2d83f47b11c8d3d
+
 [http://downloads.sourceforge.net/jackit/jack-audio-connection-kit-0.99.0.tar.gz]
 md5=a891a699010452258d77e59842ebe4a0
 sha256=2096acc56c314e689faad0036bbc1d86dea1b9d9620f711d471de76b1dd6859e
@@ -11382,6 +11398,14 @@ sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
 md5=15de3830b751818a54a42899bd3ae72c
 sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
 
+[http://libchamplain.pierlux.com/release/0.2.8/libchamplain-0.2.8.tar.gz]
+md5=fa4a620efa1a1c1036b6701b7d4dafe1
+sha256=01e17811a85e93e5158f5d721b9b1b249db44683735a172fa0debd9759d3175c
+
+[http://libchamplain.pierlux.com/release/0.2.8/libchamplain-gtk-0.2.8.tar.gz]
+md5=c3e62c1912c0dba013c8f3df28fc809d
+sha256=03d751bd836174e2d6766d8036fc72e130dd090b13256d40a58ba6ab659475ef
+
 [http://gpephone.linuxtogo.org/download/gpephone/libchenabler-0.1/libchenabler-0.1.tar.gz]
 md5=866fd13611a8de946428db1df9be8468
 sha256=74def55ba6a61e966e0873a4081fd3dd65089b94b837810d3bc056221d7e41c7
@@ -15870,6 +15894,10 @@ sha256=3b46936339fe5c2dcb8fb2f9213fa36dcddefaa1e00d1d93b5640d8cc9898ca1
 md5=b374415d7f5d485993fa697ab9a678b4
 sha256=3b46936339fe5c2dcb8fb2f9213fa36dcddefaa1e00d1d93b5640d8cc9898ca1
 
+[http://downloads.sourceforge.net/ogre/ogre-v1-6-1.tar.bz2]
+md5=6fbd72e81dd4c135a2cc4f78d596aeb4
+sha256=68b8978071f31615ad89119583e629ca7c3069ae0c2fb8f7c390c19807cce0bb
+
 [http://www.olsr.org/releases/0.4/olsrd-0.4.10.tar.bz2]
 md5=9807d4451e65cb4ec385155eef7bf3cf
 sha256=af04bdd8abd85bb4715fd6011566054847c75fcbac5e5e9cdee80858ac2957d3
@@ -21906,6 +21934,10 @@ sha256=f91445e5e1a02ee16f0bc1eb31a1cdfa53c4bb1e1cb4f76fae33436d472e9345
 md5=c990186db06cf188cb267d12bc21e2da
 sha256=f91445e5e1a02ee16f0bc1eb31a1cdfa53c4bb1e1cb4f76fae33436d472e9345
 
+[http://downloads.sourceforge.net/witty/wt-2.2.3.tar.gz]
+md5=2f4c34f1e092451d3c4d2e7f8c250015
+sha256=c6f692956d93765f12402a0b22617566decc52a9bb1a707b4e8d12affd1528d3
+
 [http://downloads.sourceforge.net/wvware/wv-1.2.0.tar.gz]
 md5=b6319d5e75611fe2210453b5feb82c0c
 sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4
@@ -25142,6 +25174,10 @@ sha256=f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8
 md5=4943ab7aa141af2c339266cd66b05c74
 sha256=5cc1a53bb909922596bdd0fa967b654fe1bfbe0dcf1d34608f0b7c90e0c27867
 
+[http://downloads.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2]
+md5=5f7b88ebb2bcd7e8044328482d079661
+sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
+
 [http://heanet.dl.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2]
 md5=5f7b88ebb2bcd7e8044328482d079661
 sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 711c0f74d6..c51684d0e6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -22,6 +22,9 @@ SRCREV_pn-bootchart-lite ?= "4"
 SRCREV_pn-clutter-box2d ?= "3197"
 SRCREV_pn-clutter-cairo ?= "3210"
 SRCREV_pn-clutter-gst ?= "3188"
+SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a"
+SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd"
+SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e"
 SRCREV_pn-clutter ?= "3240"
 SRCREV_pn-comic-reader ?= "54"
 SRCREV_pn-connman ?= "103706c4f4da0c89f8b6f33cccdc3149f4ecc09a"
@@ -54,7 +57,7 @@ SRCREV_pn-flashrom ?= "3682"
 SRCREV_pn-frameworkd ?= "700ab8250582767628165b7cf6f671ef756ba56d"
 SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}"
 SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
-SRCREV_pn-fso-abyss ?= "b8430f9e8898dae390191fb114904f13583043f5"
+SRCREV_pn-fso-abyss ?= "4afeacb21c3d4193289e2b7db549a91751d75195"
 SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
 SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 92651f60f1..b26df9dfea 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -3,18 +3,29 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
 TARGET_ARCH = "arm"
-
-MACHINE_KERNEL_VERSION ?= "2.6"
-require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
 require conf/machine/include/tune-strongarm.inc
 
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
+MACHINE_KERNEL_VERSION = "2.6"
+KERNEL_IMAGE_MAXSIZE = "1048576"
+KERNEL_IMAGETYPE = "zImage"
+SERIAL_CONSOLE = "115200 ttySA0"
+
+ROOT_FLASH_SIZE = "14"
+# actually 14680064, see EXTRA_IMAGECMD
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+XSERVER ?= "xserver-kdrive-fbdev"
 
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
 IMAGE_LINGUAS ?= ""
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-ROOT_FLASH_SIZE = "14"
-# actually 14680064, see EXTRA_IMAGECMD above
+PCMCIA_MANAGER ?= "pcmciautils"
 
-XSERVER ?= "xserver-kdrive-fbdev"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
+
+require conf/machine/include/kexecboot.inc
diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc
index 0a9f209fe2..c8656bb117 100644
--- a/conf/machine/include/kexecboot.inc
+++ b/conf/machine/include/kexecboot.inc
@@ -13,3 +13,4 @@ RDEPENDS_kernel-base = "kernel-image"
 # we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels
 DONT_CHECK_KERNELSIZE ?= "1"
 
+MACHINE_EXTRA_RRECOMMENDS_append = " kexecboot-cfg"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 8fb36f78be..aeba16b67c 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -2,7 +2,6 @@
 # Additionally, clamshell specific stuff in zaurus-clamshell.inc
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS_collie = ""
 
 MACHINE_KERNEL_VERSION = "2.6"
 
@@ -10,14 +9,11 @@ ERASEBLOCKSIZE = "0x4000"
 ERASEBLOCKSIZE_akita = "0x20000"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" 
-IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
 
-ZAURUS-UPDATER_collie = ""
 ZAURUS-UPDATER = "zaurus-updater"
 EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}"
 
 SERIAL_CONSOLE = "115200 ttyS0"
-SERIAL_CONSOLE_collie = "115200 ttySA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
@@ -35,16 +31,11 @@ MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi kernel-module-px
 MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
-MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \
-	kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd kernel-module-mmc-spi \
-	kernel-module-power"
 
 GUI_MACHINE_CLASS = "bigscreen"
-GUI_MACHINE_CLASS_collie = "smallscreen"
 GUI_MACHINE_CLASS_poodle = "smallscreen"
 
 KERNEL_IMAGE_MAXSIZE = "1294336"
-KERNEL_IMAGE_MAXSIZE_collie = "1048576"
 
 MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
 
@@ -69,10 +60,8 @@ zaurus_make_installkit () {
         [ -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
+    cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+   
  
     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