[oe-commits] org.oe.dev merge of '3b5a264cff607e4c4977e318dde1e861a664ad81'
koen commit
oe at amethyst.openembedded.net
Thu May 15 17:24:40 UTC 2008
merge of '3b5a264cff607e4c4977e318dde1e861a664ad81'
and '92366ccb09c8d809619c585c91fe69a2046e1396'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 23febe44719cb1ea7557c584ce7c762da82df4d5
ViewMTN: http://monotone.openembedded.org/revision/info/23febe44719cb1ea7557c584ce7c762da82df4d5
Files:
1
packages/dsplink/davinci-dvevm
packages/dsplink/davinci-dvevm/CURRENTCFG.MK
packages/dsplink/davinci-dvevm/c64xx_5.xx_linux.mk
packages/dsplink/davinci-dvevm/davinci_mvlpro5.0.mk
packages/dsplink/dsplink_1.50.bb
packages/classpath/classpath-native_0.97.1.bb
packages/docbook-utils/docbook-utils-native_0.6.13.bb
packages/docbook-utils/docbook-utils_0.6.13.bb
packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch
packages/linux/linux-omap2-git/beagleboard/convert-rwsem-to-rwclock.patch
packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch
classes/oestats-client.bbclass
packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch
classes/java-library.bbclass
classes/java.bbclass
conf/distro/include/preferred-om-2008-versions.inc
packages/dbus-java/dbus-java_2.3.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/libmatthew/libmatthew_0.5.bb
packages/libopie/libopie2_1.2.3.bb
packages/linux/linux-omap2_git.bb
packages/linux/linux_2.6.23+2.6.24-rc5.bb
packages/linux/linux_2.6.25.bb
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt_2.3.10.bb
Diffs:
#
# mt diff -r3b5a264cff607e4c4977e318dde1e861a664ad81 -r23febe44719cb1ea7557c584ce7c762da82df4d5
#
#
#
# add_dir "packages/dsplink/davinci-dvevm"
#
# add_file "packages/dsplink/davinci-dvevm/CURRENTCFG.MK"
# content [297c20afc6a19d66256393fa080d51f5e9e5c2b2]
#
# add_file "packages/dsplink/davinci-dvevm/c64xx_5.xx_linux.mk"
# content [b6836bf5cfa973564ebb43ebcbb75b126060bbcd]
#
# add_file "packages/dsplink/davinci-dvevm/davinci_mvlpro5.0.mk"
# content [4fb3450ea471109bdac1296d64637f3d4febc623]
#
# patch "packages/dsplink/dsplink_1.50.bb"
# from [47c29a6b30d8694d6b081b8ce1e895ffb63957c8]
# to [7d8542d5cbc5300a8934f38ff7568bd347633860]
#
============================================================
--- packages/dsplink/davinci-dvevm/CURRENTCFG.MK 297c20afc6a19d66256393fa080d51f5e9e5c2b2
+++ packages/dsplink/davinci-dvevm/CURRENTCFG.MK 297c20afc6a19d66256393fa080d51f5e9e5c2b2
@@ -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 := /home/balister/src/dsplink_1_50/dsplink/gpp
+export DSPROOT := /home/balister/src/dsplink_1_50/dsplink/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 := davinci_mvlpro5.0
+export GPPOSVERSION := 2.6.18
+export GPPOSVARIANT :=
+export DSPDISTRIBUTION := c64xxp_5.xx_linux
+
+
+# =========================================================
+# Target GPP and DSP platforms for DSP/BIOS LINK
+# =========================================================
+export GPPPLATFORM := Davinci
+export DSPPLATFORM := Davinci
+
+
+# =========================================================
+# 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/davinci-dvevm/c64xx_5.xx_linux.mk b6836bf5cfa973564ebb43ebcbb75b126060bbcd
+++ packages/dsplink/davinci-dvevm/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/davinci-dvevm/davinci_mvlpro5.0.mk 4fb3450ea471109bdac1296d64637f3d4febc623
+++ packages/dsplink/davinci-dvevm/davinci_mvlpro5.0.mk 4fb3450ea471109bdac1296d64637f3d4febc623
@@ -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
+
+
+# ============================================================================
+# Set the values of necessary variables to be used for the OS.
+# ============================================================================
+
+# ----------------------------------------------------------------------------
+# Base directory for the GPP OS
+# ----------------------------------------------------------------------------
+BASE_BUILDOS := ${HOME}/montavista/kernel/Linux
+
+# ----------------------------------------------------------------------------
+# Base for code generation tools - compiler, linker, archiver etc.
+# ----------------------------------------------------------------------------
+BASE_CGTOOLS := /opt/montavista/pro/devkit/arm/v5t_le/bin
+
+# ----------------------------------------------------------------------------
+# Base directory for include files provided by GPP OS
+# ----------------------------------------------------------------------------
+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
+
+ifneq ("$(VARIANT)", "")
+OSINC_VARIANT := $(BASE_OSINC)
+endif
+
+
+# ----------------------------------------------------------------------------
+# Base directory for libraries provided by GPP OS
+# ------------------------------------%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r92366ccb09c8d809619c585c91fe69a2046e1396 -r23febe44719cb1ea7557c584ce7c762da82df4d5
#
#
#
# delete "packages/classpath/classpath-native_0.97.1.bb"
#
# delete "packages/docbook-utils/docbook-utils-native_0.6.13.bb"
#
# delete "packages/docbook-utils/docbook-utils_0.6.13.bb"
#
# delete "packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/convert-rwsem-to-rwclock.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch"
#
# add_file "classes/oestats-client.bbclass"
# content [c9260fde7f5ef0dc89229f308c6ec355d98efd23]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch"
# content [600d062218a1b4266905f44c26ab670c0c53f7a4]
#
# patch "classes/java-library.bbclass"
# from [ba884554b916e0ee77988f7e42644eb50f0bcf92]
# to [8663571955e5e7b94d365cb357c051df42196900]
#
# patch "classes/java.bbclass"
# from [4a470d4978ae2ef918625aa0f94f81ced60914df]
# to [1cbaed96d4ed2a16236caaec74121c841339d213]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [1fa5768d601b1fc24f2f64c740c2e5fc96c4fce3]
# to [5f9e99fa45dd0ff3b521383e4f8f11e144767fec]
#
# patch "packages/dbus-java/dbus-java_2.3.bb"
# from [17764905d124799a8edd17b918d5840fb5165cb9]
# to [815714e636ac18cc91f38966a30a02df3057e1ef]
#
# patch "packages/dsplink/dsplink_1.50.bb"
# from [690567ce000323a321b99c98052f290712e824c2]
# to [7d8542d5cbc5300a8934f38ff7568bd347633860]
#
# 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]
#
# patch "packages/libmatthew/libmatthew_0.5.bb"
# from [4d5017a96ee835a24017a6f101e47e55243c6816]
# to [accbbb844426aee0da50d5f0184b814a9b5f0354]
#
# patch "packages/libopie/libopie2_1.2.3.bb"
# from [63a7fc0db1279bd05e64e2b06c6e583e83ec1cca]
# to [60741c8fec6e800e5b344bbf504b3b86e331304b]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [8e7d4cb4e84b3d94fa459bf62dd4892ff2e7ae9f]
# to [ff28a88cc78eaf1d0a39ca0bedaa3aeb4c0f30fb]
#
# patch "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
# from [801134850169bd093cb2c9401f2e93bbd3acc903]
# to [9e64614b2b4500887ff09f7ff53ffccb90a7ff0a]
#
# patch "packages/linux/linux_2.6.25.bb"
# from [ed037c79f846e5b7c53db483560819488aadcdcf]
# to [908bd7f32af38ac35b5fed1ed57e60c950bcb8c9]
#
# patch "packages/qte/qte-common_2.3.10.inc"
# from [0aac8dfbf78ecb980a8817d0ceef6220a54f4724]
# to [24ec02846781efe4c104691900ce390e594e64bb]
#
# patch "packages/qte/qte-mt_2.3.10.bb"
# from [4241677b274551c8db9002c2c4aebecaf5272154]
# to [9de7ec362919755e02c79a584fd115bdf5a9f152]
#
============================================================
--- classes/oestats-client.bbclass c9260fde7f5ef0dc89229f308c6ec355d98efd23
+++ classes/oestats-client.bbclass c9260fde7f5ef0dc89229f308c6ec355d98efd23
@@ -0,0 +1,108 @@
+# Integration with the oestats build statistics server, see:
+#
+# http://opensource.bolloretelecom.eu/projects/oestats
+#
+# To make use of this class, add to your local.conf:
+#
+# INHERIT += "oestats-client"
+# OESTATS_SERVER = "some.server.org:8000"
+# OESTATS_BUILDER = "some title"
+
+def oestats_revision(dir):
+ import re
+ try:
+ f = file("%s/_MTN/revision" % dir)
+ m = re.search(r"old_revision \[(.*)\]", f.read())
+ return m.group(1)
+ except:
+ return
+
+def oestats_send(server, action, vars = {}):
+ import httplib, urllib
+
+ params = urllib.urlencode(vars)
+ headers = {"Content-type": "application/x-www-form-urlencoded",
+ "Accept": "text/plain"}
+ conn = httplib.HTTPConnection(server)
+ conn.request("POST", action, params, headers)
+ response = conn.getresponse()
+ conn.close()
+ return response
+
+def oestats_start(server, builder, d):
+ import bb
+ import os.path
+
+ # collect information about revisions
+ path_bb = bb.data.getVar('BBPATH', d, 1)
+ for p in (path_bb or "").split(':'):
+ revision = oestats_revision(p)
+ if revision:
+ break
+
+ # send report
+ response = oestats_send(server, "/builds/start/", {
+ 'builder': builder,
+ 'revision': revision,
+ 'machine': bb.data.getVar( 'MACHINE', d, True ),
+ 'distro': bb.data.getVar( 'DISTRO', d, True ),
+ })
+ id = response.read()
+
+ # save the build id
+ bb.note("Stats id: %s" % id)
+ f = file(bb.data.getVar('TMPDIR', d, True)+"/oestats.id", 'w')
+ f.write(id)
+
+def oestats_stop(server, d, status):
+ import bb
+
+ # retrieve build id
+ f = file(bb.data.getVar('TMPDIR',d,True)+"/oestats.id", 'r')
+ id = f.read()
+
+ # send report
+ response = oestats_send(server, "/builds/stop/%s/" % id, {
+ 'status': status,
+ })
+
+def oestats_task(server, d, task, status):
+ import bb
+
+ # retrieve build id
+ f = file(bb.data.getVar('TMPDIR',d,True)+"/oestats.id", 'r')
+ id = f.read()
+
+ # send report
+ response = oestats_send(server, "/builds/task/%s/" % id, {
+ 'package': bb.data.getVar('PN', d, True),
+ 'version': bb.data.getVar('PV', d, True),
+ 'revision': bb.data.getVar('PR', d, True),
+ 'task': task,
+ 'status': status,
+ })
+
+addhandler oestats_eventhandler
+python oestats_eventhandler () {
+ from bb.event import getName
+ import bb
+
+ if e.data is None or getName(e) == "MsgNote":
+ return NotHandled
+
+ server = bb.data.getVar('OESTATS_SERVER', e.data, True)
+ builder = bb.data.getVar('OESTATS_BUILDER', e.data, True)
+ if not server or not builder:
+ return NotHandled
+
+ if getName(e) == 'BuildStarted':
+ oestats_start(server, builder, e.data)
+ elif getName(e) == 'BuildCompleted':
+ oestats_stop(server, e.data, 'Completed')
+ elif getName(e) == 'TaskSucceeded':
+ oestats_task(server, e.data, e.task, 'Succeeded')
+ elif getName(e) == 'TaskFailed':
+ oestats_task(server, e.data, e.task, 'Failed')
+
+ return NotHandled
+}
============================================================
--- packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch 600d062218a1b4266905f44c26ab670c0c53f7a4
+++ packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch 600d062218a1b4266905f44c26ab670c0c53f7a4
@@ -0,0 +1,36 @@
+From eddf57fb9748791e021ef550d651cc72c48add5c Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen at openembedded.org>
+Date: Thu, 15 May 2008 09:32:23 +0200
+Subject: [PATCH] ARM: OMAP: board-omap3beagle: fix merge-damage in RTC code
+
+This patch fixes the merge-damage in the beagleboard RTC code
+
+Signed-off-by: Koen Kooi <koen at openembedded.org>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 0c15ca0..0c0cbfc 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -76,6 +76,7 @@ static struct platform_device *omap3_beagle_devices[] __initdata = {
+
+ static void __init omap3_beagle_init(void)
+ {
++ platform_add_devices(omap3_beagle_devices, ARRAY_SIZE(omap3_beagle_devices));
+ omap_board_config = omap3_beagle_config;
+ omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
+ omap_serial_init();
+@@ -88,8 +89,6 @@ arch_initcall(omap3_beagle_i2c_init);
+
+ static void __init omap3_beagle_map_io(void)
+ {
+- platform_add_devices(omap3_beagle_devices,
+- ARRAY_SIZE(omap3_beagle_devices));
+ omap2_set_globals_343x();
+ omap2_map_common_io();
+ }
+--
+1.5.4.3
+
============================================================
--- classes/java-library.bbclass ba884554b916e0ee77988f7e42644eb50f0bcf92
+++ classes/java-library.bbclass 8663571955e5e7b94d365cb357c051df42196900
@@ -35,3 +35,24 @@ FILES_${JPN} = "${datadir_java}"
FILES_${JPN} = "${datadir_java}"
+# File name of the libraries' main Jar file
+JARFILENAME = "${P}.jar"
+
+# Space-separated list of alternative file names.
+ALTJARFILENAMES = "${PN}.jar"
+
+java_install() {
+ oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES}
+}
+
+do_install() {
+ java_install
+}
+
+java_stage() {
+ oe_jarinstall -s ${JARFILENAME} ${ALTJARFILENAMES}
+}
+
+do_stage() {
+ java_stage
+}
============================================================
--- classes/java.bbclass 4a470d4978ae2ef918625aa0f94f81ced60914df
+++ classes/java.bbclass 1cbaed96d4ed2a16236caaec74121c841339d213
@@ -61,6 +61,41 @@ oe_jarinstall() {
done
}
+oe_makeclasspath() {
+ # Purpose: Generate a classpath variable from the given Jar file names
+ # where the ".jar" has been omitted.
+ #
+ # oe_makeclasspath foo baz bar
+ # Prints ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar
+ #
+ # oe_makeclasspath -s foo baz bar
+ # Prints ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar
+ #
+ # Provide the -s at the beginning otherwise strange things happen.
+ #
+ dir=${datadir_java}
+ classpath=
+ delimiter=
+
+ while [ "$#" -gt 0 ]; do
+ case "$1" in
+ -s)
+ dir=${STAGING_DATADIR_JAVA}
+ ;;
+ -*)
+ oefatal "oe_makeclasspath: unknown option: $1"
+ ;;
+ *)
+ classpath=$classpath$delimiter$dir/$1.jar
+ delimiter=":"
+ ;;
+ esac
+ shift
+ done
+
+ echo $classpath
+}
+
# Creates a simple wrapper script for your Java program.
# The script is written to ${PN} by default.
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc 1fa5768d601b1fc24f2f64c740c2e5fc96c4fce3
+++ conf/distro/include/preferred-om-2008-versions.inc 5f9e99fa45dd0ff3b521383e4f8f11e144767fec
@@ -263,8 +263,8 @@ PREFERRED_VERSION_dnsmasq ?= "2.38"
PREFERRED_VERSION_djvulibre ?= "3.5.19"
PREFERRED_VERSION_dmxproto ?= "2.2.2"
PREFERRED_VERSION_dnsmasq ?= "2.38"
-PREFERRED_VERSION_docbook-utils ?= "0.6.13"
-PREFERRED_VERSION_docbook-utils-native ?= "0.6.13"
+PREFERRED_VERSION_docbook-utils ?= "0.6.14"
+PREFERRED_VERSION_docbook-utils-native ?= "0.6.14"
PREFERRED_VERSION_dosbox ?= "0.70"
PREFERRED_VERSION_dosfstools ?= "2.11"
PREFERRED_VERSION_dosfstools-native ?= "2.10"
============================================================
--- packages/dbus-java/dbus-java_2.3.bb 17764905d124799a8edd17b918d5840fb5165cb9
+++ packages/dbus-java/dbus-java_2.3.bb 815714e636ac18cc91f38966a30a02df3057e1ef
@@ -4,10 +4,10 @@ SECTION = "libs"
LICENSE = "GPLv2 AFL"
SECTION = "libs"
-HOMEPAGE = "http://jalimo.org"
+HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
AUTHOR = "Matthew Johnson <dbus at matthew.ath.cx>"
-PR = "r2"
+PR = "r3"
inherit java-library
@@ -15,7 +15,7 @@ S = "${WORKDIR}/dbus-java-${PV}"
S = "${WORKDIR}/dbus-java-${PV}"
-DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native"
+DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
RSUGGESTS_libdbus-java = "libmatthew-java dbus"
RDEPENDS_dbus-java-viewer = "java2-runtime libmatthew-java ${JPN}"
RDEPENDS_dbus-java-bin = "java2-runtime libmatthew-java ${JPN}"
@@ -25,8 +25,8 @@ do_compile () {
oe_runmake \
JCFLAGS="-source 1.5" \
JAVAC="javac" \
- JARPREFIX="${STAGING_DATADIR}/java" \
- JAVAUNIXJARDIR="${STAGING_DATADIR}/java" \
+ JARPREFIX="${STAGING_DATADIR_JAVA}" \
+ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
CLASSPATH="${S}/classes" \
JAR="fastjar" \
.binclasses
@@ -34,8 +34,8 @@ do_compile () {
oe_runmake \
JCFLAGS="-source 1.5" \
JAVAC="javac" \
- JARPREFIX="${STAGING_DATADIR}/java" \
- JAVAUNIXJARDIR="${STAGING_DATADIR}/java" \
+ JARPREFIX="${STAGING_DATADIR_JAVA}" \
+ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
CLASSPATH="${S}/classes" \
JAR="fastjar" \
all
@@ -47,8 +47,8 @@ do_compile () {
oe_runmake \
JAVAC="oefatal \"No Java compilation expected here.\"" \
JAR="oefatal \"No jar invocation expected here.\"" \
- JARPREFIX=${datadir}/java \
- JAVAUNIXPATH=${datadir}/java \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
all
# Trigger generation of all documentation files to prevent this
@@ -56,12 +56,12 @@ do_compile () {
oe_runmake \
JAVAC="oefatal \"No Java compilation expected here.\"" \
JAR="oefatal \"No jar invocation expected here.\"" \
- JARPREFIX=${datadir}/java \
- JAVAUNIXPATH=${datadir}/java \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
CreateInterface.1 ListDBus.1 DBusDaemon.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL DBusCall.1
}
-do_staging () {
+do_stage () {
oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar
}
============================================================
--- packages/dsplink/dsplink_1.50.bb 690567ce000323a321b99c98052f290712e824c2
+++ packages/dsplink/dsplink_1.50.bb 7d8542d5cbc5300a8934f38ff7568bd347633860
@@ -1,5 +1,7 @@ DESCRIPTION = "DSP Link for TI ARM/DSP p
DESCRIPTION = "DSP Link for TI ARM/DSP processors"
+DEPENDS = "virtual/kernel"
+
PR = "r0"
# Get dsplink tarball from TI website, place in sources and calculate
@@ -12,16 +14,20 @@ file://davinci_mvlpro5.0.mk \
file://davinci_mvlpro5.0.mk \
"
-S = "${WORKDIR}/dsplink_1_50"
+S = "${WORKDIR}/dsplink_1_50/dsplink"
+# Needed for buildscripts
+export DSPLINK = "${S}"
+
do_configure () {
- cp ${WORKDIR}/CURRENTCFG.MK ${S}/dsplink/config
- cp ${WORKDIR}/davinci_mvlpro5.0.mk ${S}/dsplink/make/Linux
- cp ${WORKDIR}/c64xx_5.xx_linux.mk ${S}/dsplink/make/DspBios
+ 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
}
do_compile () {
- export DSPLINK=${S}/dsplink
make -C ${S}/dsplink/gpp/src
}
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
============================================================
--- packages/gcc/gcc-4.2.2.inc 6281a032714b397b43955b47208a1dd89efdd74b
+++ packages/gcc/gcc-4.2.2.inc 95eb2c53a56331fe1ad715ff95b28751be2db521
@@ -76,6 +76,6 @@ JAVA = ""
FORTRAN_linux-gnueabi = ",fortran"
JAVA = ""
-EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
ARM_INSTRUCTION_SET = "arm"
============================================================
--- packages/gcc/gcc-4.3.0.inc 850acc9a5d1a62278c1db20cc938f2b7bd739aa5
+++ packages/gcc/gcc-4.3.0.inc 323ce0b37791068a29c4c609dc7d22e5e111dfb1
@@ -67,5 +67,5 @@ JAVA = ""
FORTRAN = ""
JAVA = ""
-EXTRA_OECONF_BASE = " --disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_BASE = " --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
============================================================
--- packages/gcc/gcc-cross_4.2.2.bb 0bd485fd64c5c34ee150e09c0e1260eebb2ff8e1
+++ packages/gcc/gcc-cross_4.2.2.bb 03fe6aeb1071c224e3e7f2f94784edc15939d6aa
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
require gcc-${PV}.inc
require gcc-cross4.inc
============================================================
--- packages/gcc/gcc-cross_4.3.0.bb 4624dce6b1ba076d4ae2d489e5808e69f56fd1b9
+++ packages/gcc/gcc-cross_4.3.0.bb 9cd84c8b2ab3edb8dc72fcf69627b4428b4555f6
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
require gcc-${PV}.inc
require gcc-cross4.inc
============================================================
--- packages/gcc/gcc-cross_csl-arm-2008q1.bb 8bae2d3dc0c0205410bf9e2f1c86270225679095
+++ packages/gcc/gcc-cross_csl-arm-2008q1.bb 1cc9244426bd64376%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list