[oe-commits] org.oe.dev merge of 'b4b01fb4e8b3ecffccf4533846f88e2458fe7362'

[oe commit]

merge of 'b4b01fb4e8b3ecffccf4533846f88e2458fe7362'
     and 'ba129bd9e38e74717e81d25413881c72841b72fc'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: c623b8256cde670674edff5cc4131f32826906df
ViewMTN: http://monotone.openembedded.org/revision/info/c623b8256cde670674edff5cc4131f32826906df
Files:
1
packages/freesmartphone/zhone_git.bb
packages/freesmartphone/mickeyterm_git.bb
packages/freesmartphone/python-ophoned_git.bb
packages/dsplink/files/prcs-fix-include.patch
packages/dsplink/dsplink_1.50.bb
packages/dsplink/files/davinci_mvlpro5.0.mk
Diffs:

#
# mt diff -rb4b01fb4e8b3ecffccf4533846f88e2458fe7362 -rc623b8256cde670674edff5cc4131f32826906df
#
#
#
# add_file "packages/freesmartphone/zhone_git.bb"
#  content [be991be982f74c721ed53468671e7ecce2218df4]
# 
# patch "packages/freesmartphone/mickeyterm_git.bb"
#  from [bc49238273e24ba425114eecb9d8f2d58cc1dc9f]
#    to [282df0e10ec613105e8c966277bf91f2ff385447]
# 
# patch "packages/freesmartphone/python-ophoned_git.bb"
#  from [ea7c430a6835bdc3187fcd080d1ad5d9128f77ac]
#    to [c3a23270719f3ed39a3432f18c7e5dd0ad4b8847]
#
============================================================
--- packages/freesmartphone/zhone_git.bb	be991be982f74c721ed53468671e7ecce2218df4
+++ packages/freesmartphone/zhone_git.bb	be991be982f74c721ed53468671e7ecce2218df4
@@ -0,0 +1,13 @@
+DESCRIPTION = "Zhone: Zen Phone"
+LICENSE = "GPL"
+SECTION = "x11"
+DEPENDS = "edje-native"
+RDEPENDS = "task-python-efl python-textutils"
+PV = "0.0.0+gitr${SRCREV}"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+FILES_${PN} += "${datadir}"
============================================================
--- packages/freesmartphone/mickeyterm_git.bb	bc49238273e24ba425114eecb9d8f2d58cc1dc9f
+++ packages/freesmartphone/mickeyterm_git.bb	282df0e10ec613105e8c966277bf91f2ff385447
@@ -1,7 +1,6 @@ SECTION = "console/network"
 DESCRIPTION = "Mickey's Terminal Program"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
 SECTION = "console/network"
-DEPENDS = "python-serial"
 LICENSE = "GPLv2"
 PV = "2.9.0+gitr${SRCREV}"
 PR = "r0"
@@ -16,7 +15,7 @@ RDEPENDS_${PN} = "\
 
 RDEPENDS_${PN} = "\
   python-readline \
-  python-serial \
+  python-pyserial \
   python-textutils \
   python-threading \
 "
============================================================
--- packages/freesmartphone/python-ophoned_git.bb	ea7c430a6835bdc3187fcd080d1ad5d9128f77ac
+++ packages/freesmartphone/python-ophoned_git.bb	c3a23270719f3ed39a3432f18c7e5dd0ad4b8847
@@ -28,6 +28,7 @@ RDEPENDS_${PN} += "\
   python-dbus \
   python-pygobject \
   python-pyrtc \
+  python-pyserial \
   python-syslog \
 "
 


#
# mt diff -rba129bd9e38e74717e81d25413881c72841b72fc -rc623b8256cde670674edff5cc4131f32826906df
#
#
#
# add_file "packages/dsplink/files/prcs-fix-include.patch"
#  content [b26834c446395da6ff9bc9cf1e0a643417a94fdd]
# 
# patch "packages/dsplink/dsplink_1.50.bb"
#  from [7de50f119ee86ad3f405f9fd08e659fe2e291c39]
#    to [a2dba60ef70a6be005343a5420ec39fe0d6b7126]
# 
# patch "packages/dsplink/files/davinci_mvlpro5.0.mk"
#  from [9b9916bd792067c4102445c1fa2ed14b9f3a9d9a]
#    to [397df537b6a95afd39c7f2b31fa848ac95608411]
#
============================================================
--- packages/dsplink/files/prcs-fix-include.patch	b26834c446395da6ff9bc9cf1e0a643417a94fdd
+++ packages/dsplink/files/prcs-fix-include.patch	b26834c446395da6ff9bc9cf1e0a643417a94fdd
@@ -0,0 +1,10 @@
+--- /tmp/prcs.c	2008-05-15 20:35:49.946802023 +0200
++++ dsplink_1_50/dsplink/gpp/src/osal/Linux/prcs.c	2008-05-15 20:36:01.386858569 +0200
+@@ -17,6 +17,7 @@
+ 
+ /*  ----------------------------------- OS Specific Headers         */
+ #include <linux/autoconf.h>
++#include <linux/sched.h>
+ #include <linux/spinlock.h>
+ #include <linux/module.h>
+ #include <linux/mm.h>
============================================================
--- packages/dsplink/dsplink_1.50.bb	7de50f119ee86ad3f405f9fd08e659fe2e291c39
+++ packages/dsplink/dsplink_1.50.bb	a2dba60ef70a6be005343a5420ec39fe0d6b7126
@@ -1,6 +1,6 @@ DESCRIPTION = "DSP Link for TI ARM/DSP p
 DESCRIPTION = "DSP Link for TI ARM/DSP processors"
 
-DEPENDS = "virtual/kernel"
+DEPENDS = "virtual/kernel perl-native"
 
 inherit module-base
 
@@ -13,7 +13,8 @@ SRC_URI = "http://install.tarball.in.sou
 SRC_URI = "http://install.tarball.in.source.dir/dsplink_1_50.tar.gz \
            file://CURRENTCFG.MK \
            file://c64xx_5.xx_linux.mk \
-          file://davinci_mvlpro5.0.mk \
+           file://davinci_mvlpro5.0.mk \
+	   file://prcs-fix-include.patch;patch=1 \
 "
 
 S = "${WORKDIR}/dsplink_1_50/dsplink"
@@ -36,12 +37,17 @@ do_configure () {
 	sed -i	-e s:SED_ME_CROSS:${STAGING_INCDIR}:g \
 		-e s:SED_ME_STAGINGDIR:${STAGING_DIR_TARGET}:g \
 		-e s:SED_ME_TARGET_PREFIX:${TARGET_PREFIX}:g \
+		-e s:SED_ME_KERNELDIR:${STAGING_KERNEL_DIR}:g \	
 		${S}/make/Linux/davinci_mvlpro5.0.mk 
 
 }
 
+PARALLEL_MAKE = ""
+
 do_compile () {
-	make -C ${S}/gpp/src
+	ln -sf ${S}/gpp/src/api/*h ${S}/gpp/inc/
+	ln -sf ${S}/gpp/src/pmgr/Linux/2.6.18 ${S}/gpp/src/pmgr/Linux/2.6.26-rc2-omap1
+	oe_runmake -C ${S}/gpp/src
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}" 
============================================================
--- packages/dsplink/files/davinci_mvlpro5.0.mk	9b9916bd792067c4102445c1fa2ed14b9f3a9d9a
+++ packages/dsplink/files/davinci_mvlpro5.0.mk	397df537b6a95afd39c7f2b31fa848ac95608411
@@ -35,7 +35,7 @@ USE_DISTRIBUTION := 1
 #   ----------------------------------------------------------------------------
 #   Base directory for the GPP OS
 #   ----------------------------------------------------------------------------
-BASE_BUILDOS    := ${HOME}/montavista/kernel/Linux
+BASE_BUILDOS    := SED_ME_KERNELDIR
 
 #   ----------------------------------------------------------------------------
 #   Base for code generation tools - compiler, linker, archiver etc.