[oe-commits] org.oe.dev merge of '4fe1dea49ed06e807afde9b963aafccb124edd4d'

[oe commit]

merge of '4fe1dea49ed06e807afde9b963aafccb124edd4d'
     and 'aaffbdee48dde7a080e15c0f4d608f013c10a6ae'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 250b98d355e1a4b79caaec9ef041f42db95a2b7f
ViewMTN: http://monotone.openembedded.org/revision/info/250b98d355e1a4b79caaec9ef041f42db95a2b7f
Files:
1
packages/images/fso-image-console.bb
conf/distro/include/sane-srcrevs.inc
packages/freesmartphone/frameworkd_git.bb
packages/u-boot/u-boot_git.bb
Diffs:

#
# mt diff -r4fe1dea49ed06e807afde9b963aafccb124edd4d -r250b98d355e1a4b79caaec9ef041f42db95a2b7f
#
#
#
# delete "packages/images/fso-image-console.bb"
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [e2c436b6fbab2ec117c633586d6e53ad5cf0fc6c]
#    to [728a45d37a508823fda1cfd83bb3650ef5d90e8a]
# 
# patch "packages/freesmartphone/frameworkd_git.bb"
#  from [e15c6137cdb52decb3c0d85136658ae85f33ae9d]
#    to [a88563d4a70d9669a0ca31aad5bd7a0321820d99]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	e2c436b6fbab2ec117c633586d6e53ad5cf0fc6c
+++ conf/distro/include/sane-srcrevs.inc	728a45d37a508823fda1cfd83bb3650ef5d90e8a
@@ -37,7 +37,7 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-frameworkd ?= "f4e22aeeeeab16eee5f13151f184da4f899d7ff1"
+SRCREV_pn-frameworkd ?= "5b0878b69037b68e64f4048a51003416c9b1261b"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
============================================================
--- packages/freesmartphone/frameworkd_git.bb	e15c6137cdb52decb3c0d85136658ae85f33ae9d
+++ packages/freesmartphone/frameworkd_git.bb	a88563d4a70d9669a0ca31aad5bd7a0321820d99
@@ -4,8 +4,8 @@ LICENSE = "GPL"
 SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
-PV = "0.8.1+gitr${SRCREV}"
-PR = "r12"
+PV = "0.8.2+gitr${SRCREV}"
+PR = "r0"
 
 inherit distutils update-rc.d
 
@@ -21,8 +21,6 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/init.d/
 	install -m 0755 ${WORKDIR}/frameworkd ${D}${sysconfdir}/init.d/
 	install -m 0644 ${WORKDIR}/frameworkd.conf ${D}${sysconfdir}
-	install -d ${D}${sysconfdir}/dbus-1/system.d/
-	mv -f ${D}${datadir}/etc/dbus-1/system.d/frameworkd.conf ${D}${sysconfdir}/dbus-1/system.d/
 }
 
 RDEPENDS_${PN} += "\
@@ -42,8 +40,8 @@ PACKAGE_ARCH_${PN}-config = "${MACHINE_A
 PACKAGES =+ "${PN}-config"
 
 PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}"
-FILES_${PN}-config = "${sysconfdir}"
+FILES_${PN}-config = "${sysconfdir}/frameworkd.conf"
 
 PACKAGE_ARCH_${PN} = "${BASE_PACKAGE_ARCH}"
-FILES_${PN} += "${datadir}"
+FILES_${PN} += "${sysconfdir}/dbus-1 ${sysconfdir}/freesmartphone ${sysconfdir}/init.d ${datadir}"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/framework/subsystems/*/.debug"


#
# mt diff -raaffbdee48dde7a080e15c0f4d608f013c10a6ae -r250b98d355e1a4b79caaec9ef041f42db95a2b7f
#
#
#
# patch "packages/u-boot/u-boot_git.bb"
#  from [20da764e37d8eda3e5848758576cfe8a9671a2a6]
#    to [77d3411a0511c6640be31d9e6a41b663ef6533c3]
#
============================================================
--- packages/u-boot/u-boot_git.bb	20da764e37d8eda3e5848758576cfe8a9671a2a6
+++ packages/u-boot/u-boot_git.bb	77d3411a0511c6640be31d9e6a41b663ef6533c3
@@ -1,8 +1,8 @@ PR="r11"
 require u-boot.inc
 PR="r11"
 
-SRCREV_davinci-sffsdr = "699f05125509249072a0b865c8d35520d97cd501"
-SRCREV_davinci-dvevm = "699f05125509249072a0b865c8d35520d97cd501"
+SRCREV_davinci-sffsdr = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa"
+SRCREV_davinci-dvevm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa"
 SRCREV_beagleboard = "bde63587622c4b830a27d1ddf7265843de9e994f"
 SRCREV_neuros-osd2 = "70ee511d37ca99afee00edc27be36d0af2832bbc"