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

7 files changed, 12 insertions, 10 deletions

diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index 0fa5efbde3..8e960d0d66 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -3,7 +3,7 @@
 # FSO Projects -- Cornucopia
 FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226"
 SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodeviced ?= "a8abe5bbe86c5625ab4c649eae899b9a8aac4b2d"
+SRCREV_pn-fsodeviced ?= "f7ef257660227403dc352423066deeeabaf1fa73"
 SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
diff --git a/conf/machine/include/tune-atom.inc b/conf/machine/include/tune-atom.inc
index b1f6453526..a7dd04f596 100644
--- a/conf/machine/include/tune-atom.inc
+++ b/conf/machine/include/tune-atom.inc
@@ -2,7 +2,7 @@
 # TARGET_CC_ARCH = "-march=i586"
 #
 # GCC 4.3.1+ (see Gentoo)
-#TARGET_CC_ARCH = "-march=core2"
+TARGET_CC_ARCH = "-march=core2"
 
 # GCC 4.4.2+ (see Fedora 12)
-TARGET_CC_ARCH = "-march=i686 -mtune=atom"
+#TARGET_CC_ARCH = "-march=i686 -mtune=atom"
diff --git a/recipes/freesmartphone/fsodeviced/fsodeviced b/recipes/freesmartphone/fsodeviced/fsodeviced
index 2e701eda29..2926481e55 100644
--- a/recipes/freesmartphone/fsodeviced/fsodeviced
+++ b/recipes/freesmartphone/fsodeviced/fsodeviced
@@ -8,7 +8,7 @@
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 NAME=fsodeviced
-NICENESS=-19
+NICENESS=10
 
 [ -f /etc/default/rcS ] && . /etc/default/rcS
 
diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index 56773cc6b1..0fe723ff32 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -6,7 +6,7 @@ RDEPENDS += "libcanberra-alsa"
 RRECOMMENDS += "fso-alsa-data"
 PV = "0.9.0+gitr${SRCREV}"
 PE = "1"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 
 inherit update-rc.d
 
diff --git a/recipes/squashfs-tools/squashfs-tools.inc b/recipes/squashfs-tools/squashfs-tools.inc
index aa75eaa898..fb5a648545 100644
--- a/recipes/squashfs-tools/squashfs-tools.inc
+++ b/recipes/squashfs-tools/squashfs-tools.inc
@@ -2,14 +2,14 @@ DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux."
 SECTION = "base"
 LICENSE = "GPLv2"
 DEPENDS = "zlib"
-INC_PR = "r2"
+INC_PR = "r3"
 
 S = "${WORKDIR}/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}/squashfs-tools"
 
 # required to share same place with -lzma specific packages
 FILESPATHPKG = "squashfs-tools-${PV}:squashfs-tools:files"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz"
+SRC_URI ?= "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz"
 
 prefix = ""
 
diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb
index 29d82a83b0..886c095883 100644
--- a/recipes/squashfs-tools/squashfs-tools_4.0.bb
+++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb
@@ -1,9 +1,10 @@
-require squashfs-tools.inc
-PR = "${INC_PR}.2"
-
 # This override is required since this has not yet been released
 SRC_URI  = "cvs://anonymous@squashfs.cvs.sourceforge.net/cvsroot/squashfs;module=squashfs;date=${SRCDATE} \
             http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2"
+
+require squashfs-tools.inc
+PR = "${INC_PR}.2"
+
 S = "${WORKDIR}/squashfs/squashfs-tools"
 
 EXTRA_OEMAKE += "LZMA_SUPPORT=1 LZMA_DIR=../.."
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index bff1bfad7a..3a149d6d6b 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -238,4 +238,5 @@ RDEPENDS_${PN} += "\
 		reiserfsprogs \
 		blipomoko \
 		imagemagick \
+		xboard \
 "