diff options
71 files changed, 1035 insertions, 330 deletions
diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index 8af10a0c8a..18aee09a26 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -13,13 +13,15 @@ distutils_do_compile() { } distutils_stage_headers() { + install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ oefatal "python setup.py install_headers execution failed." } distutils_stage_all() { - install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages + install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages + # is this missing a lib below? PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ @@ -49,7 +51,7 @@ distutils_do_install() { done fi - rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth + rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth } EXPORT_FUNCTIONS do_compile do_install diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 0e4285f633..4e187a6887 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -30,14 +30,14 @@ DISTRO_TYPE ?= "debug" IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' # These will be put under package management soon -FEED_URIS += " \ - no-arch##${ANGSTROM_URI}/unstable/feed/all \ - base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \ - perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \ - python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \ - debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \ - gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ - ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" +#FEED_URIS += " \ +# no-arch##${ANGSTROM_URI}/unstable/feed/all \ +# base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \ +# perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \ +# python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \ +# debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \ +# gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ +# ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" # base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \ # ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates" @@ -237,7 +237,7 @@ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ - ipkg ipkg-collateral \ + ipkg ipkg-collateral angstrom-feed-configs \ util-linux-mount util-linux-umount \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 85c0d9d128..510a752211 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -35,6 +35,9 @@ require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc PREFERRED_PROVIDER_qemu-native = "qemu-native" ENABLE_BINARY_LOCALE_GENERATION ?= "1" +# We only want to build UTF8 locales +LOCALE_UTF8_ONLY = "1" + #qemu doesn't like armv6/eabi/vfp ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0" ENABLE_BINARY_LOCALE_GENERATION_nokia800 = "0" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index ccd458da89..4d9509fc15 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20070819" +EFL_SRCDATE = "20071206" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -89,6 +89,7 @@ SRCDATE_python-evas ?= "${EFL_SRCDATE}" SRCDATE_python-ecore ?= "${EFL_SRCDATE}" SRCDATE_python-edje ?= "${EFL_SRCDATE}" SRCDATE_python-emotion ?= "${EFL_SRCDATE}" +SRCDATE_python-epsilon ?= "${EFL_SRCDATE}" SRCDATE_python-ewl ?= "${EFL_SRCDATE}" SRCDATE_python-etk ?= "${EFL_SRCDATE}" @@ -102,8 +103,11 @@ SRCDATE_exhibit ?= "${EFL_SRCDATE}" SRCDATE_expedite ?= "${EFL_SRCDATE}" SRCDATE_elitaire ?= "${EFL_SRCDATE}" SRCDATE_entice ?= "${EFL_SRCDATE}" +SRCDATE_entrance ?= "${EFL_SRCDATE}" SRCDATE_e-utils ?= "${EFL_SRCDATE}" +SRCDATE_e-wm ?= "${EFL_SRCDATE}" SRCDATE_enna ?= "${EFL_SRCDATE}" +SRCDATE_exquisite ?= "${EFL_SRCDATE}" # Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh new file mode 100755 index 0000000000..7ba5f8bf3b --- /dev/null +++ b/contrib/angstrom/build-release.sh @@ -0,0 +1,82 @@ +#!/bin/bash + +DO_UCLIBC=0 + +do_build() { + echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf + + BUILD_MODE="glibc" + if [ "$BUILD_CLEAN" != "" ] + then + bitbake -c clean $BUILD_CLEAN + fi + + for target in $BUILD_TARGETS + do + bitbake $target && do_report_success + done + + if [ $DO_UCLIBC = 1 ] + then + BUILD_MODE="uclibc" + echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf + for target in $BUILD_TARGETS + do + bitbake $target && do_report_success + done + fi +} + +do_report_success() { + + echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder.log +} + +# No graphics +for machine in ep93xx gumstix-connex efika omap5912osk +do + BUILD_MACHINE=$machine + BUILD_TARGETS="minimal-image console-image" + do_build +done + +for machine in ixp4xxle ixp4xxbe +do + BUILD_MACHINE=$machine + BUILD_TARGETS="nslu2-minimal-image" + do_build +done + +# build altboot images for zaurus +for machine in c7x0 poodle tosa akita spitz collie +do + BUILD_MACHINE=$machine + BUILD_TARGETS="altboot-console-image" + do_build +done + +# graphics, flash storage +for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h4000 poodle tosa hx4700 c7x0 spitz akita collie +do + BUILD_MACHINE=$machine + BUILD_TARGETS="minimal-image console-image x11-image" + do_build +done + +# graphics, disk storage +for machine in spitz +do + BUILD_MACHINE=$machine + BUILD_TARGETS="x11-gpe-image x11-pimlico-image x11-office-image" + BUILD_CLEAN="qmake2-native" + do_build +done + +#phones +for machine in fic-gta01 a780 +do + BUILD_MACHINE=$machine + BUILD_TARGETS="openmoko-image" + BUILD_CLEAN="qmake2-native" + do_build +done diff --git a/contrib/angstrom/rss.php b/contrib/angstrom/rss.php new file mode 100644 index 0000000000..cf5a9e0218 --- /dev/null +++ b/contrib/angstrom/rss.php @@ -0,0 +1,48 @@ +<?php echo ('<?xml version="1.0" encoding="utf-8"?>'); ?> +<rss version="2.0" xml:base="http://www.angstrom-distribution.org/unstable/autobuild/" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <channel> + <title>Ångström autobuilder updates</title> + <link>http://www.angstrom-distribution.org/unstable/autobuild/</link> + <description></description> + <language>en</language> +<?php + +$base_path = "/home/angstrom/website/unstable/autobuild"; + +if ($handle = opendir("$base_path")) +{ + while (false !== ($file = readdir($handle))) + { + if(!(is_dir($file) && $file != "." && $file != "..")) + { + continue; + } + + $second_handle = opendir("$base_path/$file/"); + + while (false !== ($file2 = readdir($second_handle))) + { + if(is_file("/$base_path/$file/$file2")) + { + $fmtime = filemtime("$file/$file2"); + + echo "<item>\n" + echo "<title>$file/$file2 uploaded</title>\n"; + echo " <link>http://www.angstrom-distribution.org/unstable/autobuild/$file/$file2</link>\n"; + + $rsstime = strftime("%a, %d %b %Y %T +0100", $fmtime); + + echo "<pubDate>$rsstime</pubDate>\n"; + echo "<dc:creator>Angstrom autobuilder</dc:creator>"; + echo "</item>\n"; + } + } + + closedir($second_handle); + } + + closedir($handle); +} +?> + </channel> +</rss> diff --git a/contrib/angstrom/rss2.php b/contrib/angstrom/rss2.php new file mode 100644 index 0000000000..995c344e14 --- /dev/null +++ b/contrib/angstrom/rss2.php @@ -0,0 +1,63 @@ +<?php + +/* + * This generator expect only log from autobuilder in simple format: + * TIME_OF_BUILD BUILD_TARGET BUILD_MODE MACHINE + * + * where TIME_OF_BUILD is epoch + * + * All what it does is parsing log and output it in reverse order (new builds + * first) in RSS 2.0 format. + * + * (C) 2007 Marcin Juszkiewicz + * + * License: MIT + * + */ + +$build_link_base = 'http://www.angstrom-distribution.org/unstable/autobuild/'; + +$builder_log_date = file('autobuilder.log'); + +if(empty($builder_log_date)) + die("No logs\n"); + +$builder_log_date = array_reverse($builder_log_date); + +$rss_xml = new xmlWriter(); + +if(!$rss_xml) + die("Unable to create XML Writer\n"); + +$rss_xml->openMemory(); + +$rss_xml->startDocument('1.0','utf-8'); +$rss_xml->startElement('rss'); +$rss_xml->writeAttribute('version', '2.0'); + +$rss_xml->startElement('channel'); + +$rss_xml->writeElement('title', 'Ångström autobuilder updates'); +$rss_xml->writeElement('link', $build_link_base); +$rss_xml->writeElement('description', 'Ångström autobuilder updates list'); + +foreach($builder_log_date as $build) +{ + $build = str_replace("\n", "", $build); + $data = explode(' ', $build); + + $rss_xml->startElement('item'); + $rss_xml->writeElement('title', "{$data[1]} ({$data[2]}) built for {$data[3]}"); + $rss_xml->writeElement('link', "{$build_link_base}{$data[3]}/"); + $rss_xml->writeElement('pubDate', date('r', $data[0])); + + $rss_xml->endElement(); +} + +$rss_xml->endElement(); +$rss_xml->endElement(); + +echo $rss_xml->outputMemory(true); + +echo "\n"; +?> diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 1317f23b4a..d4b7ea16f6 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -2,7 +2,8 @@ # generate Python Manifest for the OpenEmbedded build system # (C) 2002-2007 Michael 'Mickey' Lauer <mlauer@vanille-media.de> -# MIT license +# (C) 2007 Jeremy Laine +# licensed under MIT, see COPYING.MIT import os import sys @@ -10,10 +11,10 @@ import time VERSION = "2.5.1" # increase when touching python-core, this should be the same ml version as in python_2.5.1.bb -BASEREV = 2 +BASEREV = 3 __author__ = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -__version__ = "20070823" +__version__ = "20071205" class MakefileMaker: @@ -194,7 +195,10 @@ if __name__ == "__main__": "lib-dynload/_csv.so csv.* optparse.* textwrap.*" ) m.addPackage( 0, "python-curses", "Python Curses Support", "python-core", - "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # package + "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # directory + low level module + + m.addPackage( 0, "python-ctypes", "Python C Types Support", "python-core", + "ctypes lib-dynload/_ctypes.so" ) # directory + low level module m.addPackage( 0, "python-datetime", "Python Calendar and Time support", "python-core python-codecs", "_strptime.* calendar.* lib-dynload/datetime.so" ) diff --git a/packages/e17/expedite/.mtn2git_empty b/packages/e17/expedite/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/e17/expedite/.mtn2git_empty diff --git a/packages/e17/expedite/hack-disable-opengl.patch b/packages/e17/expedite/hack-disable-opengl.patch new file mode 100644 index 0000000000..7d368d320d --- /dev/null +++ b/packages/e17/expedite/hack-disable-opengl.patch @@ -0,0 +1,87 @@ +Index: expedite/configure.in +=================================================================== +--- expedite.orig/configure.in ++++ expedite/configure.in +@@ -47,24 +47,11 @@ + PKG_CHECK_MODULES([EVAS], evas) + + dnl OpenGL GLEW +-PKG_CHECK_EXISTS(evas-opengl-glew, +- [ +- AC_DEFINE(HAVE_EVAS_OPENGL_GLEW, 1, [Evas GL Glew Engine Support]) +- have_opengl_glew="yes" +- glew_libs="-lglew32 -lgdi32" +- ], +- [ have_opengl_glew="no" ] +-) ++have_opengl_glew="no" + AM_CONDITIONAL(BUILD_OPENGL_GLEW, test "x$have_opengl_glew" = "xyes") + + dnl OpenGL X11 +-PKG_CHECK_EXISTS(evas-opengl-x11, +- [ +- AC_DEFINE(HAVE_EVAS_OPENGL_X11, 1, [Evas GL X11 Engine Support]) +- have_opengl_x11="yes" +- ], +- [ have_opengl_x11="no" ] +-) ++have_opengl_x11="no" + AM_CONDITIONAL(BUILD_OPENGL_X11, test "x$have_opengl_x11" = "xyes") + + dnl Software X11 +@@ -109,49 +96,23 @@ + + # TODO: Check availability of libs + dnl DirectDraw +-PKG_CHECK_EXISTS(evas-software-ddraw, +- [ +- AC_DEFINE(HAVE_EVAS_SOFTWARE_DDRAW, 1, [Evas Software DirectDraw Engine Support]) +- have_software_ddraw="yes" +- ddraw_libs="-lddraw -ldxguid" +- ], +- [ have_software_ddraw="no" ] +-) ++have_software_ddraw="no" + AM_CONDITIONAL(BUILD_SOFTWARE_DDRAW, test "x$have_software_ddraw" = "xyes") + + # TODO: Check availability of libs + dnl 16bit DirectDraw +-PKG_CHECK_EXISTS(evas-software-16-ddraw, +- [ +- AC_DEFINE(HAVE_EVAS_SOFTWARE_16_DDRAW, 1, [Evas Software 16bit DirectDraw Engine Support]) +- have_software_16_ddraw="yes" +- ddraw_libs="-lddraw -ldxguid" +- ], +- [ have_software_16_ddraw="no" ] +-) ++have_software_16_ddraw="no" + AM_CONDITIONAL(BUILD_SOFTWARE_16_DDRAW, test "x$have_software_16_ddraw" = "xyes") + + # TODO: Check availability of libs + dnl Direct3D +-PKG_CHECK_EXISTS(evas-direct3d, +- [ +- AC_DEFINE(HAVE_EVAS_DIRECT3D, 1, [Evas Direct3D Engine Support]) +- have_direct3d="yes" +- d3d_libs="-ld3d9 -ld3dx9d" +- ], +- [ have_direct3d="no" ] +-) ++have_direct3d="no" + AM_CONDITIONAL(BUILD_DIRECT3D, test "x$have_direct3d" = "xyes") + + dnl Software SDL +-PKG_CHECK_EXISTS(evas-software-sdl, +- [ +- AC_DEFINE(HAVE_EVAS_SOFTWARE_SDL, 1, [Evas Software SDL Engine Support]) +- have_software_sdl="yes" +- ], +- [ have_direct3d="no" ] +-) +-AM_CONDITIONAL(BUILD_SOFTWARE_SDL, test "x$have_software_sdl" = "xyes") ++have_software_sdl="no" ++AM_CONDITIONAL(BUILD_SOFTWARE_SDL, test "x$have_software_sdl" = "xyes") ++ + + if test "x$have_software_x11" = "xyes" -o "x$have_software_16_x11" = "xyes" -o "x$have_xrender_x11" = "xyes" -o "x$have_opengl_x11" = "xyes"; then + AC_PATH_XTRA diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb index 9d8a7d6070..a35d3b182e 100644 --- a/packages/e17/expedite_cvs.bb +++ b/packages/e17/expedite_cvs.bb @@ -1,15 +1,18 @@ -DESCRIPTION = "Expedite is a comprehensive benchmarking suite for evas" -DEPENDS = "evas" +DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas" +DEPENDS = "eet evas" LICENSE = "MIT" PV = "0.0.0+cvs${SRCDATE}" -PR = "r0" +PR = "r1" -inherit e +inherit autotools -SRC_URI = "${E_CVS};module=e17/apps/expedite" +SRC_URI = "${E_CVS};module=e17/apps/expedite \ + file://hack-disable-opengl.patch;patch=1" S = "${WORKDIR}/${PN}" do_configure_append() { find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g |