[oe-commits] org.oe.dev merge of '855419893670eddd4f74cc406e9264cde751254c'
mickeyl commit
oe at amethyst.openembedded.net
Sun May 18 16:28:20 UTC 2008
merge of '855419893670eddd4f74cc406e9264cde751254c'
and 'b57b6f67dc82434a153a6f60215a283ac096b584'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 8c79c14e519c2da015b828d88899e0af791e9da9
ViewMTN: http://monotone.openembedded.org/revision/info/8c79c14e519c2da015b828d88899e0af791e9da9
Files:
1
packages/python/python-setuptools-native_0.6c6.bb
packages/python/python-setuptools_0.6c6.bb
classes/oestats-client.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-glibc.inc
conf/machine/include/tune-cortexa8.inc
Diffs:
#
# mt diff -r855419893670eddd4f74cc406e9264cde751254c -r8c79c14e519c2da015b828d88899e0af791e9da9
#
#
#
# patch "packages/python/python-setuptools-native_0.6c6.bb"
# from [37e35eebe4105610cad978ad7a92f12a2b9095d1]
# to [98f58e21bf03997cb61c8459da61b888c73364f9]
#
# patch "packages/python/python-setuptools_0.6c6.bb"
# from [074cb8e81cb89426c6d897caeb5fd18c68571c9a]
# to [84dd67b8d39b269a732a02fdc2b2b08af8516af9]
#
============================================================
--- packages/python/python-setuptools-native_0.6c6.bb 37e35eebe4105610cad978ad7a92f12a2b9095d1
+++ packages/python/python-setuptools-native_0.6c6.bb 98f58e21bf03997cb61c8459da61b888c73364f9
@@ -1,4 +1,5 @@ require python-setuptools_${PV}.bb
require python-setuptools_${PV}.bb
+inherit native
DEPENDS = "python-native"
============================================================
--- packages/python/python-setuptools_0.6c6.bb 074cb8e81cb89426c6d897caeb5fd18c68571c9a
+++ packages/python/python-setuptools_0.6c6.bb 84dd67b8d39b269a732a02fdc2b2b08af8516af9
@@ -5,7 +5,7 @@ SRCNAME = "setuptools"
LICENSE = "MIT-like"
RDEPENDS = "python-distutils python-compression"
SRCNAME = "setuptools"
-PR = "ml1"
+PR = "ml2"
SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz"
S = "${WORKDIR}/${SRCNAME}-${PV}"
#
# mt diff -rb57b6f67dc82434a153a6f60215a283ac096b584 -r8c79c14e519c2da015b828d88899e0af791e9da9
#
#
#
# patch "classes/oestats-client.bbclass"
# from [e73c7ea6f42f1cdac24bec988ca6b2b4cd1022b7]
# to [c171db6462110869cb93b9aeaddec289573fca56]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [dface09802ce45bdb21c822c2e46b480f3369810]
# to [4b22a5418909757b3c14e67557228138743a303e]
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [c49fa1468b1a41c309505f099d320a78a592a8b8]
# to [64060b7ace4591e34cd8206bb5cd3ba77c6554d4]
#
# patch "conf/machine/include/tune-cortexa8.inc"
# from [8ce9346cd012a0659a0967b2e43edcfc2dfaf921]
# to [ffd911180ea7eb03d473826a023a54d88a219438]
#
============================================================
--- classes/oestats-client.bbclass e73c7ea6f42f1cdac24bec988ca6b2b4cd1022b7
+++ classes/oestats-client.bbclass c171db6462110869cb93b9aeaddec289573fca56
@@ -19,12 +19,30 @@ def oestats_send(server, action, vars =
return f.read()
def oestats_send(server, action, vars = {}):
- import httplib, urllib
+ import httplib
- params = urllib.urlencode(vars)
- headers = {"Content-type": "application/x-www-form-urlencoded"}
+ # build body
+ output = []
+ bound = '----------ThIs_Is_tHe_bouNdaRY_$'
+ for key in vars:
+ assert vars[key]
+ output.append('--' + bound)
+ output.append('Content-Disposition: form-data; name="%s"' % key)
+ output.append('')
+ output.append(vars[key])
+ output.append('--' + bound + '--')
+ output.append('')
+ body = "\r\n".join(output)
+
+ # build headers
+ headers = {
+ "User-agent": "oestats-client/0.1",
+ "Content-type": "multipart/form-data; boundary=%s" % bound,
+ "Content-length": str(len(body))}
+
+ # send request
conn = httplib.HTTPConnection(server)
- conn.request("POST", action, params, headers)
+ conn.request("POST", action, body, headers)
response = conn.getresponse()
data = response.read()
conn.close()
@@ -52,7 +70,7 @@ def oestats_start(server, builder, d):
if id:
bb.note("oestats: build %s" % id)
else:
- bb.note("oestats: server error, disabling stats")
+ bb.note("oestats: error starting build, disabling stats")
oestats_setid(d, id)
def oestats_stop(server, d, status):
@@ -63,9 +81,12 @@ def oestats_stop(server, d, status):
if not id: return
# send report
- response = oestats_send(server, "/builds/stop/%s/" % id, {
- 'status': status,
- })
+ try:
+ response = oestats_send(server, "/builds/stop/%s/" % id, {
+ 'status': status,
+ })
+ except:
+ bb.note("oestats: error stopping build")
def oestats_task(server, d, task, status):
import bb
@@ -82,14 +103,18 @@ def oestats_task(server, d, task, status
elapsed = 0
# 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,
- 'time': elapsed,
- })
+ try:
+ 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,
+ 'time': str(elapsed),
+ })
+ except:
+ bb.note("oestats: error sending task, disabling stats")
+ oestats_setid(d, "")
addhandler oestats_eventhandler
python oestats_eventhandler () {
============================================================
--- conf/distro/angstrom-2008.1.conf dface09802ce45bdb21c822c2e46b480f3369810
+++ conf/distro/angstrom-2008.1.conf 4b22a5418909757b3c14e67557228138743a303e
@@ -85,42 +85,30 @@ PREFERRED_PROVIDER_xserver ?= "
PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
#powerpc needs additional patches to gcc
-PREFERRED_VERSION_gcc_ppc405 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross_ppc405 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk_ppc405 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial_ppc405 ?= "4.1.1"
+ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1"
+ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
+ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1"
+#for proper NEON support we need a CSL toolchain
+ANGSTROM_GCC_VERSION_armv7a = "4.2.1+csl-arm-2007q3-53"
-PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1"
+#avr32 only has support for gcc 4.2.2
+ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
-# GCC 4.3.0 is the first release with armv7-* support
-PREFERRED_VERSION_gcc_armv7a = "4.2.3+csl-arm-2008q1-126"
-PREFERRED_VERSION_gcc-cross_armv7a = "4.2.3+csl-arm-2008q1-126"
-PREFERRED_VERSION_gcc-cross-sdk_armv7a = "4.2.3+csl-arm-2008q1-126"
-PREFERRED_VERSION_gcc-cross-initial_armv7a = "4.2.3+csl-arm-2008q1-126"
+#Everybody else can just use this:
+ANGSTROM_GCC_VERSION ?= "4.2.2"
-PREFERRED_VERSION_gcc ?= "4.2.2"
-PREFERRED_VERSION_gcc-cross ?= "4.2.2"
-PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.2.2"
+PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-sdk ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-initial ?= "${ANGSTROM_GCC_VERSION}"
#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
require conf/distro/include/preferred-gpe-versions-2.8.inc
require conf/distro/include/preferred-e-versions.inc
require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
-#avr32 only has patches for binutils 2.17 and gcc 4.2.2 in OE
-PREFERRED_VERSION_gcc_avr32 = "4.2.2"
-PREFERRED_VERSION_gcc-cross_avr32 = "4.2.2"
-PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.2.2"
+#avr32 only has patches for binutils 2.17 in OE
PREFERRED_VERSION_binutils_avr32 = "2.17"
PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
============================================================
--- conf/distro/include/angstrom-glibc.inc c49fa1468b1a41c309505f099d320a78a592a8b8
+++ conf/distro/include/angstrom-glibc.inc 64060b7ace4591e34cd8206bb5cd3ba77c6554d4
@@ -24,17 +24,11 @@ FULL_OPTIMIZATION = "-fexpensive-optimiz
FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -Os"
-FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -frename-registers -fomit-frame-pointer -O2"
-TARGET_CC_ARCH_pn-glibc_armv7a = " -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp "
-
FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
FULL_OPTIMIZATION_pn-glibc-intermediate = "-O2"
FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
-FULL_OPTIMIZATION_pn-glibc_armv7a = " -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp "
-CFLAGS_pn-glibc_armv7a = " -fexpensive-optimizations -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp"
-
BUILD_OPTIMIZATION = "-Os"
BUILD_OPTIMIZATION_pn-perl = "-O1"
BUILD_OPTIMIZATION_pn-glibc-intermediate = "-O2"
============================================================
--- conf/machine/include/tune-cortexa8.inc 8ce9346cd012a0659a0967b2e43edcfc2dfaf921
+++ conf/machine/include/tune-cortexa8.inc ffd911180ea7eb03d473826a023a54d88a219438
@@ -3,6 +3,6 @@
# [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html
# [3] https://support.codesourcery.com/GNUToolchain/kbentry29
-TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp"
+TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp"
FEED_ARCH = "armv7a"
PACKAGE_ARCH = "armv7a"
More information about the Openembedded-commits
mailing list