[oe-commits] org.oe.dev merge of '509968e9aaa6b52420f7ae51e79fa781b449a633'

Laibsch commit oe at amethyst.openembedded.net
Mon May 19 01:18:51 UTC 2008


merge of '509968e9aaa6b52420f7ae51e79fa781b449a633'
     and '5ffcacd9125004bbcb65a5f2d933272d313bee84'

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 9fa69b2f07a5fcb6b383f2f91aac7359f003cf6e
ViewMTN: http://monotone.openembedded.org/revision/info/9fa69b2f07a5fcb6b383f2f91aac7359f003cf6e
Files:
1
packages/dropbear/dropbear/scp-argument-fix.patch
packages/dropbear/dropbear-0.49/scp-argument-fix.patch
contrib/marketing
packages/gcc/gcc-csl-arm-2007q3
packages/wwwoffle
packages/wwwoffle/files
contrib/marketing/oe-flyer.pdf
contrib/marketing/oe-poster.pdf
packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb
packages/gcc/gcc-cross_csl-arm-2007q3.bb
packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch
packages/gcc/gcc-csl-arm-2007q3.inc
packages/gcc/gcc_csl-arm-2007q3.bb
packages/wwwoffle/files/wwwoffle.if-down
packages/wwwoffle/files/wwwoffle.if-up
packages/wwwoffle/files/wwwoffle.init
packages/wwwoffle/wwwoffle_2.9c.bb
classes/image.bbclass
classes/oestats-client.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-glibc.inc
conf/machine/include/tune-cortexa8.inc
packages/linux/linux-rp-2.6.24/defconfig-akita
packages/linux/linux-rp-2.6.24/defconfig-bootcdx86
packages/linux/linux-rp-2.6.24/defconfig-c7x0
packages/linux/linux-rp-2.6.24/defconfig-hx2000
packages/linux/linux-rp-2.6.24/defconfig-poodle
packages/linux/linux-rp-2.6.24/defconfig-qemuarm
packages/linux/linux-rp-2.6.24/defconfig-qemux86
packages/linux/linux-rp-2.6.24/defconfig-spitz
packages/linux/linux-rp-2.6.24/defconfig-tosa
packages/linux/linux-rp-2.6.24/defconfig-zylonite
packages/php/php_5.2.5.bb
packages/python/python-setuptools-native_0.6c6.bb
packages/python/python-setuptools_0.6c6.bb
mtn:manual_merge
true
packages/php/php-native_4.4.4.bb
packages/nonworking/php/php-native_4.4.4.bb
packages/php/php_4.4.4.bb
packages/nonworking/php/php_4.4.4.bb
packages/nonworking/php
Diffs:

#
# mt diff -r509968e9aaa6b52420f7ae51e79fa781b449a633 -r9fa69b2f07a5fcb6b383f2f91aac7359f003cf6e
#
#
#
# rename "packages/dropbear/dropbear/scp-argument-fix.patch"
#     to "packages/dropbear/dropbear-0.49/scp-argument-fix.patch"
# 
# add_dir "contrib/marketing"
# 
# add_dir "packages/gcc/gcc-csl-arm-2007q3"
# 
# add_dir "packages/wwwoffle"
# 
# add_dir "packages/wwwoffle/files"
# 
# add_file "contrib/marketing/oe-flyer.pdf"
#  content [b963e650a847d1f3d4d567e056167985a51efc0d]
# 
# add_file "contrib/marketing/oe-poster.pdf"
#  content [68a7e59df4fe6e80f6ee801fac05b9add2157de5]
# 
# add_file "packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb"
#  content [4acf01cc481b727325c6077882c195b4f1572001]
# 
# add_file "packages/gcc/gcc-cross_csl-arm-2007q3.bb"
#  content [f7fca6eee83b5ebe3eca940d8e1b1046d6de5ff0]
# 
# add_file "packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch"
#  content [ae26bd559a50cddae7e3e2732e8821389464d64b]
# 
# add_file "packages/gcc/gcc-csl-arm-2007q3.inc"
#  content [01e125daae24e6a2f2f71eb12b6d2232b0ada01a]
# 
# add_file "packages/gcc/gcc_csl-arm-2007q3.bb"
#  content [d2ba66d1d65f6be2dc6ddf47d238afe57eb05f4f]
# 
# add_file "packages/wwwoffle/files/wwwoffle.if-down"
#  content [e4aa7cb1319be94b2bda9198bd0a2d8c7fbdf8b9]
# 
# add_file "packages/wwwoffle/files/wwwoffle.if-up"
#  content [df3f0c05b29192684fce6d5734a28ca7c6681c66]
# 
# add_file "packages/wwwoffle/files/wwwoffle.init"
#  content [3648bf9fdc09412336b5bf1671b1d16da01d54e9]
# 
# add_file "packages/wwwoffle/wwwoffle_2.9c.bb"
#  content [d9fd9a242f353e3916f1d36829b96f70732c14df]
# 
# patch "classes/image.bbclass"
#  from [e1da20bc3a6143fb41abbfe3d0a7070416bdde17]
#    to [4ce2b3c777b457b63352a87b70b325fc84e10644]
# 
# patch "classes/oestats-client.bbclass"
#  from [a710c44a7f932fd458136ca8079856a4b2962a61]
#    to [2b82de605ebfcc914f36652cbb9c49dce3cd2442]
# 
# 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]
# 
# patch "packages/linux/linux-rp-2.6.24/defconfig-akita"
#  from [d714658790b6d290f5220e92a762c59d1755f521]
#    to [33d8cc0f8a30277b834a2c1da09fb6ece1d098a5]
# 
# patch "packages/linux/linux-rp-2.6.24/defconfig-bootcdx86"
#  from [ff935bd0c61befdc4d68c43b5c60ef4cb05c4753]
#    to [f9ecd99888aa68cb846f0d56cee5bca5371c9d4b]
# 
# patch "packages/linux/linux-rp-2.6.24/defconfig-c7x0"
#  from [df65683d9a629e20e3adaf2ca96f9b5e7b77710b]
#    to [b45f438b494270a020d8feec2d5110707bde21f1]
# 
# patch "packages/linux/linux-rp-2.6.24/defconfig-hx2000"
#  from [673369cff9f4de86044b4e3e7d0a32f40f7ddb1f]
#    to [957a7113b116599f4ae7309f217801c829f7211b]
# 
# patch "packages/linux/linux-rp-2.6.24/defconfig-poodle"
#  from [19043385a06385c41f9d8be31ee1b42171e5d4e5]
#    to [c66e00f8061a663ee80edff2c737bc0266f3df43]
# 
# patch "packages/linux/linux-rp-2.6.24/defconfig-qemuarm"
#  from [5cc1a20209d9bfde5ad851a89437c08c721815c5]
#    to [e74d23a59f5aad6fe732ed3b3e3b1a0b16d03ebc]
# 
# patch "packages/linux/linux-rp-2.6.24/defconfig-qemux86"
#  from [680641c4ecbfa3499fbdd079095535f629587647]
#    to [3c92e257aaa1496dfd2123064691c6dd459e62b9]
# 
# patch "packages/linux/linux-rp-2.6.24/defconfig-spitz"
#  from [1c089b38d34a93c68659ef90bec902bbbcf436ae]
#    to [58c5d3463be6ec2d735fef9b44f8c1be7c658075]
# 
# patch "packages/linux/linux-rp-2.6.24/defconfig-tosa"
#  from [9309f0f56b45754f03ad35209dcb54e4cfb7df83]
#    to [8f0bf8a513bad928394f2e4ff80b6284302f6685]
# 
# patch "packages/linux/linux-rp-2.6.24/defconfig-zylonite"
#  from [01f7a0f6b6bb0cbdd5daa28ff680349a8d8cddbb]
#    to [d6bbc8912bcc1fc8d6774c5c7211f49f73ebf102]
# 
# patch "packages/php/php_5.2.5.bb"
#  from [3c1f63cc7326dce0a534438bf37d88728f3048ec]
#    to [7b323ec36d0b7855942e82ce9ecbd07e2600a9df]
# 
# 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]
# 
#   set "contrib/marketing/oe-flyer.pdf"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "contrib/marketing/oe-poster.pdf"
#  attr "mtn:manual_merge"
# value "true"
#
============================================================
# contrib/marketing/oe-flyer.pdf is binary
============================================================
# contrib/marketing/oe-poster.pdf is binary
============================================================
--- packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb	4acf01cc481b727325c6077882c195b4f1572001
+++ packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb	4acf01cc481b727325c6077882c195b4f1572001
@@ -0,0 +1,12 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
+
+S = "${WORKDIR}/gcc-4.2"
+
+EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
+
+# Hack till we fix *libc properly
+do_stage_append() {
+	ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
+}
+
============================================================
--- packages/gcc/gcc-cross_csl-arm-2007q3.bb	f7fca6eee83b5ebe3eca940d8e1b1046d6de5ff0
+++ packages/gcc/gcc-cross_csl-arm-2007q3.bb	f7fca6eee83b5ebe3eca940d8e1b1046d6de5ff0
@@ -0,0 +1,26 @@
+PR = "r0"
+
+require gcc-csl-arm-2007q3.inc
+require gcc-cross4.inc
+require gcc-configure-cross.inc
+require gcc-package-cross.inc
+
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
+EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+
+#We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include
+CFLAGS = ""
+CXXFLAGS = ""
+LDFLAGS = ""
+
+# staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain
+do_compile_prepend() {
+	ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/
+	ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/
+	ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ 
+	sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure
+
+}
+
+ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}"
============================================================
--- packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch	ae26bd559a50cddae7e3e2732e8821389464d64b
+++ packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch	ae26bd559a50cddae7e3e2732e8821389464d64b
@@ -0,0 +1,22 @@
+--- /tmp/configure	2008-05-18 12:57:11.378648834 +0200
++++ gcc-4.2/configure	2008-05-18 12:58:38.309478684 +0200
+@@ -3776,7 +3776,7 @@
+     # For an installed makeinfo, we require it to be from texinfo 4.4 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"
+--- /tmp/configure.in	2008-05-18 12:57:32.665314708 +0200
++++ gcc-4.2/configure.in	2008-05-18 12:59:03.000000000 +0200
+@@ -2271,7 +2271,7 @@
+     # For an installed makeinfo, we require it to be from texinfo 4.4 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"
============================================================
--- packages/gcc/gcc-csl-arm-2007q3.inc	01e125daae24e6a2f2f71eb12b6d2232b0ada01a
+++ packages/gcc/gcc-csl-arm-2007q3.inc	01e125daae24e6a2f2f71eb12b6d2232b0ada01a
@@ -0,0 +1,51 @@
+require gcc-common.inc
+
+BINV = "4.2.1"
+PV = "4.2.1+csl-arm-2007q3-53"
+
+FILESPATH = "${FILE_DIRNAME}/gcc-csl-arm-2007q3:${FILE_DIRNAME}/gcc-csl-arm"
+
+SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2007q3-53-arm-none-eabi.src.tar.bz2 \
+           file://gcc-new-makeinfo.patch;patch=1 \
+#           file://100-uclibc-conf.patch;patch=1 \
+#           file://103-uclibc-conf-noupstream.patch;patch=1 \
+#           file://200-uclibc-locale.patch;patch=1 \
+#           file://203-uclibc-locale-no__x.patch;patch=1 \
+#           file://204-uclibc-locale-wchar_fix.patch;patch=1 \
+#           file://205-uclibc-locale-update.patch;patch=1 \
+#           file://300-libstdc++-pic.patch;patch=1 \
+#           file://302-c99-snprintf.patch;patch=1 \
+#           file://303-c99-complex-ugly-hack.patch;patch=1 \
+#           file://304-index_macro.patch;patch=1 \
+#           file://305-libmudflap-susv3-legacy.patch;patch=1 \
+#           file://306-libstdc++-namespace.patch;patch=1 \
+#           file://307-locale_facets.patch;patch=1 \
+#           file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+#           file://602-sdk-libstdc++-includes.patch;patch=1 \
+           file://gcc41-configure.in.patch;patch=1 \
+           file://arm-nolibfloat.patch;patch=1 \
+           file://arm-softfloat.patch;patch=1 \
+           file://zecke-xgcc-cpp.patch;patch=1 \
+#           file://gfortran.patch;patch=1 \
+#           file://fortran-static-linking.patch;patch=1 \
+#           file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
+#           file://gcc-new-makeinfo.patch;patch=1 \
+"
+
+
+S = "${WORKDIR}/gcc-4.2"
+
+do_unpack2() {
+	cd ${WORKDIR}
+	tar -xvjf ./arm-2007q3-53-arm-none-eabi/gcc-2007q3-53.tar.bz2
+}
+
+# Language Overrides
+FORTRAN = ""
+#FORTRAN_linux-gnueabi = ",fortran"
+#JAVA = ",java"
+
+EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+ARM_INSTRUCTION_SET = "arm"
+
+addtask unpack2 after do_unpack before do_patch
============================================================
--- packages/gcc/gcc_csl-arm-2007q3.bb	d2ba66d1d65f6be2dc6ddf47d238afe57eb05f4f
+++ packages/gcc/gcc_csl-arm-2007q3.bb	d2ba66d1d65f6be2dc6ddf47d238afe57eb05f4f
@@ -0,0 +1,5 @@
+PR = "r0"
+
+require gcc-${PV}.inc
+require gcc-configure-target.inc
+require gcc-package-target.inc
============================================================
--- packages/wwwoffle/files/wwwoffle.if-down	e4aa7cb1319be94b2bda9198bd0a2d8c7fbdf8b9
+++ packages/wwwoffle/files/wwwoffle.if-down	e4aa7cb1319be94b2bda9198bd0a2d8c7fbdf8b9
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/bin/wwwoffle -offline &
+exit
============================================================
--- packages/wwwoffle/files/wwwoffle.if-up	df3f0c05b29192684fce6d5734a28ca7c6681c66
+++ packages/wwwoffle/files/wwwoffle.if-up	df3f0c05b29192684fce6d5734a28ca7c6681c66
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# We want to run wwwoffle only for selected interfaces:
+# Maybe better would be checking of the default route.
+case "$IFACE" in
+    wlan*)
+    ;;
+    eth*)
+    ;;
+    usb*)
+    ;;
+    ppp*)
+    ;;
+    *)
+	exit 0
+    ;;
+esac
+
+# wwwoffle caches old network configuration and it may cause resolve failures
+/usr/bin/wwwoffle -kill
+/usr/sbin/wwwoffled >/dev/null 2>&1
+
+/usr/bin/wwwoffle -online
+
+# Don't fetch over ppp*, which is typically expensive dial-up.
+# Comment out, if you want to fetch pre-ordered pages over GPRS, dial-up or so.
+case "$IFACE" in
+    ppp*)
+	exit 0
+    ;;
+esac
+
+# Fetch may take longer time. Run it in background
+( /usr/bin/wwwoffle -fetch ) &
+
+exit
============================================================
--- packages/wwwoffle/files/wwwoffle.init	3648bf9fdc09412336b5bf1671b1d16da01d54e9
+++ packages/wwwoffle/files/wwwoffle.init	3648bf9fdc09412336b5bf1671b1d16da01d54e9
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+case "$1" in
+start)
+  /usr/sbin/wwwoffled
+  ;;
+restart)
+  /usr/bin/wwwoffle -kill
+  /usr/sbin/wwwoffled >/dev/null 2>&1
+  ;;
+reload|force-reload)
+  /usr/bin/wwwoffle -config
+  ;;
+stop)
+  /usr/bin/wwwoffle -kill
+  ;;
+*)
+  echo "Usage: /etc/init.d/wwwoffle {start|stop|restart|reload|force-reload}"
+  exit 1
+esac
+
+exit 0
============================================================
--- packages/wwwoffle/wwwoffle_2.9c.bb	d9fd9a242f353e3916f1d36829b96f70732c14df
+++ packages/wwwoffle/wwwoffle_2.9c.bb	d9fd9a242f353e3916f1d36829b96f70732c14df
@@ -0,0 +1,31 @@
+LICENSE = "GPL"
+SECTION = "console/network"
+PRIORITY = "standard"
+DESCRIPTION = "World Wide Web Offline Explorer"
+DEPENDS = ""
+
+SRC_URI = "http://www.gedanken.demon.co.uk/download-wwwoffle/${PN}-${PV}.tgz \
+	file://wwwoffle.init \
+	file://wwwoffle.if-up \
+	file://wwwoffle.if-down"
+
+INITSCRIPT_NAME = "${PN}"
+
+inherit autotools gettext update-rc.d
+
+EXTRA_OEMAKE = "docdir=${datadir}/doc"
+
+do_configure() {
+	pwd
+	mv aclocal.m4 acinclude.m4
+	autotools_do_configure
+}
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/network/if-up.d
+	install -m 755 ${WORKDIR}/wwwoffle.if-up ${D}/${sysconfdir}/network/if-up.d/wwwoffle
+	install -d ${D}/${sysconfdir}/network/if-down.d
+	install -m 755 ${WORKDIR}/wwwoffle.if-down ${D}/${sysconfdir}/network/if-down.d/wwwoffle
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 755 ${WORKDIR}/wwwoffle.init ${D}/${sysconfdir}/init.d/wwwoffle
+}
============================================================
--- classes/image.bbclass	e1da20bc3a6143fb41abbfe3d0a7070416bdde17
+++ classes/image.bbclass	4ce2b3c777b457b63352a87b70b325fc84e10644
@@ -32,6 +32,8 @@ python () {
     for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split():
         deps += " %s:do_populate_staging" % dep
     bb.data.setVarFlag('do_rootfs', 'depends', deps, d)
+
+    runtime_mapping_rename("PACKAGE_INSTALL", d)
 }
 
 #
@@ -66,6 +68,7 @@ do_rootfs[dirs] = "${TOPDIR}"
 
 do_rootfs[nostamp] = "1"
 do_rootfs[dirs] = "${TOPDIR}"
+do_rootfs[lockfiles] = "${IMAGE_ROOTFS}.lock"
 do_build[nostamp] = "1"
 
 # Must call real_do_rootfs() from inside here, rather than as a separate
============================================================
--- classes/oestats-client.bbclass	a710c44a7f932fd458136ca8079856a4b2962a61
+++ classes/oestats-client.bbclass	2b82de605ebfcc914f36652cbb9c49dce3cd2442
@@ -6,7 +6,7 @@
 #
 # INHERIT += "oestats-client"
 # OESTATS_SERVER = "some.server.org:8000"
-# OESTATS_BUILDER = "some title"
+# OESTATS_BUILDER = "some_nickname"
 
 def oestats_setid(d, val):
 	import bb
@@ -18,32 +18,67 @@ def oestats_getid(d):
 	f = file(bb.data.getVar('TMPDIR', d, True) + '/oestats.id', 'r')
 	return f.read()
 	
-def oestats_send(server, action, vars = {}):
-	import httplib, urllib
+def oestats_send(server, action, vars = {}, files = {}):
+	import httplib
 
-	params = urllib.urlencode(vars)
-	headers = {"Content-type": "application/x-www-form-urlencoded",
-		"Accept": "text/plain"}
+	# 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])
+	for key in files:
+		assert files[key]
+		output.append('--' + bound)
+		output.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, files[key]['filename']))
+		output.append('Content-Type: %s' % files[key]['content-type'])
+		
+		output.append('')
+		output.append(files[key]['content'])
+	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()
-	return response
+	return data
 
 def oestats_start(server, builder, d):
 	import bb
 	import os.path
+	import re
 
 	# se%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r5ffcacd9125004bbcb65a5f2d933272d313bee84 -r9fa69b2f07a5fcb6b383f2f91aac7359f003cf6e
#
#
#
# rename "packages/php/php-native_4.4.4.bb"
#     to "packages/nonworking/php/php-native_4.4.4.bb"
# 
# rename "packages/php/php_4.4.4.bb"
#     to "packages/nonworking/php/php_4.4.4.bb"
# 
# add_dir "packages/nonworking/php"
#






More information about the Openembedded-commits mailing list