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

7 files changed, 75 insertions, 9 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index e6eae8062a..3c741a1f18 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1026,6 +1026,14 @@ sha256=6fd69febfd804437a9d5b610502c6d3c2caabef7a4832a3bcac2357515adaa71
 md5=e65a007157e3e26807db52299497109d
 sha256=e064a939bf7e37774b89a39515ecf96c4d19c81e050bcf0dae28d1eab4d86196
 
+[http://install.source.dir.com/TI-C6x-CGT-v6.0.16-eval.tar.gz]
+md5=152fdf383df154b33478a0312752bade
+sha256=0eb1d3af0a02179edb91b5468972265f13c3a89990549f289233c0784937ab9e
+
+[http://install.source.dir.com/TI-C6x-CGT-v6.0.21-eval.tar.gz]
+md5=65c8166ad0edb468c5327d1109d84229
+sha256=6011f7a10fa71a540503fc8d54140728022ec89eb8bc2ef344002bb11cf25667
+
 [http://sdgsystems.com/pub/ipaq/hx4700/src/TIInit_3.2.26.bts]
 md5=8741490a25b98230973446400971bba9
 sha256=c1f29cfd31c335a409bdc530c2e68661d20a1e3c2e5d64454470b6700a40681e
@@ -2790,6 +2798,10 @@ sha256=1208d8e986f8b545659db21c8220ec28b48979627158123dd9018f9733d858d2
 md5=4629236517df280be321f009917a52be
 sha256=0b22f518085528b71aa9eab8bbc44d2696458c85d902c6a6686076ae10d64549
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.42.tar.gz]
+md5=d24dfd3ca42847123e29f58b29af6948
+sha256=ed7631a6d22b456eb26b881bdbe46ea47f93d2f192da420408bad4bbc245f796
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
 md5=2aa806940d2c841e57a9b2ab7302b750
 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
@@ -4594,6 +4606,10 @@ sha256=22b1f489afef6849919220591ffc51615b9cddbea61b66b43791fdeebb4dbe09
 md5=78012718a15d43e2c4952db7409c9e7e
 sha256=792776053c5842c4335d3f17d9f0c789063ad34c4fc0e2ccabbdefbd84f14726
 
+[http://arago-project.org/files/short-term/demo/demo-app-src.tar.gz]
+md5=92cea8c3ea5db7ad6073b0feb33cf911
+sha256=caf7aa9ea60947bf6fb03ecee8bf3ea2ddf250fe2486ae24b8349d6ff3b74d3d
+
 [http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.14.tar.gz]
 md5=e0b5057a4e3166f34635ac6f27c712c0
 sha256=97856d2621d4e3273340b7f1172c2e074c74263629b05bde0f0f077425ec0699
@@ -9722,6 +9738,10 @@ sha256=05d83a609aaea44ea8c979897f336cb8b5537a39b271af2831e6cca3851d3007
 md5=75a3359ece6a1c11a9e5463d79e274e8
 sha256=b50072ff6f36087b8ecebf509e6d44ab2e91292b1a3a5806a7f1437a382723e9
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.12.tar.bz2]
+md5=63309cf0bb21f3efd4e43868c314f919
+sha256=18387f78b721ce6b56c02f886ec89774a4e58b7883c70ab2ae6c1af58f1661c9
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.3.tar.bz2]
 md5=8545a02c408976c5e9f0c2cf3c6a362e
 sha256=648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e
@@ -10946,6 +10966,10 @@ sha256=11a5f5084488c480f3ff5a24d64d7147bb64272bf60a0ba51330a56c5b50cab9
 md5=82e7c8fdb6211839246b788c040a796b
 sha256=a606e230b22d9d029998b84e5d6311a8ba35a304fe457e254eb5fd19943cd639
 
+[http://arago-project.org/files/short-term/demo/images.tar.bz2]
+md5=a080f5a4ed42c56767c07e55c1266727
+sha256=9c6f58c44051563a788f7e9202957d839822081d99ecb001314265166c20eb95
+
 [http://xorg.freedesktop.org/releases/individual/util/imake-1.0.2.tar.gz]
 md5=b5c3a719d60a14ca2378dc1259ee60df
 sha256=8008b4366ab96abfdac2c91808b79ec2cc5649966b41cfb07b14b6fbd798651c
@@ -18906,6 +18930,10 @@ sha256=6e3549b8586d8ac3ae8b2251b6cff9065f12a5d648c9c464543988ddb670545b
 md5=3aa902cb7a57a4aa09427de603ebf17b
 sha256=3d087c88f6e2cc8fde8d2ab12ff2f85ca3ecb2c67754d0483d158f2e5802b015
 
+[http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-0.9.8.tar.gz]
+md5=ec37148c658fa5110bc991ab17ea82f0
+sha256=e0ac5d5a0e936d564785270c6dab756d156c7d24d06a9ab71e1c87362b221447
+
 [http://dev.gentoo.org/~solar/pax/pax-utils-0.1.13.tar.bz2]
 md5=5f09df47a16e83462384b44b75310539
 sha256=72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36
@@ -23142,6 +23170,10 @@ sha256=11b067df2ce38baa36566bd29ab14bbf2f7c0fcc15e01a5be2a6a85000c39104
 md5=e6388feb0ffcd189af779f165c124b4d
 sha256=6b964fb220a46438adf6ec37082da66332a3ce74ca4913b863b17d9ab720681f
 
+[http://install.source.dir.com/ti_cgt_c6000_6.0.21_setup_linux_x86.bin]
+md5=5bfeaacb628b56005a8865a177af01e4
+sha256=fcfa98e2c8ff18e8e6d5b2ff5e94f20b719150fe7bb4a130cfa360e02df2156a
+
 [http://www.openzaurus.org/download/3.5.4/sources/tickypip-0.1.2.tar.gz]
 md5=5a085296b1147fe970a256a9b2d0f91f
 sha256=f3b5722c145ebeee3523b4941afdaf75d03a56f1922a9d3662dc1715aa24ca34
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 7a6e9a463a..525f949331 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -80,6 +80,9 @@ INHERIT += "angstrom-mirrors"
 INHERIT += "insane"
 QA_LOG = "1"
 
+#run QA tests on recipes
+INHERIT += "recipe_sanity"
+
 #save statistical info on images
 INHERIT += "testlab"
 
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 15a8c00127..422145c8c2 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -9,9 +9,9 @@ SRCDATE_prism54-module ?= "20060814"
 SRCDATE_aufs ?= "20081203"
 SRCDATE_avetanabt ?= "20060814"
 SRCDATE_bl ?= "20060814"
-SRCDATE_dvbstream ?= "20060814"
-SRCDATE_dvbtraffic ?= "20060814"
-SRCDATE_dvbtune ?= "20060814"
+SRCDATE_dvbstream ?= "20090621"
+SRCDATE_dvbtraffic ?= "20090621"
+SRCDATE_dvbtune ?= "20090621"
 SRCDATE_fdclock ?= "20060814"
 SRCDATE_fltk ?= "20060814"
 SRCDATE_gnuplot ?= "20080328"
diff --git a/conf/distro/micro-uclibc.conf b/conf/distro/micro-uclibc.conf
index 1135035fe9..f793d4a3c1 100644
--- a/conf/distro/micro-uclibc.conf
+++ b/conf/distro/micro-uclibc.conf
@@ -28,7 +28,7 @@ TARGET_OS_armeb = "linux-uclibcgnueabi"
 #############################################################################
 # TOOLCHAIN
 #############################################################################
-PREFERRED_LIBC = "uclibc"
+LIBC = "uclibc"
 
 #############################################################################
 # PREFERRED PROVIDERS 
@@ -38,6 +38,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc	= "uclibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils	= "binutils-cross"
 PREFERRED_PROVIDER_linux-libc-headers	= "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/libintl	= "proxy-libintl"
+PREFERRED_PROVIDER_virtual/libiconv     = "libiconv"
 
 #############################################################################
 # PREFERRED VERSIONS 
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index f8b293de28..c566d7502d 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -47,11 +47,11 @@ require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc
 # IMAGES
 #############################################################################
 # Name generated images
-IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-\
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-\
 ${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
 
-CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}"
-DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_LIBC}"
+CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}"
+DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 
 # Image output types
@@ -66,7 +66,7 @@ MACHINE_KERNEL_VERSION = "2.6"
 #############################################################################
 # TOOLCHAIN
 #############################################################################
-PREFERRED_LIBC = "glibc"
+LIBC = "glibc"
 require conf/distro/include/sane-toolchain.inc
 
 #############################################################################
@@ -110,3 +110,4 @@ USE_LDCONFIG = "0"
 
 # Disable online package management
 ONLINE_PACKAGE_MANAGEMENT = "none"
+
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index c51e64c460..c185deb555 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,7 @@ USE_DEVFS = "0"
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
 
-MACHINE_KERNEL_PR = "r7"
+MACHINE_KERNEL_PR = "r8"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/conf/machine/tx25.conf b/conf/machine/tx25.conf
new file mode 100644
index 0000000000..92a8fef3df
--- /dev/null
+++ b/conf/machine/tx25.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: KARO TX25 
+#@DESCRIPTION: Machine configuration for Freescale i.MX25 based Karo TX25 + baseboard
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget screen camera"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.30"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+require conf/machine/include/tune-arm926ejs.inc
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+ROOT_FLASH_SIZE = "128"
+
+IMAGE_FSTYPES ?= "jffs2"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n \
+    --pad ; sumtool --eraseblock=0x20000 -n \
+    --littleendian --pad \
+    -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+    -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"