Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev

5 files changed, 30 insertions, 3 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index ad9c0b96f1..96e7799d2a 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -351,6 +351,7 @@ IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_
 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) ${EXTRA_IMAGECMD}"
 IMAGE_CMD_cpio.gz = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz) ${EXTRA_IMAGECMD}"
+IMAGE_CMD_cpio.lzma = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | lzma -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.lzma) ${EXTRA_IMAGECMD}"
 IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg"
 IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}"
 
@@ -361,6 +362,7 @@ EXTRA_IMAGECMD_squashfs = ""
 EXTRA_IMAGECMD_squashfs-lzma = ""
 EXTRA_IMAGECMD_cpio = ""
 EXTRA_IMAGECMD_cpio.gz = ""
+EXTRA_IMAGECMD_cpio.lzma = ""
 EXTRA_IMAGECMD_ubi = ""
 EXTRA_IMAGECMD_ubifs = ""
 
@@ -372,6 +374,7 @@ IMAGE_DEPENDS_ext2 = "genext2fs-native"
 IMAGE_DEPENDS_ext2.gz = "genext2fs-native"
 IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native"
 IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native"
+IMAGE_DEPENDS_cpio.lzma = "lzma-native"
 IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
 IMAGE_DEPENDS_squashfs-lzma = "squashfs-tools-native"
 IMAGE_DEPENDS_ubi = "mtd-utils-native"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index c07d11116d..ae4896cdf2 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1966,6 +1966,10 @@ sha256=68da29f515a26ca1b5722c940615ddc4b0550b2b1ad5d11129b1da636c353160
 md5=88fa901c9a85633ab62365b0ee9df3b1
 sha256=6651eb15c9f6dabf21af4067b723cb29a87827f66570bfab74fdc00d80cab129
 
+[http://arora.googlecode.com/files/arora-0.10.1.tar.gz]
+md5=ac38282a2d9134687d9c30dbb73c0fbc
+sha256=1828cbd348d1418287b29337e1047cfc3d6c092e18691cd9c6dfc2d6535bcebd
+
 [ftp://ftp.ee.lbl.gov/arpwatch-2.1a15.tar.gz]
 md5=cebfeb99c4a7c2a6cee2564770415fe7
 sha256=c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898
@@ -15662,6 +15666,10 @@ sha256=7a61e8b686ae7d659835175018da3a1baa959329b77c18e6e9381a197937296f
 md5=7075f580606a84e63b7d6d9fa3124c31
 sha256=7ff5f355bb254a3d4ed4541377e6304432ee8678e7c9ec29e7d43488903004c9
 
+[http://downloads.sourceforge.net/parchive/libpar2/libpar2-0.2.tar.gz]
+md5=94c6df4e38efe08056ecde2a04e0be91
+sha256=074fbf840f73b1e13e0405fce261078c81c8c0a4859e30a7bba10510f9199908
+
 [http://www.netsurf-browser.org/projects/releases/libparserutils-0.0.1-src.tar.gz]
 md5=5999c2d52f8c07eeef2a8808fee4f858
 sha256=5aed4edfd2023ed3ccd566fe76131d10faf43c8c3efa2e90978eed37c5503165
@@ -18906,6 +18914,10 @@ sha256=7744d78131619b73a82adb6f73d6cfc6bad11a6ad2806c0f5130f88fe88ac9dd
 md5=37b4479951fa0cf052269d27c41ca200
 sha256=6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9
 
+[http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.40.tar.gz]
+md5=32e7373c16271606007374396e6742ad
+sha256=2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432
+
 [ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc1.tar.bz2]
 md5=1c03d3f4ccedcd9de1c0ac2226e0031c
 sha256=f62969cd61dc9718973708b79f5e86f653f630097f5ad14f90d78fcff677c0da
@@ -19486,6 +19498,14 @@ sha256=797dab52e18592d340c36ef6e126368bc1c9c98bbb873bef9ba9fc70911616b9
 md5=103c5c821474ae6df7a3055ee72f4d00
 sha256=c80d9ea7ebca32b63ea23d2a52ac799cff32f8f30c66b491d2b8f93da05585e4
 
+[http://downloads.sourceforge.net/nzbget/nzbget-stable/nzbget-0.6.0.tar.gz]
+md5=eb95b3930abffb570e37af8d284c1f9d
+sha256=b0bc8740db7ed9ea269b29e9a936cb2c4dd61a911b80b623fe18729b94de3030
+
+[http://downloads.sourceforge.net/nzbget/nzbget-stable/nzbget-0.7.0-testing-r342.tar.gz]
+md5=4250d8166969367b4feff4204b42ecb9
+sha256=37c595e78c4a5c86fa1c39d4dba39786d9546ae0a078b936832df9d17bafba10
+
 [http://releases.0x539.de/obby/obby-0.4.1.tar.gz]
 md5=b79146369fc76a61d6d4056a937c71c8
 sha256=b69a259795762881a5384072085bb501d77c6fb974e0b7a16ca573565ffe3629
@@ -24254,6 +24274,10 @@ sha256=2ca2591847df72224dd6f99c8fffe35bb63bf41a8519d8e15ad48141aa841bfa
 md5=46f92e42243bc51aaa3871645ce78bd5
 sha256=cb07a9801a128e2f42cf49b7e9d577b092ab54aa05242655af93491a73a91a1f
 
+[http://www.sqlite.org/sqlite-3.6.20.tar.gz]
+md5=0faf8fc8ccff5297513c6532b2b4ce23
+sha256=c172ce97dc7201f38acdff22df467e1514e7225b88c636145e72a66a4ca6d07d
+
 [http://www.sqlite.org/sqlite-3.6.5.tar.gz]
 md5=ed3151ecaeb3f0a484195da5f694c773
 sha256=99bcda2aaf7109a2859ee88aec1f370f61e461343c9bce6cc37f1bed5d933f67
diff --git a/conf/machine/htcdream.conf b/conf/machine/htcdream.conf
index 7f7680a732..d09782c40f 100644
--- a/conf/machine/htcdream.conf
+++ b/conf/machine/htcdream.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: HTC Dream
-#@DESCRIPTION: Machine configuration for HTC Dream smartphone
+#@DESCRIPTION: Machine configuration for HTC Dream phone (aka T-Mobile G1 and Google ADP-1)
 
 require conf/machine/include/htc-msm7.inc
 
@@ -10,4 +10,3 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usbgadget bluetooth keyboard ext2" 
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
-
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index e87b56c282..2c5c4f2387 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r48"
+MACHINE_KERNEL_PR = "r49"
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/conf/machine/omap3-touchbook.conf b/conf/machine/omap3-touchbook.conf
index 2839b7ddf6..88cb9cc8e3 100644
--- a/conf/machine/omap3-touchbook.conf
+++ b/conf/machine/omap3-touchbook.conf
@@ -8,6 +8,7 @@ XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-input-mouse \
            xf86-input-tslib \
+           xf86-video-fbdev \
            xf86-video-omapfb \
            xf86-input-keyboard"