[oe-commits] org.oe.dev merge of '0c449bd860651c16124dcc0cc2cd07689c45f195'

[koen commit]

merge of '0c449bd860651c16124dcc0cc2cd07689c45f195'
     and 'dd4d3e3ff0ada8bf5ea141fcdcf9a37e621fa46a'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 608f21be9dbd1924bc708a01c19b13fde7c4cf6e
ViewMTN: http://monotone.openembedded.org/revision/info/608f21be9dbd1924bc708a01c19b13fde7c4cf6e
Files:
1
packages/freesmartphone/mickeydbus_git.bb
conf/distro/include/fso-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/neuros-osd2.conf
Diffs:

#
# mt diff -r0c449bd860651c16124dcc0cc2cd07689c45f195 -r608f21be9dbd1924bc708a01c19b13fde7c4cf6e
#
#
#
# add_file "packages/freesmartphone/mickeydbus_git.bb"
#  content [3fe06dd9c96a8f02c6b8aef310e26d8ec2ef2197]
# 
# patch "conf/distro/include/fso-autorev.inc"
#  from [d5c69660919c5a3424379a0705eeaa21c0220e0e]
#    to [a237638d389c64b3de893a3d3c8811cec9602c62]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [50cf71bcebe08dea933ab20470606445ce693ae6]
#    to [05e7671df7aaf4a7bfc963a90af0160192ab0eba]
#
============================================================
--- packages/freesmartphone/mickeydbus_git.bb	3fe06dd9c96a8f02c6b8aef310e26d8ec2ef2197
+++ packages/freesmartphone/mickeydbus_git.bb	3fe06dd9c96a8f02c6b8aef310e26d8ec2ef2197
@@ -0,0 +1,18 @@
+DESCRIPTION = "Mickey's DBus introspection and calling Program"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+PV = "0.9.0+gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 mickeydbus/mdbus ${D}${bindir}
+}
+
+RDEPENDS_${PN} = "\
+  python-dbus \
+"
============================================================
--- conf/distro/include/fso-autorev.inc	d5c69660919c5a3424379a0705eeaa21c0220e0e
+++ conf/distro/include/fso-autorev.inc	a237638d389c64b3de893a3d3c8811cec9602c62
@@ -2,6 +2,7 @@ SRCREV_pn-pygsm = "${AUTOREV}"
 SRCREV_pn-gsm0710muxd = "${AUTOREV}"
 SRCREV_pn-gsmd2 = "${AUTOREV}"
 SRCREV_pn-pygsm = "${AUTOREV}"
+SRCREV_pn-mickeydbus = "${AUTOREV}"
 SRCREV_pn-mickeyterm = "${AUTOREV}"
 SRCREV_pn-pyneod = "${AUTOREV}"
 SRCREV_pn-pynoeg = "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc	50cf71bcebe08dea933ab20470606445ce693ae6
+++ conf/distro/include/sane-srcrevs.inc	05e7671df7aaf4a7bfc963a90af0160192ab0eba
@@ -81,6 +81,7 @@ SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
+SRCREV_pn-mickeydbus ?= "5cf2a90d86601b2666b4634784853fb51d0d5896"
 SRCREV_pn-mickeyterm ?= "af7c48d424f9c03f7aa8979f1c06e3b2c70acdff"
 SRCREV_pn-moko-gtk-engine ?= "3612"
 SRCREV_pn-mpd-alsa ?= "6952"


#
# mt diff -rdd4d3e3ff0ada8bf5ea141fcdcf9a37e621fa46a -r608f21be9dbd1924bc708a01c19b13fde7c4cf6e
#
#
#
# patch "conf/machine/neuros-osd2.conf"
#  from [b460b304961f07e18e7f2d835f2e9934194c4c6e]
#    to [fd8ea8e7c4ce93f8b8afc38fcd40f6d66a11502f]
#
============================================================
--- conf/machine/neuros-osd2.conf	b460b304961f07e18e7f2d835f2e9934194c4c6e
+++ conf/machine/neuros-osd2.conf	fd8ea8e7c4ce93f8b8afc38fcd40f6d66a11502f
@@ -44,7 +44,7 @@ neuros_make_installkit () {
 
     cd ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ 
       mkfs.jffs2 -d ./temp -o uImage.jffs2 -e 0x20000 -s 0x800 -n 
-      packet_osd2 osd20.pkg '${DISTRO} Developer UPK' default_env.img u-boot.bin uImage.jffs2 rootfs.yaffs2 )
+      packet_osd2 osd20.pkg '${DISTRO} Developer UPK' default_env.img u-boot.bin uImage.jffs2 rootfs.yaffs2 
       cd ${DEPLOY_DIR_IMAGE} 
     
     cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/osd20.pkg ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-osd20.pkg