[oe-commits] org.oe.dev merge of '5678fc5f68b2ae8af66e58e2166718c6700e23d9'
oe commit
oe at amethyst.openembedded.net
Thu May 15 18:29:53 UTC 2008
merge of '5678fc5f68b2ae8af66e58e2166718c6700e23d9'
and '6d039e9b03aa085fdfe8ca8ffa98cf3b212eabed'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: ba129bd9e38e74717e81d25413881c72841b72fc
ViewMTN: http://monotone.openembedded.org/revision/info/ba129bd9e38e74717e81d25413881c72841b72fc
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/dsplink/files
packages/dsplink/dsplink_1.50.bb
packages/freesmartphone/zhone_git.bb
packages/freesmartphone/mickeyterm_git.bb
packages/freesmartphone/python-ophoned_git.bb
Diffs:
#
# mt diff -r5678fc5f68b2ae8af66e58e2166718c6700e23d9 -rba129bd9e38e74717e81d25413881c72841b72fc
#
#
#
# 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/dsplink/files"
#
# patch "packages/dsplink/dsplink_1.50.bb"
# from [7d8542d5cbc5300a8934f38ff7568bd347633860]
# to [7de50f119ee86ad3f405f9fd08e659fe2e291c39]
#
# patch "packages/dsplink/files/CURRENTCFG.MK"
# from [297c20afc6a19d66256393fa080d51f5e9e5c2b2]
# to [9c208079a23b32500e58a9f7c0f0d22a0c638210]
#
# patch "packages/dsplink/files/davinci_mvlpro5.0.mk"
# from [4fb3450ea471109bdac1296d64637f3d4febc623]
# to [9b9916bd792067c4102445c1fa2ed14b9f3a9d9a]
#
============================================================
--- packages/dsplink/dsplink_1.50.bb 7d8542d5cbc5300a8934f38ff7568bd347633860
+++ packages/dsplink/dsplink_1.50.bb 7de50f119ee86ad3f405f9fd08e659fe2e291c39
@@ -2,16 +2,18 @@ DEPENDS = "virtual/kernel"
DEPENDS = "virtual/kernel"
+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 \
"
S = "${WORKDIR}/dsplink_1_50/dsplink"
@@ -23,10 +25,23 @@ 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 \
+ ${S}/make/Linux/davinci_mvlpro5.0.mk
+
}
do_compile () {
- make -C ${S}/dsplink/gpp/src
+ make -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 9b9916bd792067c4102445c1fa2ed14b9f3a9d9a
@@ -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 -r6d039e9b03aa085fdfe8ca8ffa98cf3b212eabed -rba129bd9e38e74717e81d25413881c72841b72fc
#
#
#
# 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 \
"
More information about the Openembedded-commits
mailing list