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

4 files changed, 36 insertions, 10 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 61e894882e..b00d12586b 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -314,6 +314,8 @@ IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
 IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
 IMAGE_EXTRA_SPACE = 10240
 
+UBI_VOLNAME ?= "${MACHINE}-rootfs"
+
 IMAGE_CMD = ""
 IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
 IMAGE_CMD_yaffs2 = "mkyaffs2image ${EXTRA_IMAGECMD} ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.yaffs2"
@@ -329,7 +331,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_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=rootfs >> 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_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}"
 
 EXTRA_IMAGECMD = ""
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 4ff2f9a0d2..ac9efe5ffb 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -4062,6 +4062,10 @@ sha256=46c0991b71d1991aa2f90d6816d9efb737fc9f9b99713174fcdf8d323727a11c
 md5=7fdd5f8395162d8728d4b79e97b9819e
 sha256=d62e98fee5b1a758d83b62eed8d8bdec473677ff782fed89fc4ae3ba3f381401
 
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/d/debianutils/debianutils_2.30.tar.gz]
+md5=7fdd5f8395162d8728d4b79e97b9819e
+sha256=d62e98fee5b1a758d83b62eed8d8bdec473677ff782fed89fc4ae3ba3f381401
+
 [ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-1.4.4.tar.gz]
 md5=053f18fd5d00873de365413cab17a666
 sha256=d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d
@@ -4358,6 +4362,10 @@ sha256=7b5b456e6ccb3a36cc96b84b79ba148850ab59ac45316b759a090a1121f93e13
 md5=79ec740d1a10ee75f13efa4ff36d0250
 sha256=9888d96d7d91e518c96a034dc863f8f7d961acd9334a1acde849c6022e540212
 
+[http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.47.tar.gz]
+md5=4524081e56d0b935717d493e8e8d3e11
+sha256=f2716a43eb05b232c640a4ad647fd0fc21dd0c4f4ad20c9f5303568742399e5d
+
 [http://www.docbook.org/sgml/3.1/docbk31.zip]
 md5=432749c0c806dbae81c8bcb70da3b5d3
 sha256=20261d2771b9a052abfa3d8fab1aa62be05791a010281c566f9073bf0e644538
@@ -12554,6 +12562,10 @@ sha256=ab01882a3d0556176018c09342cd0731f7cbc8e687795009894c3326942c76ff
 md5=be845c41170d72c7db524f3411b50256
 sha256=ab01882a3d0556176018c09342cd0731f7cbc8e687795009894c3326942c76ff
 
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/libn/libnet/libnet_1.1.2.1.orig.tar.gz]
+md5=be845c41170d72c7db524f3411b50256
+sha256=ab01882a3d0556176018c09342cd0731f7cbc8e687795009894c3326942c76ff
+
 [http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-0.0.13.tar.bz2]
 md5=660cbfd3dc8c10bf9b1803cd2b688256
 sha256=1d6b180272befbfb19fedd80b5641354b82d6e719bf3d9ffa2d8287c62046536
@@ -14118,17 +14130,13 @@ sha256=898db51a4016efca7d408163578443238373773357949e1b4978e26807a1fb2b
 md5=afd35e0770f28121a9f8d6093d20a62b
 sha256=bfc8cf4258574b48d33e9d622627db496e6533a469a6a87fd7ed76098dabb8a6
 
-[http://heanet.dl.sourceforge.net/ltp/ltp-full-20070228.tgz]
-md5=afd35e0770f28121a9f8d6093d20a62b
-sha256=bfc8cf4258574b48d33e9d622627db496e6533a469a6a87fd7ed76098dabb8a6
-
 [http://downloads.sourceforge.net/ltp/ltp-full-20080229.tgz]
 md5=5860835de7e8d6f76a856243fd5f299e
 sha256=e4c56dbbbf2d1a4d641624234b561e9402c00e47b5b253ae126aa444182310a4
 
-[http://heanet.dl.sourceforge.net/ltp/ltp-full-20080229.tgz]
-md5=5860835de7e8d6f76a856243fd5f299e
-sha256=e4c56dbbbf2d1a4d641624234b561e9402c00e47b5b253ae126aa444182310a4
+[http://downloads.sourceforge.net/ltp/ltp-full-20090131.tgz]
+md5=397b376dd659459e4a431474b42263a8
+sha256=5fa4353d826b719cc313e370dd8f4ab0793432e4d797a96cb5bb01e078ff1e10
 
 [ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz]
 md5=89c0ebdd0a27bc7f68726100f4bb079b
@@ -15978,6 +15986,10 @@ sha256=3b46936339fe5c2dcb8fb2f9213fa36dcddefaa1e00d1d93b5640d8cc9898ca1
 md5=6fbd72e81dd4c135a2cc4f78d596aeb4
 sha256=68b8978071f31615ad89119583e629ca7c3069ae0c2fb8f7c390c19807cce0bb
 
+[http://downloads.sourceforge.net/wgois/ois_1.2.0.tar.gz]
+md5=6a8cedad04f095127ca1455162fec955
+sha256=175414df5d7b924779fa513ea614081ae55ae708a5e29473e74911297e4be708
+
 [http://www.olsr.org/releases/0.4/olsrd-0.4.10.tar.bz2]
 md5=9807d4451e65cb4ec385155eef7bf3cf
 sha256=af04bdd8abd85bb4715fd6011566054847c75fcbac5e5e9cdee80858ac2957d3
@@ -18806,6 +18818,10 @@ sha256=357ae73b048a2a6db46c8b28e0b79bc9448dbae96f52e44b07db7e40895ef2cf
 md5=f7cc9a2a30f480be3ecefedea363575c
 sha256=357ae73b048a2a6db46c8b28e0b79bc9448dbae96f52e44b07db7e40895ef2cf
 
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/r/resolvconf/resolvconf_1.41.tar.gz]
+md5=f7cc9a2a30f480be3ecefedea363575c
+sha256=357ae73b048a2a6db46c8b28e0b79bc9448dbae96f52e44b07db7e40895ef2cf
+
 [http://xlibs.freedesktop.org/release/resourceext-1.0.tar.bz2]
 md5=007713326ca5f1adfd39f3cb587c3b9b
 sha256=78e0a532bb84d6d85e90244bf3bb0ee9a5246545ebc9b677173e37e231d30cdc
@@ -19282,6 +19298,10 @@ sha256=2a19694b9825ec13349adac691933a8f890117ef566a9cd58a9e439030a96a3a
 md5=659bf15bbbb31817ebad9372c8827618
 sha256=2a19694b9825ec13349adac691933a8f890117ef566a9cd58a9e439030a96a3a
 
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/s/screen/screen_4.0.2-4.1sarge1.diff.gz]
+md5=659bf15bbbb31817ebad9372c8827618
+sha256=2a19694b9825ec13349adac691933a8f890117ef566a9cd58a9e439030a96a3a
+
 [http://xorg.freedesktop.org/releases/individual/app/scripts-1.0.1.tar.bz2]
 md5=08c7f078fc351196c21db3a8206d482d
 sha256=1b154b4359302ca499818c45396325aef9ff364d6ff4ce5c3769e4803994a136
@@ -20442,6 +20462,10 @@ sha256=199fcaa5bc5b0b56537d43c522a9f0d839e61d7ffc58438da56574f642159519
 md5=dcd50ddb2544faeae77f194804559404
 sha256=0ff805bb8dbf72a45d347f2310f7e5c86e2e7419a069d546e53cf5f221c196ab
 
+[http://developer.kde.org/~wheeler/files/src/taglib-1.5.tar.gz]
+md5=7b557dde7425c6deb7bbedd65b4f2717
+sha256=ba610716ec539d4858133e008d079728953820c583b200ff0936e36fc0550ec2
+
 [http://tango-project.org/releases/tango-icon-theme-0.7.2.tar.gz]
 md5=eace48f8340a95d7134632bad6287100
 sha256=6b368373f9a01f3f33f77ac25c170cbd052b29d6910f72308e55dc0a39af7722
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 1f0b41f05e..86a9afd465 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -34,7 +34,7 @@ BUILD_OPTIMIZATION = "-Os"
 #Note that this testing was done without the gcc-pr32889.patch.
 FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer"
 
-TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}"
+TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32']]}"
 
 CXXFLAGS += "-fvisibility-inlines-hidden"
 
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index cf879526c7..0cb3c17ba3 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -197,7 +197,7 @@ SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
 SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
 SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
-SRCREV_pn-python-coherence ?= "1154"
+SRCREV_pn-python-coherence ?= "1161"
 SRCREV_pn-python-connexion ?= "1439"
 SRCREV_pn-python-formencode ?= "3148"
 SRCREV_pn-python-gsmd ?= "148"