[oe-commits] org.oe.dev merge of '47b76447b7c2487688f831149bc94872f6e96c44'

thebohemian commit oe at amethyst.openembedded.net
Thu May 15 22:28:04 UTC 2008


merge of '47b76447b7c2487688f831149bc94872f6e96c44'
     and 'e53a5cd6a7325c8cfa3079fff6e7e086127f125c'

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 327945003e321bca077ca44f526f2f0463ff8277
ViewMTN: http://monotone.openembedded.org/revision/info/327945003e321bca077ca44f526f2f0463ff8277
Files:
1
packages/dsplink/files
packages/dsplink/files/CURRENTCFG.MK
packages/dsplink/files/c64xx_5.xx_linux.mk
packages/dsplink/files/davinci_mvlpro5.0.mk
packages/dsplink/files/prcs-fix-include.patch
packages/freesmartphone/zhone_git.bb
packages/dsplink/dsplink_1.50.bb
packages/freesmartphone/mickeyterm_git.bb
packages/freesmartphone/python-ophoned_git.bb
packages/gcc/gcc-4.2.2.inc
packages/gcc/gcc-4.3.0.inc
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc-cross_4.3.0.bb
packages/gcc/gcc-cross_csl-arm-2008q1.bb
packages/gcc/gcc-csl-arm-2008q1.inc
packages/gcc/gcc-package-cross.inc
packages/batmand/files
packages/batmand/batmand_0.3.bb
packages/batmand/files/makefile-fix.patch
Diffs:

#
# mt diff -r47b76447b7c2487688f831149bc94872f6e96c44 -r327945003e321bca077ca44f526f2f0463ff8277
#
#
#
# add_dir "packages/dsplink/files"
# 
# add_file "packages/dsplink/files/CURRENTCFG.MK"
#  content [9c208079a23b32500e58a9f7c0f0d22a0c638210]
# 
# add_file "packages/dsplink/files/c64xx_5.xx_linux.mk"
#  content [b6836bf5cfa973564ebb43ebcbb75b126060bbcd]
# 
# add_file "packages/dsplink/files/davinci_mvlpro5.0.mk"
#  content [397df537b6a95afd39c7f2b31fa848ac95608411]
# 
# add_file "packages/dsplink/files/prcs-fix-include.patch"
#  content [b26834c446395da6ff9bc9cf1e0a643417a94fdd]
# 
# add_file "packages/freesmartphone/zhone_git.bb"
#  content [be991be982f74c721ed53468671e7ecce2218df4]
# 
# patch "packages/dsplink/dsplink_1.50.bb"
#  from [47c29a6b30d8694d6b081b8ce1e895ffb63957c8]
#    to [a2dba60ef70a6be005343a5420ec39fe0d6b7126]
# 
# patch "packages/freesmartphone/mickeyterm_git.bb"
#  from [bc49238273e24ba425114eecb9d8f2d58cc1dc9f]
#    to [282df0e10ec613105e8c966277bf91f2ff385447]
# 
# patch "packages/freesmartphone/python-ophoned_git.bb"
#  from [ea7c430a6835bdc3187fcd080d1ad5d9128f77ac]
#    to [c3a23270719f3ed39a3432f18c7e5dd0ad4b8847]
# 
# patch "packages/gcc/gcc-4.2.2.inc"
#  from [6281a032714b397b43955b47208a1dd89efdd74b]
#    to [95eb2c53a56331fe1ad715ff95b28751be2db521]
# 
# patch "packages/gcc/gcc-4.3.0.inc"
#  from [850acc9a5d1a62278c1db20cc938f2b7bd739aa5]
#    to [323ce0b37791068a29c4c609dc7d22e5e111dfb1]
# 
# patch "packages/gcc/gcc-cross_4.2.2.bb"
#  from [0bd485fd64c5c34ee150e09c0e1260eebb2ff8e1]
#    to [03fe6aeb1071c224e3e7f2f94784edc15939d6aa]
# 
# patch "packages/gcc/gcc-cross_4.3.0.bb"
#  from [4624dce6b1ba076d4ae2d489e5808e69f56fd1b9]
#    to [9cd84c8b2ab3edb8dc72fcf69627b4428b4555f6]
# 
# patch "packages/gcc/gcc-cross_csl-arm-2008q1.bb"
#  from [8bae2d3dc0c0205410bf9e2f1c86270225679095]
#    to [1cc9244426bd6437680f3c85cd1634ddb67311bb]
# 
# patch "packages/gcc/gcc-csl-arm-2008q1.inc"
#  from [b16cc5fbad679f5597b8947ce443ea4771251c69]
#    to [d206c14474ea4fa6a19a3b51f36b9d4eef7e54b6]
# 
# patch "packages/gcc/gcc-package-cross.inc"
#  from [44d61d818cd61ba089dc92891fd289e5000a139c]
#    to [dce3334b7fe1cb1b717d791e2ce4a7d68e9c79ce]
#
============================================================
--- packages/dsplink/files/CURRENTCFG.MK	9c208079a23b32500e58a9f7c0f0d22a0c638210
+++ packages/dsplink/files/CURRENTCFG.MK	9c208079a23b32500e58a9f7c0f0d22a0c638210
@@ -0,0 +1,99 @@
+#   =========================================================
+#   DSP/BIOS LINK Configuration file.
+#
+#   CAUTION! This is a generated file.
+#            All changes will be lost.
+#
+#   This file was generated on MAY 14, 2008  11:53:09
+#   =========================================================
+
+
+#   =========================================================
+#   When this file was created.
+#   =========================================================
+export  CFGDATE            := MAY 14, 2008  11:53:09
+
+
+#   =========================================================
+#   DSP/BIOS LINK GPP side root directory.
+#   =========================================================
+export GPPROOT             := SED_ME_SOURCEDIR/gpp
+export DSPROOT             := SED_ME_SOURCEDIR/dsp
+
+
+#   =========================================================
+#   GPP and DSP OS for which DSP/BIOS LINK is being built
+#   =========================================================
+export GPPOS               := Linux
+export DSPOS               := DspBios
+
+
+#   =========================================================
+#   Specific distribution of GPP and DSP OS (if any)
+#   =========================================================
+export GPPDISTRIBUTION     := SED_ME_GPPDISTRO
+export GPPOSVERSION        := SED_ME_KERNELVERSION
+export GPPOSVARIANT        := 
+export DSPDISTRIBUTION     := SED_ME_DSPDISTRO
+
+
+#   =========================================================
+#   Target GPP and DSP platforms for DSP/BIOS LINK
+#   =========================================================
+export GPPPLATFORM         := SED_ME_PLATFORM
+export DSPPLATFORM         := SED_ME_PLATFORM
+
+
+#   =========================================================
+#   Target GPP and DSP devices
+#   =========================================================
+export GPPDEVICE           := Davinci
+export DSPDEVICE           := C64XX
+
+
+#   =========================================================
+#   Compile time scalability options for DSP/BIOS LINK
+#   =========================================================
+export USE_PROC            := 1
+export USE_POOL            := 1
+export USE_NOTIFY          := 1
+export USE_MPCS            := 1
+export USE_RINGIO          := 1
+export USE_MPLIST          := 0
+export USE_MSGQ            := 0
+export USE_CHNL            := 0
+
+
+#   =========================================================
+#   Compile time physical link scalability options for device
+#   =========================================================
+export USE_CHNL_ZCPY_LINK  := 0
+export USE_CHNL_PCPY_LINK  := 0
+export USE_MSGQ_ZCPY_LINK  := 0
+export USE_MSGQ_PCPY_LINK  := 0
+
+
+#   =========================================================
+#   Enable/ Disable trace
+#   =========================================================
+export TRACE               := 1
+
+
+#   =========================================================
+#   Enable/ Disable profiling
+#   =========================================================
+export PROFILE             := 1
+
+
+#   =========================================================
+#   Enable/ Disable probe
+#   =========================================================
+export PROBE               := 0
+
+
+#   =========================================================
+#   Platform Variant
+#   =========================================================
+export VARIANT             := DM6446
+
+
============================================================
--- packages/dsplink/files/c64xx_5.xx_linux.mk	b6836bf5cfa973564ebb43ebcbb75b126060bbcd
+++ packages/dsplink/files/c64xx_5.xx_linux.mk	b6836bf5cfa973564ebb43ebcbb75b126060bbcd
@@ -0,0 +1,223 @@
+#   ============================================================================
+#   @file   c64xx_5.xx_linux.mk
+#
+#   @path   $(DSPLINK)/make/DspBios/
+#
+#   @desc   This makefile defines OS specific macros used by MAKE system for
+#           the DSP/BIOS version 5.xx for C64XX on Linux.
+#
+#   @ver    1.50
+#   ============================================================================
+#   Copyright (c) Texas Instruments Incorporated 2002-2007
+#
+#   Use of this software is controlled by the terms and conditions found in the
+#   license agreement under which this software has been supplied or provided.
+#   ============================================================================
+
+
+ifndef C64XX_5_XX_LINUX_MK
+
+define C64XX_5_XX_LINUX_MK
+endef
+
+
+#   ============================================================================
+#   Let the make system know that a specific distribution for the GPP OS
+#   is being used.
+#   ============================================================================
+USE_DISTRIBUTION := 1
+
+
+#   ============================================================================
+#   Set the values of necessary variables to be used for the OS.
+#   ============================================================================
+
+#   ----------------------------------------------------------------------------
+#   Base directory for the DSP OS
+#   ----------------------------------------------------------------------------
+BASE_INSTALL    := /opt/ti-tools
+BASE_SABIOS     := $(BASE_INSTALL)/bios
+BASE_BUILDOS    := $(BASE_SABIOS)/packages/ti/bios
+
+#   ----------------------------------------------------------------------------
+#   Base directory for the XDC tools
+#   ----------------------------------------------------------------------------
+XDCTOOLS_DIR    := $(BASE_SABIOS)/xdctools
+
+#   ----------------------------------------------------------------------------
+#   Base for code generation tools - compiler, linker, archiver etc.
+#   ----------------------------------------------------------------------------
+BASE_CGTOOLS    := $(BASE_INSTALL)/c6000/cgtools
+BASE_CGTOOLSBIN := $(BASE_CGTOOLS)/bin
+
+#   ----------------------------------------------------------------------------
+#   Base for TCONF, platform files and dependent components
+#   ----------------------------------------------------------------------------
+BASE_TCONF      := $(XDCTOOLS_DIR)
+BASE_PLATFORMS  := $(BASE_SABIOS)/packages
+BASE_CSL        := $(BASE_INSTALL)/c6000/csl
+BASE_PSL        := $(BASE_SABIOS)/packages/ti/psl
+BASE_RTDX       := $(BASE_SABIOS)/packages/ti/rtdx
+
+
+#   ----------------------------------------------------------------------------
+#   Base directory for include files
+#   ----------------------------------------------------------------------------
+BASE_OSINC      := $(BASE_BUILDOS)/include
+BASE_CGTOOLSINC := $(BASE_CGTOOLS)/include
+BASE_RTDXINC    := $(BASE_RTDX)/include/c6000
+BASE_PSLINC     := $(BASE_PSL)/include
+BASE_CSLINC     := $(BASE_CSL)/include
+
+OSINC_GENERIC   := $(BASE_OSINC)
+OSINC_PLATFORM  := $(BASE_CGTOOLSINC) $(BASE_CSLINC)  $(BASE_RTDXINC)  $(BASE_PSLINC)
+
+
+ifeq ($(PLATFORM), morpheus_dev)
+OSINC_PLATFORM  += $(BASE_INSTALL)/boards/evmdm642/include
+endif # ifeq ($(PLATFORM), morpheus_dev)
+
+ifneq ("$(VARIANT)", "")
+OSINC_VARIANT   := $(BASE_OSINC)
+endif
+
+
+#   ----------------------------------------------------------------------------
+#   Base directory for libraries
+#   ----------------------------------------------------------------------------
+BASE_OSLIB      := $(BASE_BUILDOS)/lib
+BASE_CGTOOLSLIB := $(BASE_CGTOOLS)/lib
+BASE_RTDXLIB    := $(BASE_RTDX)/lib/c6000
+BASE_PSLLIB     := $(BASE_PSL)/lib
+BASE_CSLLIB     := $(BASE_CSL)/lib
+
+OSLIB_GENERIC   := $(BASE_OSLIB)
+OSLIB_PLATFORM  := $(BASE_CGTOOLSLIB) $(BASE_RTDXLIB) \
+                   $(BASE_PSLLIB) $(BASE_CSLLIB)
+
+ifeq ($(PLATFORM), morpheus_dev)
+OSLIB_PLATFORM  += $(BASE_INSTALL)/boards/evmdm642/lib
+endif # ifeq ($(PLATFORM), morpheus_dev)
+
+ifeq ($(PLATFORM), DM642_PCI)
+OSLIB_PLATFORM  += $(BASE_INSTALL)/boards/evmdm642/lib
+endif # ifeq ($(PLATFORM), DM642_PCI)
+
+ifneq ("$(VARIANT)", "")
+OSLIB_VARIANT   := $(BASE_OSLIB)
+endif
+
+
+#   ============================================================================
+#   COMPILER
+#   ============================================================================
+
+#   ----------------------------------------------------------------------------
+#   Name of the compiler
+#   ----------------------------------------------------------------------------
+COMPILER        := $(BASE_CGTOOLSBIN)/cl6x
+
+#   ----------------------------------------------------------------------------
+#   Command line switches used by the compiler
+#
+#   CC_SW_DEF       Command line defines
+#   CC_SW_INC       Search path for header files
+#   CC_SW_OBJ       Object file directory
+#   CC_SW_DEB       Include debug information
+#   CC_SW_REL       Release build
+#   ----------------------------------------------------------------------------
+CC_SW_DEF       := -d
+CC_SW_INC       := -I
+CC_SW_OBJ       := -fr
+CC_SW_DEB       := -g -d"_DEBUG"
+CC_SW_REL       := -o3
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the compiler
+#   ----------------------------------------------------------------------------
+STD_CC_FLAGS    := -q -pdr -pdv -pden -ml3 -mv6400 -d"CHIP_DM642"
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the compiler when building an executable
+#   ----------------------------------------------------------------------------
+EXE_CC_FLAGS    :=
+
+#   ----------------------------------------------------------------------------
+#   Flags for the compiler when building an archive
+#   ----------------------------------------------------------------------------
+ARC_CC_FLAGS    :=
+
+#   ----------------------------------------------------------------------------
+#   Standard definitions for the compiler
+#   ----------------------------------------------------------------------------
+STD_CC_DEFNS    :=
+
+
+#   ============================================================================
+#   ARCHIVER
+#   ============================================================================
+ARCHIVER        := $(BASE_CGTOOLSBIN)/ar6x
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the archiver
+#   ----------------------------------------------------------------------------
+STD_AR_FLAGS    := -r
+
+#   ----------------------------------------------------------------------------
+#   Archiver flags for extracting object files
+#   ----------------------------------------------------------------------------
+EXT_AR_FLAGS    := xq
+
+
+#   ============================================================================
+#   LINKER
+#   ============================================================================
+LINKER          := $(BASE_CGTOOLSBIN)/cl6x -z
+
+#   ----------------------------------------------------------------------------
+#   Command line switches used by the linker
+#
+#   LD_SW_INC       Search path for libraries
+#   LD_SW_LIB       Include library name
+#   LD_SW_OUT       Output file name
+#   LD_SW_MAP       Map file name
+#   LD_SW_RELOC     Generate relocateable output
+#   ----------------------------------------------------------------------------
+LD_SW_INC       := -i
+LD_SW_LIB       := -l
+LD_SW_OUT       := -o
+LD_SW_MAP       := -m
+LD_SW_RELOC     := -r
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for the linker
+#   ----------------------------------------------------------------------------
+STD_LD_FLAGS    := -c  -x
+
+#   ----------------------------------------------------------------------------
+#   Flags for the linker when building an executable
+#   ----------------------------------------------------------------------------
+EXE_LD_FLAGS    :=
+
+ifeq ($(PLATFORM), morpheus_dev)
+EXE_LD_FLAGS    += $(LD_SW_LIB)"cslDM642.lib"
+EXE_LD_FLAGS    += $(LD_SW_LIB)"morpheus.lib"
+endif # ifeq ($(PLATFORM), morpheus_dev)
+
+ifeq ($(PLATFORM), DM642_PCI)
+EXE_LD_FLAGS    += $(LD_SW_LIB)"cslDM642.lib"
+endif # ifeq ($(PLATFORM), DM642_PCI)
+
+#   ============================================================================
+#   TCONF
+#   ============================================================================
+TCONF           := $(BASE_TCONF)/tconf
+
+
+#   ----------------------------------------------------------------------------
+#   Standard flags for TCONF
+#   ----------------------------------------------------------------------------
+STD_TCF_FLAGS   :=
+
+
+endif   # ifndef C64XX_5_XX_LINUX_MK
============================================================
--- packages/dsplink/files/davinci_mvlpro5.0.mk	397df537b6a95afd39c7f2b31fa848ac95608411
+++ packages/dsplink/files/davinci_mvlpro5.0.mk	397df537b6a95afd39c7f2b31fa848ac95608411
@@ -0,0 +1,201 @@
+#   ============================================================================
+#   @file   davinci_mvlpro5.0.mk
+#
+#   @path   $(DSPLINK)/make/Linux/
+#
+#   @desc   This makefile defines OS specific macros used by MAKE system for
+#           the Montavista Pro 5.0 Linux distribution.
+#
+#   @ver    1.50
+#   ============================================================================
+#   Copyright (c) Texas Instruments Incorporated 2002-2007
+#
+#   Use of this software is controlled by the terms and conditions found in the
+#   license agreement under which this software has been supplied or provided.
+#   ============================================================================
+
+
+ifndef DAVINCI_MVLPRO5_0_MK
+
+define DAVINCI_MVLPRO5_0_MK
+endef
+
+
+#   ============================================================================
+#   Let the make system know that a specific distribution for the GPP OS
+#   is being used.
+#   ============================================================================
+USE_DISTRIBUTION := 1
+
+
+#   ========================================%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -re53a5cd6a7325c8cfa3079fff6e7e086127f125c -r327945003e321bca077ca44f526f2f0463ff8277
#
#
#
# add_dir "packages/batmand/files"
# 
# add_file "packages/batmand/batmand_0.3.bb"
#  content [7eafc40067a851d0050bb0cdf53c40881deb6cae]
# 
# add_file "packages/batmand/files/makefile-fix.patch"
#  content [03373e8bfdcf77fbe0e93f5d830041b0cfeec1db]
#
============================================================
--- packages/batmand/batmand_0.3.bb	7eafc40067a851d0050bb0cdf53c40881deb6cae
+++ packages/batmand/batmand_0.3.bb	7eafc40067a851d0050bb0cdf53c40881deb6cae
@@ -0,0 +1,29 @@
+DESCRIPTION = "Routing protocol daemon for multi-hop ad-hoc mesh networks."
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "https://www.open-mesh.net/batman"
+
+PR = "r0"
+
+RDEPENDS = "kernel-module-tun"
+
+SRC_URI = "\
+  http://downloads.open-mesh.net/batman/stable/sources/batman-0.3.tar.gz \
+  file://makefile-fix.patch;patch=1 \
+  "
+
+S = "${WORKDIR}/batman-${PV}"
+
+do_compile() {
+  oe_runmake
+}
+
+do_stage() {
+  :
+}
+
+do_install() {
+  install -d ${D}${bindir}
+  install -m 0755 batmand ${D}${bindir}
+}
============================================================
--- packages/batmand/files/makefile-fix.patch	03373e8bfdcf77fbe0e93f5d830041b0cfeec1db
+++ packages/batmand/files/makefile-fix.patch	03373e8bfdcf77fbe0e93f5d830041b0cfeec1db
@@ -0,0 +1,13 @@
+Index: batman-0.3/Makefile
+===================================================================
+--- batman-0.3.orig/Makefile	2008-05-15 19:09:47.000000000 +0200
++++ batman-0.3/Makefile	2008-05-15 21:01:14.000000000 +0200
+@@ -17,8 +17,6 @@
+ #
+ 
+ 
+-CC =		gcc
+-CFLAGS =	-Wall -O1 -g3
+ EXTRA_CFLAGS =	-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=$(REVISION_VERSION)
+ LDFLAGS =	-lpthread
+ 






More information about the Openembedded-commits mailing list