[oe-commits] org.oe.dev merge of '175617edcda6a7db0736cb199971e613308f4f28'
mickeyl commit
oe at amethyst.openembedded.net
Thu May 15 21:24:31 UTC 2008
merge of '175617edcda6a7db0736cb199971e613308f4f28'
and 'e53a5cd6a7325c8cfa3079fff6e7e086127f125c'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 1ae309a70c139143a4704b5def248a5be0b1a810
ViewMTN: http://monotone.openembedded.org/revision/info/1ae309a70c139143a4704b5def248a5be0b1a810
Files:
1
packages/dsplink/davinci-dvevm
packages/dsplink/davinci-dvevm/CURRENTCFG.MK
packages/dsplink/files/CURRENTCFG.MK
packages/dsplink/davinci-dvevm/c64xx_5.xx_linux.mk
packages/dsplink/files/c64xx_5.xx_linux.mk
packages/dsplink/davinci-dvevm/davinci_mvlpro5.0.mk
packages/dsplink/files/davinci_mvlpro5.0.mk
packages/batmand
packages/dsplink/files
packages/dsplink/files/prcs-fix-include.patch
packages/dsplink/dsplink_1.50.bb
packages/freesmartphone/pygsm_git.bb
Diffs:
#
# mt diff -r175617edcda6a7db0736cb199971e613308f4f28 -r1ae309a70c139143a4704b5def248a5be0b1a810
#
#
#
# delete "packages/dsplink/davinci-dvevm"
#
# rename "packages/dsplink/davinci-dvevm/CURRENTCFG.MK"
# to "packages/dsplink/files/CURRENTCFG.MK"
#
# rename "packages/dsplink/davinci-dvevm/c64xx_5.xx_linux.mk"
# to "packages/dsplink/files/c64xx_5.xx_linux.mk"
#
# rename "packages/dsplink/davinci-dvevm/davinci_mvlpro5.0.mk"
# to "packages/dsplink/files/davinci_mvlpro5.0.mk"
#
# add_dir "packages/batmand"
#
# add_dir "packages/dsplink/files"
#
# add_file "packages/dsplink/files/prcs-fix-include.patch"
# content [b26834c446395da6ff9bc9cf1e0a643417a94fdd]
#
# patch "packages/dsplink/dsplink_1.50.bb"
# from [7d8542d5cbc5300a8934f38ff7568bd347633860]
# to [a2dba60ef70a6be005343a5420ec39fe0d6b7126]
#
# patch "packages/dsplink/files/CURRENTCFG.MK"
# from [297c20afc6a19d66256393fa080d51f5e9e5c2b2]
# to [9c208079a23b32500e58a9f7c0f0d22a0c638210]
#
# patch "packages/dsplink/files/davinci_mvlpro5.0.mk"
# from [4fb3450ea471109bdac1296d64637f3d4febc623]
# 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 7d8542d5cbc5300a8934f38ff7568bd347633860
+++ packages/dsplink/dsplink_1.50.bb a2dba60ef70a6be005343a5420ec39fe0d6b7126
@@ -1,17 +1,20 @@ 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
+
PR = "r0"
# Get dsplink tarball from TI website, place in sources and calculate
# md5sum
# Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/link/index.html
-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 \
+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://prcs-fix-include.patch;patch=1 \
"
S = "${WORKDIR}/dsplink_1_50/dsplink"
@@ -23,10 +26,28 @@ do_configure () {
cp ${WORKDIR}/CURRENTCFG.MK ${S}/config
cp ${WORKDIR}/davinci_mvlpro5.0.mk ${S}/make/Linux
cp ${WORKDIR}/c64xx_5.xx_linux.mk ${S}/make/DspBios
+
+ sed -i -e s:SED_ME_SOURCEDIR:${S}:g \
+ -e s:SED_ME_GPPDISTRO:davinci_mvlpro5\.0:g \
+ -e s:SED_ME_KERNELVERSION:${KERNEL_VERSION}:g \
+ -e s:SED_ME_DSPDISTRO:davinci_mvlpro5\.0:g \
+ -e s:SED_ME_PLATFORM:Davinci:g \
+ ${S}/config/CURRENTCFG.MK
+
+ 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}/dsplink/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/davinci-dvevm/CURRENTCFG.MK 297c20afc6a19d66256393fa080d51f5e9e5c2b2
+++ packages/dsplink/files/CURRENTCFG.MK 9c208079a23b32500e58a9f7c0f0d22a0c638210
@@ -17,8 +17,8 @@ export CFGDATE := MAY 14, 20
# =========================================================
# DSP/BIOS LINK GPP side root directory.
# =========================================================
-export GPPROOT := /home/balister/src/dsplink_1_50/dsplink/gpp
-export DSPROOT := /home/balister/src/dsplink_1_50/dsplink/dsp
+export GPPROOT := SED_ME_SOURCEDIR/gpp
+export DSPROOT := SED_ME_SOURCEDIR/dsp
# =========================================================
@@ -31,17 +31,17 @@ export DSPOS := DspBios
# =========================================================
# Specific distribution of GPP and DSP OS (if any)
# =========================================================
-export GPPDISTRIBUTION := davinci_mvlpro5.0
-export GPPOSVERSION := 2.6.18
+export GPPDISTRIBUTION := SED_ME_GPPDISTRO
+export GPPOSVERSION := SED_ME_KERNELVERSION
export GPPOSVARIANT :=
-export DSPDISTRIBUTION := c64xxp_5.xx_linux
+export DSPDISTRIBUTION := SED_ME_DSPDISTRO
# =========================================================
# Target GPP and DSP platforms for DSP/BIOS LINK
# =========================================================
-export GPPPLATFORM := Davinci
-export DSPPLATFORM := Davinci
+export GPPPLATFORM := SED_ME_PLATFORM
+export DSPPLATFORM := SED_ME_PLATFORM
# =========================================================
============================================================
--- packages/dsplink/davinci-dvevm/davinci_mvlpro5.0.mk 4fb3450ea471109bdac1296d64637f3d4febc623
+++ 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.
@@ -48,8 +48,8 @@ OSINC_GENERIC := $(BASE_OSINC)
BASE_OSINC := $(BASE_BUILDOS)/include
OSINC_GENERIC := $(BASE_OSINC)
-OSINC_PLATFORM := /opt/montavista/pro/devkit/arm/v5t_le/lib/gcc/armv5tl-montavista-linux-gnueabi/4.2.0/include
-OSINC_TARGET := /opt/montavista/pro/devkit/arm/v5t_le/target/usr/include
+OSINC_PLATFORM := SED_ME_CROSS/4.2.0/include
+OSINC_TARGET := SED_ME_STAGINGDIR/usr/include
ifneq ("$(VARIANT)", "")
OSINC_VARIANT := $(BASE_OSINC)
@@ -59,7 +59,7 @@ endif
# ----------------------------------------------------------------------------
# Base directory for libraries provided by GPP OS
# ----------------------------------------------------------------------------
-BASE_OSLIB := /opt/montavista/pro/devkit/arm/v5t_le/lib
+BASE_OSLIB := SED_ME_STAGINGDIR/lib
OSLIB_GENERIC := $(BASE_OSLIB)
OSLIB_PLATFORM := $(BASE_OSLIB)
@@ -77,10 +77,10 @@ endif
# ----------------------------------------------------------------------------
# Name of the compiler
# ----------------------------------------------------------------------------
-COMPILER := $(BASE_CGTOOLS)/arm_v5t_le-gcc
-LD := $(BASE_CGTOOLS)/arm_v5t_le-ld
+COMPILER := SED_ME_TARGET_PREFIXgcc
+LD := SED_ME_TARGET_PREFIXDIR-ld
-CROSS_COMPILE := arm_v5t_le-
+CROSS_COMPILE := SED_ME_TARGET_PREFIX
export CROSS_COMPILE
# ----------------------------------------------------------------------------
@@ -135,7 +135,7 @@ STD_CC_DEFNS := -D_REENTRANT
# ============================================================================
# ARCHIVER1 - This denotes the linker.
# ============================================================================
-ARCHIVER1 := $(BASE_CGTOOLS)/arm_v5t_le-ld
+ARCHIVER1 := SED_ME_TARGET_PREFIX-ld
# ----------------------------------------------------------------------------
# Standard flags for the archiver
@@ -146,7 +146,7 @@ STD_AR_FLAGS1 := -EL -r
# ============================================================================
# ARCHIVER2 - This denotes the archiver.
# ============================================================================
-ARCHIVER2 := $(BASE_CGTOOLS)/arm_v5t_le-ar
+ARCHIVER2 := SED_ME_TARGET_PREFIX-ar
# ----------------------------------------------------------------------------
# Standard flags for the archiver
@@ -157,7 +157,7 @@ STD_AR_FLAGS2 := -r
# ============================================================================
# LINKER - The compiler is used for linking purpose as well.
# ============================================================================
-LINKER := $(BASE_CGTOOLS)/arm_v5t_le-gcc
+LINKER := SED_ME_TARGET_PREFIXgcc
# ----------------------------------------------------------------------------
# Command line switches used by the linker
#
# mt diff -re53a5cd6a7325c8cfa3079fff6e7e086127f125c -r1ae309a70c139143a4704b5def248a5be0b1a810
#
#
#
# delete "packages/freesmartphone/pygsm_git.bb"
#
More information about the Openembedded-commits
mailing list