diff options
34 files changed, 332 insertions, 78 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass index f8d896d813..35080c19eb 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -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 @@ LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVa 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 diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass index b98177d40a..69c708c151 100644 --- a/classes/oestats-client.bbclass +++ b/classes/oestats-client.bbclass @@ -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 - - params = urllib.urlencode(vars) - headers = {"Content-type": "application/x-www-form-urlencoded", - "Accept": "text/plain"} +def oestats_send(server, action, vars = {}, files = {}): + import httplib + + # 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 # send report - response = oestats_send(server, "/builds/start/", { - 'builder': builder, - 'revision': bb.data.getVar('METADATA_REVISION', d, True), - 'machine': bb.data.getVar('MACHINE', d, True), - 'distro': bb.data.getVar('DISTRO', d, True), - }) - id = response.read() + id = "" + try: + data = oestats_send(server, "/builds/start/", { + 'builder': builder, + 'revision': bb.data.getVar('METADATA_REVISION', d, True), + 'machine': bb.data.getVar('MACHINE', d, True), + 'distro': bb.data.getVar('DISTRO', d, True), + }) + if re.match("^\d+$", data): id=data + except: + pass # save the build id + if id: + bb.note("oestats: build %s" % id) + else: + bb.note("oestats: error starting build, disabling stats") oestats_setid(d, id) def oestats_stop(server, d, status): @@ -51,32 +86,56 @@ def oestats_stop(server, d, status): # retrieve build id id = oestats_getid(d) + 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 + import glob import time # retrieve build id id = oestats_getid(d) + if not id: return + + # calculate build time try: elapsed = time.time() - float(bb.data.getVar('OESTATS_STAMP', d, True)) except: elapsed = 0 - + + # send the log for failures + files = {} + if status == 'Failed': + logs = glob.glob("%s/log.%s.*" % (bb.data.getVar('T', d, True), task)) + if len(logs) > 0: + log = logs[0] + bb.note("oestats: sending log file : %s" % log) + files['log'] = { + 'filename': 'log.txt', + 'content': file(log).read(), + 'content-type': 'text/plain'} + # 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), + }, files) + except: + bb.note("oestats: error sending task, disabling stats") + oestats_setid(d, "") addhandler oestats_eventhandler python oestats_eventhandler () { diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index ef41dec781..17029ec21e 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -85,42 +85,30 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" 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" - -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" - -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" - -# 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" - -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" +ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1" +ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" +ANGSTROM_GCC_VERSION_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" + +#avr32 only has support for gcc 4.2.2 +ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2" + +#Everybody else can just use this: +ANGSTROM_GCC_VERSION ?= "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" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index a9e9f3f7eb..8c76de6f1a 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -24,17 +24,11 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm' 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" diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc index 6c3bdb6ee0..f886366f10 100644 --- a/conf/machine/include/tune-cortexa8.inc +++ b/conf/machine/include/tune-cortexa8.inc @@ -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" diff --git a/contrib/marketing/.mtn2git_empty b/contrib/marketing/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/contrib/marketing/.mtn2git_empty diff --git a/contrib/marketing/oe-flyer.pdf b/contrib/marketing/oe-flyer.pdf Binary files differnew file mode 100644 index 0000000000..d08454f379 --- /dev/null +++ b/contrib/marketing/oe-flyer.pdf diff --git a/contrib/marketing/oe-poster.pdf b/contrib/marketing/oe-poster.pdf Binary files differnew file mode 100644 index 0000000000..158a4811e4 --- /dev/null +++ b/contrib/marketing/oe-poster.pdf diff --git a/packages/dropbear/dropbear/scp-argument-fix.patch b/packages/dropbear/dropbear-0.49/scp-argument-fix.patch index 716a9670fe..716a9670fe 100644 --- a/packages/dropbear/dropbear/scp-argument-fix.patch +++ b/packages/dropbear/dropbear-0.49/scp-argument-fix.patch diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb b/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb new file mode 100644 index 0000000000..99656dbe83 --- /dev/null +++ b/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb @@ -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/ +} + diff --git a/packages/gcc/gcc-cross_csl-arm-2007q3.bb b/packages/gcc/gcc-cross_csl-arm-2007q3.bb new file mode 100644 index 0000000000..4fde67b006 --- /dev/null +++ b/packages/gcc/gcc-cross_csl-arm-2007q3.bb @@ -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}" diff --git a/packages/gcc/gcc-csl-arm-2007q3.inc b/packages/gcc/gcc-csl-arm-2007q3.inc new file mode 100644 index 0000000000..601b4f0110 --- /dev/null +++ b/packages/gcc/gcc-csl-arm-2007q3.inc @@ -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 diff --git a/packages/gcc/gcc-csl-arm-2007q3/.mtn2git_empty b/packages/gcc/gcc-csl-arm-2007q3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gcc/gcc-csl-arm-2007q3/.mtn2git_empty diff --git a/packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch b/packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch new file mode 100644 index 0000000000..b59bd76c85 --- /dev/null +++ b/packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch @@ -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" diff --git a/packages/gcc/gcc_csl-arm-2007q3.bb b/packages/gcc/gcc_csl-arm-2007q3.bb new file mode 100644 index 0000000000..d610713177 --- /dev/null +++ b/packages/gcc/gcc_csl-arm-2007q3.bb @@ -0,0 +1,5 @@ +PR = "r0" + +require gcc-${PV}.inc +require gcc-configure-target.inc +require gcc-package-target.inc diff --git a/packages/linux/linux-rp-2.6.24/defconfig-akita b/packages/linux/linux-rp-2.6.24/defconfig-akita index 5e4560c39d..dae2134101 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-akita +++ b/packages/linux/linux-rp-2.6.24/defconfig-akita @@ -1254,7 +1254,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.24/defconfig-bootcdx86 b/packages/linux/linux-rp-2.6.24/defconfig-bootcdx86 index fda13665cd..d37295b6a4 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-bootcdx86 +++ b/packages/linux/linux-rp-2.6.24/defconfig-bootcdx86 @@ -1612,7 +1612,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.24/defconfig-c7x0 b/packages/linux/linux-rp-2.6.24/defconfig-c7x0 index a47e843a2e..4c4a2fd1d0 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-c7x0 +++ b/packages/linux/linux-rp-2.6.24/defconfig-c7x0 @@ -1259,7 +1259,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.24/defconfig-hx2000 b/packages/linux/linux-rp-2.6.24/defconfig-hx2000 index 41eee3854a..7b08f287c9 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-hx2000 +++ b/packages/linux/linux-rp-2.6.24/defconfig-hx2000 @@ -1249,7 +1249,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.24/defconfig-poodle b/packages/linux/linux-rp-2.6.24/defconfig-poodle index 841bcf285e..1c3b74e430 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-poodle +++ b/packages/linux/linux-rp-2.6.24/defconfig-poodle @@ -1265,7 +1265,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.24/defconfig-qemuarm b/packages/linux/linux-rp-2.6.24/defconfig-qemuarm index d2b8265214..7d984d8523 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-qemuarm +++ b/packages/linux/linux-rp-2.6.24/defconfig-qemuarm @@ -1155,7 +1155,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.24/defconfig-qemux86 b/packages/linux/linux-rp-2.6.24/defconfig-qemux86 index b91171b1f2..3242d622d0 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-qemux86 +++ b/packages/linux/linux-rp-2.6.24/defconfig-qemux86 @@ -1657,7 +1657,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.24/defconfig-spitz b/packages/linux/linux-rp-2.6.24/defconfig-spitz index 0322da0ec1..5ba46fe260 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-spitz +++ b/packages/linux/linux-rp-2.6.24/defconfig-spitz @@ -1255,7 +1255,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.24/defconfig-tosa b/packages/linux/linux-rp-2.6.24/defconfig-tosa index 34f0cc1210..1a120196f2 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-tosa +++ b/packages/linux/linux-rp-2.6.24/defconfig-tosa @@ -1274,7 +1274,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.24/defconfig-zylonite b/packages/linux/linux-rp-2.6.24/defconfig-zylonite index 0cf0b23db5..d75619ce0e 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-zylonite +++ b/packages/linux/linux-rp-2.6.24/defconfig-zylonite @@ -1257,7 +1257,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/php/php_5.2.5.bb b/packages/php/php_5.2.5.bb index 890d467c10..a8dc83a444 100644 --- a/packages/php/php_5.2.5.bb +++ b/packages/php/php_5.2.5.bb @@ -1,6 +1,6 @@ require php.inc -PR = "r2" +PR = "r3" SRC_URI += "file://pear-makefile.patch;patch=1 " @@ -19,7 +19,7 @@ EXTRA_OECONF = " --without-iconv \ --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \ " -EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR}" +EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR_CROSS}" export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" export PHP_NATIVE_DIR="${STAGING_BINDIR_NATIVE}" diff --git a/packages/python/python-setuptools-native_0.6c6.bb b/packages/python/python-setuptools-native_0.6c6.bb index 1b9f90911d..b7716d8cac 100644 --- a/packages/python/python-setuptools-native_0.6c6.bb +++ b/packages/python/python-setuptools-native_0.6c6.bb @@ -1,4 +1,5 @@ require python-setuptools_${PV}.bb +inherit native DEPENDS = "python-native" diff --git a/packages/python/python-setuptools_0.6c6.bb b/packages/python/python-setuptools_0.6c6.bb index 721b29961e..fe78e585f7 100644 --- a/packages/python/python-setuptools_0.6c6.bb +++ b/packages/python/python-setuptools_0.6c6.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" 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}" diff --git a/packages/wwwoffle/.mtn2git_empty b/packages/wwwoffle/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wwwoffle/.mtn2git_empty diff --git a/packages/wwwoffle/files/.mtn2git_empty b/packages/wwwoffle/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wwwoffle/files/.mtn2git_empty diff --git a/packages/wwwoffle/files/wwwoffle.if-down b/packages/wwwoffle/files/wwwoffle.if-down new file mode 100644 index 0000000000..71721c38d5 --- /dev/null +++ b/packages/wwwoffle/files/wwwoffle.if-down @@ -0,0 +1,4 @@ +#!/bin/sh + +/usr/bin/wwwoffle -offline & +exit diff --git a/packages/wwwoffle/files/wwwoffle.if-up b/packages/wwwoffle/files/wwwoffle.if-up new file mode 100644 index 0000000000..43167a9e9c --- /dev/null +++ b/packages/wwwoffle/files/wwwoffle.if-up @@ -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 diff --git a/packages/wwwoffle/files/wwwoffle.init b/packages/wwwoffle/files/wwwoffle.init new file mode 100644 index 0000000000..7eac239a3e --- /dev/null +++ b/packages/wwwoffle/files/wwwoffle.init @@ -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 diff --git a/packages/wwwoffle/wwwoffle_2.9c.bb b/packages/wwwoffle/wwwoffle_2.9c.bb new file mode 100644 index 0000000000..c280e7c8a9 --- /dev/null +++ b/packages/wwwoffle/wwwoffle_2.9c.bb @@ -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 +} |