[oe-commits] org.oe.dev merge of '1e903c1b7aaf83f6d6191a71231f8862e397e14c'

[mickeyl commit]

merge of '1e903c1b7aaf83f6d6191a71231f8862e397e14c'
     and 'da05681cb6f999dad9c83e628cb1825a48233318'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: dd4d3e3ff0ada8bf5ea141fcdcf9a37e621fa46a
ViewMTN: http://monotone.openembedded.org/revision/info/dd4d3e3ff0ada8bf5ea141fcdcf9a37e621fa46a
Files:
1
packages/images/dsplink-test-image.bb
conf/machine/neuros-osd2.conf
packages/dsplink/dsplink.inc
packages/dsplink/dsplink_1.50.bb
packages/dsplink/dsplink_1.51.00.08.bb
packages/freesmartphone/mickeydbus_git.bb
conf/distro/include/fso-autorev.inc
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -r1e903c1b7aaf83f6d6191a71231f8862e397e14c -rdd4d3e3ff0ada8bf5ea141fcdcf9a37e621fa46a
#
#
#
# add_file "packages/images/dsplink-test-image.bb"
#  content [a39b6f82b2a378ac3310ddafaf5e8e8032fe09af]
# 
# patch "conf/machine/neuros-osd2.conf"
#  from [5d3d5445dcd1af59e2891676c7738060a43c6fbe]
#    to [b460b304961f07e18e7f2d835f2e9934194c4c6e]
# 
# patch "packages/dsplink/dsplink.inc"
#  from [d492fe354f65326c479a4c150bb2067756c5f296]
#    to [fca62e36a4305180437de4c7fb99f38394bd283d]
# 
# patch "packages/dsplink/dsplink_1.50.bb"
#  from [35e4aa8c6509ff24d50d3658625e7252d51e0893]
#    to [46bc627aac31cff0a0325957bfcd918033c24016]
# 
# patch "packages/dsplink/dsplink_1.51.00.08.bb"
#  from [02cc53a05188213058b69eda10abb1e4a6848c7d]
#    to [02dea2e02183cb478180836c242674ed75c90381]
#
============================================================
--- packages/images/dsplink-test-image.bb	a39b6f82b2a378ac3310ddafaf5e8e8032fe09af
+++ packages/images/dsplink-test-image.bb	a39b6f82b2a378ac3310ddafaf5e8e8032fe09af
@@ -0,0 +1,7 @@
+# This image is a bare-bones image to test the TI dsplink modules
+
+require minimal-image.bb
+IMAGE_INSTALL += "dsplink"
+
+export IMAGE_BASENAME = "dsplink-testing-image"
+
============================================================
--- conf/machine/neuros-osd2.conf	5d3d5445dcd1af59e2891676c7738060a43c6fbe
+++ conf/machine/neuros-osd2.conf	b460b304961f07e18e7f2d835f2e9934194c4c6e
@@ -15,14 +15,39 @@ PREFERRED_VERSION_u-boot = "git"
 UBOOT_LOADADDRESS = "0x80008000"
 
 PREFERRED_VERSION_u-boot = "git"
-#UBOOT_MACHINE = "davinci_dvevm_config"
+UBOOT_MACHINE = "davinci_ntosd-644x"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
+IMAGE_FSTYPES += "jffs2 yaffs2"
+
 ROOT_FLASH_SIZE = "29"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost screen"
 
 require conf/machine/include/tune-arm926ejs.inc
 
+#MACHINE_POSTPROCESS_COMMAND = "neuros_make_installkit"
+
+neuros_make_installkit () {
+    cd ${DEPLOY_DIR_IMAGE}
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+    mkdir -p ${IMAGE_NAME}-installkit/temp
+
+    # Get the latest kernel and u-boot using the foo-<machine>.bin symlinks
+    cp uImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/temp/uImage
+    cp u-boot-${MACHINE}.bin ${IMAGE_NAME}-installkit/u-boot.bin
+    cp default_env.img ${IMAGE_NAME}-installkit/	
+
+    cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+
+    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 )
+      cd ${DEPLOY_DIR_IMAGE} 
+    
+    cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/osd20.pkg ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-osd20.pkg
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+}
+
============================================================
--- packages/dsplink/dsplink.inc	d492fe354f65326c479a4c150bb2067756c5f296
+++ packages/dsplink/dsplink.inc	fca62e36a4305180437de4c7fb99f38394bd283d
@@ -1,7 +1,8 @@ DEPENDS = "virtual/kernel perl-native"
 DESCRIPTION = "DSP Link for TI ARM/DSP processors"
 
 DEPENDS = "virtual/kernel perl-native"
-RDEPENDS = "update-modules"
+RDEPENDS_${PN}-module = "update-modules"
+RRECOMMENDS_${PN} = "${PN}-module"
 
 inherit module
 
============================================================
--- packages/dsplink/dsplink_1.50.bb	35e4aa8c6509ff24d50d3658625e7252d51e0893
+++ packages/dsplink/dsplink_1.50.bb	46bc627aac31cff0a0325957bfcd918033c24016
@@ -1,6 +1,6 @@ require dsplink.inc
 require dsplink.inc
 
-PR = "r4"
+PR = "r5"
 PE = "1"
 PV = "1.50"
 
============================================================
--- packages/dsplink/dsplink_1.51.00.08.bb	02cc53a05188213058b69eda10abb1e4a6848c7d
+++ packages/dsplink/dsplink_1.51.00.08.bb	02dea2e02183cb478180836c242674ed75c90381
@@ -1,6 +1,6 @@ require dsplink.inc
 require dsplink.inc
 
-PR = "r1"
+PR = "r2"
 PE = "1"
 PV = "1.51"
 


#
# mt diff -rda05681cb6f999dad9c83e628cb1825a48233318 -rdd4d3e3ff0ada8bf5ea141fcdcf9a37e621fa46a
#
#
#
# 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"