From e38a45e8895fcd771dcb4c674e728ee3147b6495 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Dec 2007 12:59:34 +0000 Subject: mipv6: add untested version 2.0.2, this is suppossed to work with kernel 2.6 --- packages/mipl-mipv6/mipv6_2.0.2.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/mipl-mipv6/mipv6_2.0.2.bb diff --git a/packages/mipl-mipv6/mipv6_2.0.2.bb b/packages/mipl-mipv6/mipv6_2.0.2.bb new file mode 100644 index 0000000000..8bbcb4cb75 --- /dev/null +++ b/packages/mipl-mipv6/mipv6_2.0.2.bb @@ -0,0 +1,22 @@ +LICENSE = "GPL" +DEPENDS = "virtual/kernel" +RRECOMMENDS = "kernel-module-mip6 kernel-module-ipv6" + +SRC_URI = "http://www.mobile-ipv6.org/software/download/mipv6-${PV}.tar.gz" + +inherit autotools module-base + +CFLAGS =+ "-I${S}/include -I${STAGING_KERNEL_DIR}/include" + +do_compile() { + oe_runmake CFLAGS="${CFLAGS}" +} + +do_install() { + install -d ${D}${sbindir} + install -d ${D}${sysconfdir}/init.d + oe_runmake sbindir="${D}${sbindir}" initdir="${D}${sysconfdir}/init.d" mandir="${D}${mandir}" docdir="${D}${docdir}/mobile-ip6" NETWORK_MIP6_CONF="${D}${sysconfdir}" install +} + +PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" + -- cgit v1.2.3 From 4627823d89a8fe45436f230958a1c4adab092385 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Dec 2007 12:59:16 +0000 Subject: console-mipv6-image: add skeleton image for ipv6 mobility folks --- packages/images/console-mipv6-image.bb | 7 +++++++ packages/tasks/task-mipl.bb | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 packages/images/console-mipv6-image.bb create mode 100644 packages/tasks/task-mipl.bb diff --git a/packages/images/console-mipv6-image.bb b/packages/images/console-mipv6-image.bb new file mode 100644 index 0000000000..3c9995cf2e --- /dev/null +++ b/packages/images/console-mipv6-image.bb @@ -0,0 +1,7 @@ +# This image is for testing the ipv6 mobility extensions + +require console-image.bb +IMAGE_INSTALL += " task-mipl " + +export IMAGE_BASENAME = "console-mobile-ipv6-image" + diff --git a/packages/tasks/task-mipl.bb b/packages/tasks/task-mipl.bb new file mode 100644 index 0000000000..9e2dce52f1 --- /dev/null +++ b/packages/tasks/task-mipl.bb @@ -0,0 +1,16 @@ +# Tasks for IPv6 Mobility extensions, needs: +# CONFIG_IPV6_MIP6=y +# CONFIG_IPV6=y +# in the kernel .config + +DESCRIPTION = "Mobile ipv6 extensions" + +inherit task + +PACKAGE_ARCH = "all" + +RDEPENDS = "mipv6" +RRECOMMENDS = "kernel-module-ipv6 \ + kernel-module-mip6 \ + " + -- cgit v1.2.3 From 274ec3245555143dc86abac88d6a4fab47e809f7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Dec 2007 13:19:56 +0000 Subject: build-release.sh: script that tells the angstrom autobuilder what to build --- contrib/angstrom/build-release.sh | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100755 contrib/angstrom/build-release.sh diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh new file mode 100755 index 0000000000..7f594298b9 --- /dev/null +++ b/contrib/angstrom/build-release.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +# No graphics +for i in ep93xx ixp4xxle ixp4xxbe gumstix-connex efika + do + echo "MACHINE = \"$i\"" > conf/auto.conf + bitbake minimal-image ; bitbake console-image + done + +for i in ixp4xxle ixp4xxbe + do + echo "MACHINE = \"$i\"" > conf/auto.conf + bitbake nslu2-minimal-image + done + +# build altboot images for zaurus +for i in c7x0 poodle tosa akita spitz collie + do + echo "MACHINE = \"$i\"" > conf/auto.conf + bitbake altboot-console-image +# echo ANGSTROM_MODE = \"uclibc\" >> conf/auto.conf +# bitbake altboot-console-image + done + +# graphics, flash storage +for i in fic-gta01 a780 at91sam9263ek qemuarm h2200 h4000 omap5912osk poodle tosa hx4700 c7x0 spitz akita collie + do + echo "MACHINE = \"$i\"" > conf/auto.conf + bitbake minimal-image ; bitbake console-image ; bitbake x11-image + done + +# graphics, disk storage +for i in spitz + do + echo "MACHINE = \"$i\"" > conf/auto.conf + bitbake -c clean qmake2-native ; bitbake x11-gpe-image ; bitbake x11-pimlico-image ; bitbake x11-office-image +# echo ANGSTROM_MODE = \"uclibc\" >> conf/auto.conf +# bitbake x11-gpe-mage ; bitbake x11-pimlico-image ; bitbake x11-office-image + done + + +#phones +for i in fic-gta01 a780 + do + echo "MACHINE = \"$i\"" > conf/auto.conf + bitbake -c clean qmake2-native ;bitbake openmoko-image +# echo ANGSTROM_MODE = \"uclibc\" >> conf/auto.conf +# bitbake openmoko-image + done + -- cgit v1.2.3 From 6961358346a4b50b6e3a982270943e239286357b Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Tue, 4 Dec 2007 15:19:01 +0000 Subject: uicmoc4-native: Drop non-compiling 4.2.3 and 4.3.0 (closes bug 2511). --- packages/uicmoc/uicmoc4-native_4.2.3.bb | 43 -------------------------- packages/uicmoc/uicmoc4-native_4.3.0.bb | 53 --------------------------------- 2 files changed, 96 deletions(-) delete mode 100644 packages/uicmoc/uicmoc4-native_4.2.3.bb delete mode 100644 packages/uicmoc/uicmoc4-native_4.3.0.bb diff --git a/packages/uicmoc/uicmoc4-native_4.2.3.bb b/packages/uicmoc/uicmoc4-native_4.2.3.bb deleted file mode 100644 index 27b5b5bb31..0000000000 --- a/packages/uicmoc/uicmoc4-native_4.2.3.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x" -DEPENDS = "libx11-native libxext-native" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL QPL" -PR = "r1" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz" - -S = "${WORKDIR}/qt-x11-opensource-src-${PV}" - -inherit native - -EXTRA_OECONF = "-qt-libjpeg -qt-gif -system-zlib \ - -no-nis -no-cups -no-exceptions \ - -no-accessibility -no-libjpeg \ - -no-nas-sound -no-sm \ - -no-xshape -no-xinerama \ - -no-xcursor -no-xrandr \ - -no-xrender -no-fontconfig \ - -no-tablet -no-xkb \ - -no-libpng \ - -verbose -release -fast -static " -EXTRA_OEMAKE = " " - -do_configure() { - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -} - -do_compile() { - unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS - cd ${S}/src/tools/moc && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/corelib && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/xml && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/uic && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/rcc && oe_runmake CC="${CC}" CXX="${CXX}" -} - -do_stage() { - install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 - install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 - install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 -} diff --git a/packages/uicmoc/uicmoc4-native_4.3.0.bb b/packages/uicmoc/uicmoc4-native_4.3.0.bb deleted file mode 100644 index bc5aba4102..0000000000 --- a/packages/uicmoc/uicmoc4-native_4.3.0.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x" -DEPENDS = "libx11-native libxext-native zlib-native" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL QPL" -PR = "r3" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz" - -S = "${WORKDIR}/qt-x11-opensource-src-${PV}" - -inherit native - -EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \ - -qt-libjpeg -qt-gif -system-zlib \ - -no-nis -no-cups -no-exceptions \ - -no-accessibility -no-libjpeg \ - -no-nas-sound -no-sm \ - -no-xshape -no-xinerama \ - -no-xcursor -no-xrandr \ - -no-xrender -no-fontconfig \ - -no-tablet -no-xkb \ - -no-libpng \ - -verbose -release -fast -static \ - -qt3support " -EXTRA_OEMAKE = " " - -do_configure() { - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -} - -do_compile() { - unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS - cd ${S}/src/tools/moc && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/corelib && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/sql && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/qt3support && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/xml && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/uic && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/rcc && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/network && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/gui && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/uic3 && oe_runmake CC="${CC}" CXX="${CXX}" -} - -do_stage() { - install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 - install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 - install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 - install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 - install -d ${STAGING_DIR_NATIVE}/qt4/ - install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/ -} -- cgit v1.2.3 From 0e1b13178e3e34ea10411740556dd67c81681b43 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Dec 2007 16:11:28 +0000 Subject: add sword 1.5.10 --- packages/sword/sword_1.5.10.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 packages/sword/sword_1.5.10.bb diff --git a/packages/sword/sword_1.5.10.bb b/packages/sword/sword_1.5.10.bb new file mode 100644 index 0000000000..151bba366d --- /dev/null +++ b/packages/sword/sword_1.5.10.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "The SWORD Project is an open source, cross-platform \ +(Linux, Windows, Solaris, MacOSX etc.) API and library for \ +Bible software with a constantly growing list of front-ends \ +(GUI, textmode, web-based, etc.) and a library of over 200 text modules" +SECTION = "libs" +HOMEPAGE = "http://www.e-sword.net/" +PRIORITY = "optional" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz" + +inherit autotools pkgconfig lib_package + +EXTRA_OECONF = "--without-clucene --without-curl" + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From b573e7d721a912da9aeffe0c3f4a5eef247902a0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Dec 2007 16:12:15 +0000 Subject: add python-sword 1.5.10, remove older versions that no longer build. closes #2790 --- packages/python/python-sword_1.5.10.bb | 32 ++++++++++++++++++++++++++++++++ packages/python/python-sword_1.5.8.bb | 30 ------------------------------ packages/python/python-sword_1.5.9.bb | 32 -------------------------------- 3 files changed, 32 insertions(+), 62 deletions(-) create mode 100644 packages/python/python-sword_1.5.10.bb delete mode 100644 packages/python/python-sword_1.5.8.bb delete mode 100644 packages/python/python-sword_1.5.9.bb diff --git a/packages/python/python-sword_1.5.10.bb b/packages/python/python-sword_1.5.10.bb new file mode 100644 index 0000000000..a18cf89466 --- /dev/null +++ b/packages/python/python-sword_1.5.10.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Python bindings for the sword library" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "python-core sword" +DEPENDS = "sword-${PV} swig-native" +SRCNAME = "sword" +PR = "r0" + +SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz" + +S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package" + +EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}" + +inherit distutils autotools + +PARALLEL_MAKE = "" + +do_configure_prepend() { + touch ltmain.sh + ./autogen.sh +} + +do_compile() { + oe_runmake BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} pythonswig python_make +} + +do_install() { + cd ${S}/python + distutils_do_install +} diff --git a/packages/python/python-sword_1.5.8.bb b/packages/python/python-sword_1.5.8.bb deleted file mode 100644 index b8e319c693..0000000000 --- a/packages/python/python-sword_1.5.8.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Python bindings for the sword library" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -RDEPENDS = "python-core sword" -DEPENDS = "sword-${PV} swig-native" -SRCNAME = "sword" -PR = "r0" - -SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package" - -EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}" - -inherit distutils autotools - -PARALLEL_MAKE = "" - -do_configure_prepend() { - ./autogen.sh -} - -do_compile() { - oe_runmake BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} pythonswig python_make -} - -do_install() { - cd ${S}/python - distutils_do_install -} diff --git a/packages/python/python-sword_1.5.9.bb b/packages/python/python-sword_1.5.9.bb deleted file mode 100644 index a18cf89466..0000000000 --- a/packages/python/python-sword_1.5.9.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Python bindings for the sword library" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -RDEPENDS = "python-core sword" -DEPENDS = "sword-${PV} swig-native" -SRCNAME = "sword" -PR = "r0" - -SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz" - -S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package" - -EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}" - -inherit distutils autotools - -PARALLEL_MAKE = "" - -do_configure_prepend() { - touch ltmain.sh - ./autogen.sh -} - -do_compile() { - oe_runmake BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} pythonswig python_make -} - -do_install() { - cd ${S}/python - distutils_do_install -} -- cgit v1.2.3 From a36d4624c3e3fae02c9890029d8b2c16c296e4ef Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Dec 2007 18:05:57 +0000 Subject: python-pygtk 2.10.4: fix dependencies and packaging. closes #2905 --- packages/python/python-pygtk_2.10.4.bb | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index 0584d119c9..4471cf515d 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -1,12 +1,12 @@ DESCRIPTION = "Python GTK+ 2.10.x Bindings" SECTION = "devel/python" # needs gtk+ 2.10.x -DEPENDS = "gtk+ libglade python-pycairo python-pygobject" +DEPENDS = "gtk+ libglade" RDEPENDS = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml3" +PR = "ml4" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \ file://fix-gtkunixprint.patch;patch=1 \ @@ -19,16 +19,24 @@ EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" inherit autotools pkgconfig distutils-base do_configure_prepend() { - install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ } -do_configure_prepend() { - install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ +# dirty fix #1: remove dependency on python-pygobject-dev +do_install_append() { + find ${D} -name "*.la"|xargs rm -f + rm -f ${D}/${bindir}/pygtk-codegen-2.0 + rm -rf ${D}/${libdir}/pkgconfig } +# dirty fix #2: fix build system paths leaking in require fix-path.inc -FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*" +# todo: revamp packaging, package demo seperatly +FILES_${PN}-dev += "\ + ${libdir}/pygtk/2.0 \ + ${bindir}/pygtk-* \ + ${datadir}/pygtk/2.0" do_stage() { autotools_stage_includes -- cgit v1.2.3 From 646c0d7855f581c315a7d6e192fa87b43ce8449d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Dec 2007 21:01:11 +0000 Subject: python-pygtk 2.10.4 package demo seperately and fix demo dependencies --- packages/python/python-pygtk_2.10.4.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index 4471cf515d..09cf2d224b 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -6,7 +6,7 @@ RDEPENDS = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml4" +PR = "ml5" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \ file://fix-gtkunixprint.patch;patch=1 \ @@ -32,6 +32,13 @@ do_install_append() { # dirty fix #2: fix build system paths leaking in require fix-path.inc +PACKAGES =+ "${PN}-demo" +FILES_${PN}-demo = "\ + ${bindir}/pygtk-demo \ + ${libdir}/pygtk \ +" +RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-tokenize" + # todo: revamp packaging, package demo seperatly FILES_${PN}-dev += "\ ${libdir}/pygtk/2.0 \ -- cgit v1.2.3 From f7cdb8de941c09f7e541dbcbc942bc3bd0afce4a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Dec 2007 22:48:44 +0000 Subject: task-python-sharprom: catch up with renamings and unavailable packages. closes #3322 --- packages/tasks/task-python-sharprom_20060425.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/tasks/task-python-sharprom_20060425.bb b/packages/tasks/task-python-sharprom_20060425.bb index 25841b357a..5dbd59d18a 100644 --- a/packages/tasks/task-python-sharprom_20060425.bb +++ b/packages/tasks/task-python-sharprom_20060425.bb @@ -20,7 +20,6 @@ RDEPENDS = "\ python-ao \ python-constraint \ python-dialog \ - python-egenix-mx-base \ python-fnorb \ python-fpconst \ python-gnosis \ @@ -28,7 +27,7 @@ RDEPENDS = "\ python-irclib \ python-itools \ python-libgmail \ - python-logilab \ + python-logilab-common \ python-lxml \ python-mad \ python-native \ @@ -53,7 +52,6 @@ RDEPENDS = "\ python-pyweather \ python-pyxml \ python-pyxmlrpc \ - python-quicklauncher \ python-scapy \ python-scons \ python-sip \ @@ -70,6 +68,7 @@ RDEPENDS = "\ twisted \ zope" +#fixme add python-egenix-mx-base if brought in from nonworking #fixme add python-pycap once libdnet is in again #fixme add python-pyx once kpathwhich-native is there #fixme add packages dynamically -- cgit v1.2.3 From f1c378ae3319ba7cd68d76c48536f9f27eb5f003 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Dec 2007 23:43:56 +0000 Subject: pulseaudio 0.9.8 needs dbus now --- packages/pulseaudio/pulseaudio_0.9.8.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/pulseaudio/pulseaudio_0.9.8.bb b/packages/pulseaudio/pulseaudio_0.9.8.bb index 76bf6e8411..0677fc8d59 100644 --- a/packages/pulseaudio/pulseaudio_0.9.8.bb +++ b/packages/pulseaudio/pulseaudio_0.9.8.bb @@ -1,5 +1,7 @@ require pulse.inc +DEPENDS += "dbus" + # this is not correct (see below) SRC_URI += "file://disable-using-glibc-tls.patch;patch=1" -- cgit v1.2.3 From e9298140e0a9ad9202f0c678ad1d0c7ac0201784 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Dec 2007 23:44:18 +0000 Subject: python-pygtk 2.10.4 python-tokenize is included in python-lang --- packages/python/python-pygtk_2.10.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index 09cf2d224b..d53e3d5105 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -37,7 +37,7 @@ FILES_${PN}-demo = "\ ${bindir}/pygtk-demo \ ${libdir}/pygtk \ " -RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-tokenize" +RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-lang" # todo: revamp packaging, package demo seperatly FILES_${PN}-dev += "\ -- cgit v1.2.3 From 8eacfa2b31696d75d60e51e909d64da0999fbf8f Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 4 Dec 2007 23:48:04 +0000 Subject: zaurus-updater: Try to unb0rk the flashing of Akita kernels. Still needs work --- packages/zaurus-updater/zaurus-updater.bb | 2 +- packages/zaurus-updater/zaurus-updater/updater.sh | 82 +++++++++++++---------- 2 files changed, 49 insertions(+), 35 deletions(-) diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index ee4c85e646..cb52c55530 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update" DEPENDS = "encdec-updater-native" LICENSE = "zaurus-updater" -PR = "r13" +PR = "r14" PACKAGES = "" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh index 709cbbc9a9..178fcee8f5 100644 --- a/packages/zaurus-updater/zaurus-updater/updater.sh +++ b/packages/zaurus-updater/zaurus-updater/updater.sh @@ -1,5 +1,4 @@ #!/bin/sh - # # One updater.sh to rule them all # @@ -22,10 +21,14 @@ # # 2007.11.23 Koen Kooi # - consistent error messages -## - fix flashing from case sensitive filesystem (e.g. ext2) +# - fix flashing from case sensitive filesystem (e.g. ext2) +# # 2007.11.23 Matthias 'CoreDump' Hentges # - Always treat MTD_PART_SIZE as HEX when comparing sizes # - Thanks to ZeroChaos for debugging +# +# 2007.12.04 Matthias 'CoreDump' Hentges +# - Unb0rk flashing of Akita kernels DATAPATH=$1 TMPPATH=/tmp/update @@ -190,42 +193,53 @@ do_flashing() /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 fi - #loop - while [ $DATAPOS -lt $DATASIZE ] - do - #data create - bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE - TMPSIZE=`wc -c $TMPDATA` - TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1` - DATAPOS=`expr $DATAPOS + $TMPSIZE` - - #handle data file - if [ $ISLOGICAL = 0 ] - then - next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD 2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1` - if [ "$next_addr" = "" ]; then - echo "Error: flash write" - rm $TMPDATA > /dev/null 2>&1 - RESULT=3 - break; + # Looks like Akita is quite unique when it comes to kernel flashing + + if [ "$ZAURUS" = "akita" ] && [ $FLASH_TYPE = kernel ]; then + echo "Note: Flashing Akita kernel" + echo $TARGETFILE':'$DATASIZE'bytes' + echo ' ' > /tmp/data + /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1 + /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1 + /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1 + echo "Kernel: Finished" + else + #loop + while [ $DATAPOS -lt $DATASIZE ] + do + #data create + bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE + TMPSIZE=`wc -c $TMPDATA` + TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1` + DATAPOS=`expr $DATAPOS + $TMPSIZE` + + #handle data file + if [ $ISLOGICAL = 0 ] + then + next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD 2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1` + if [ "$next_addr" = "" ]; then + echo "Error: flash write" + rm $TMPDATA > /dev/null 2>&1 + RESULT=3 + break; + fi + ADDR=$next_addr + else + /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1 + ADDR=`expr $ADDR + $TMPSIZE` fi - ADDR=$next_addr - else - /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1 - ADDR=`expr $ADDR + $TMPSIZE` - fi - rm $TMPDATA > /dev/null 2>&1 + rm $TMPDATA > /dev/null 2>&1 - #progress - SPNUM=0 - while [ $SPNUM -lt $PROGSTEP ] - do - echo -n '.' - SPNUM=`expr $SPNUM + 1` + #progress + SPNUM=0 + while [ $SPNUM -lt $PROGSTEP ] + do + echo -n '.' + SPNUM=`expr $SPNUM + 1` + done done - done - + fi echo '' #finish -- cgit v1.2.3 From dc54a3030e02d338c5ba84e68aaf604a0bcda65f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Dec 2007 23:56:51 +0000 Subject: pulseaudio 0.9.8 needs patch for corner case when you build with dbus but without HAL --- packages/pulseaudio/files/fix-dbus-without-hal.patch | 15 +++++++++++++++ packages/pulseaudio/pulseaudio_0.9.8.bb | 7 +++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 packages/pulseaudio/files/fix-dbus-without-hal.patch diff --git a/packages/pulseaudio/files/fix-dbus-without-hal.patch b/packages/pulseaudio/files/fix-dbus-without-hal.patch new file mode 100644 index 0000000000..f8ac5674a6 --- /dev/null +++ b/packages/pulseaudio/files/fix-dbus-without-hal.patch @@ -0,0 +1,15 @@ +Index: pulseaudio-0.9.8/src/Makefile.am +=================================================================== +--- pulseaudio-0.9.8.orig/src/Makefile.am ++++ pulseaudio-0.9.8/src/Makefile.am +@@ -1424,8 +1424,8 @@ + # HAL + libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h + libdbus_util_la_LDFLAGS = -avoid-version +-libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la +-libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) ++libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) $(DBUS_LIBS) libpulsecore.la ++libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) $(DBUS_CFLAGS) + + module_hal_detect_la_SOURCES = modules/module-hal-detect.c + module_hal_detect_la_LDFLAGS = -module -avoid-version diff --git a/packages/pulseaudio/pulseaudio_0.9.8.bb b/packages/pulseaudio/pulseaudio_0.9.8.bb index 0677fc8d59..93c8ffb849 100644 --- a/packages/pulseaudio/pulseaudio_0.9.8.bb +++ b/packages/pulseaudio/pulseaudio_0.9.8.bb @@ -3,12 +3,15 @@ require pulse.inc DEPENDS += "dbus" # this is not correct (see below) -SRC_URI += "file://disable-using-glibc-tls.patch;patch=1" +SRC_URI += "\ + file://disable-using-glibc-tls.patch;patch=1 \ + file://fix-dbus-without-hal.patch;patch=1 \ +" PR = "r0" # problems w/ pulseaudio 0.9.8 atm: -# 1.) needs libtool >= 1.5.24 (yes, any older version will NOT work) +# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime) # 2.) doesn't build w/ glibc TLS support (hence patched out) DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 736650b5924b5c1ce37512ae98a836a50acf0d6a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 5 Dec 2007 08:24:16 +0000 Subject: glibc-package.bbclass: merge LOCALE_UTF8_ONLY from poky --- packages/glibc/glibc-package.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 1f14bb83fb..b96aae37b9 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -220,10 +220,13 @@ python package_do_split_gconvs () { dot_re = re.compile("(.*)\.(.*)") # Collate the locales by base and encoding + utf8_only = int(bb.data.getVar('LOCALE_UTF8_ONLY', d, 1) or 0) encodings = {} for l in supported: l = l[:-1] (locale, charset) = l.split(" ") + if utf8_only and charset != 'UTF-8': + continue m = dot_re.match(locale) if m: locale = m.group(1) -- cgit v1.2.3 From 47f7874773e9daa0ed579e907a47c39c8a032baa Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 5 Dec 2007 08:30:13 +0000 Subject: angstrom.inc: only use utf8 locales --- conf/distro/include/angstrom.inc | 3 +++ 1 file changed, 3 insertions(+) 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" -- cgit v1.2.3 From f838f3816120bf7803c386d660a74dcc804eda60 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 5 Dec 2007 09:53:23 +0000 Subject: linux-rp: add default_prefs to get poodle to use 2.6.17 --- packages/linux/linux-rp_2.6.17.bb | 2 ++ packages/linux/linux-rp_2.6.20.bb | 2 ++ packages/linux/linux-rp_2.6.21.bb | 1 + packages/linux/linux-rp_2.6.22.bb | 2 ++ packages/linux/linux-rp_2.6.23.bb | 1 + 5 files changed, 8 insertions(+) diff --git a/packages/linux/linux-rp_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb index 329cd01217..557131e530 100644 --- a/packages/linux/linux-rp_2.6.17.bb +++ b/packages/linux/linux-rp_2.6.17.bb @@ -2,6 +2,8 @@ require linux-rp.inc PR = "r37" +DEFAULT_PREFERENCE_poodle = "99" + # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2 \ diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb index b818b0f3e8..60305488ca 100644 --- a/packages/linux/linux-rp_2.6.20.bb +++ b/packages/linux/linux-rp_2.6.20.bb @@ -2,6 +2,8 @@ require linux-rp.inc PR = "r19" +DEFAULT_PREFERENCE_poodle = "-99" + # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb index 2084930192..d990a77e48 100644 --- a/packages/linux/linux-rp_2.6.21.bb +++ b/packages/linux/linux-rp_2.6.21.bb @@ -2,6 +2,7 @@ require linux-rp.inc PR = "r11" +DEFAULT_PREFERENCE_poodle = "-99" DEFAULT_PREFERENCE_collie = "1" # Handy URLs diff --git a/packages/linux/linux-rp_2.6.22.bb b/packages/linux/linux-rp_2.6.22.bb index 939e630624..57094b3fb7 100644 --- a/packages/linux/linux-rp_2.6.22.bb +++ b/packages/linux/linux-rp_2.6.22.bb @@ -2,6 +2,8 @@ require linux-rp.inc PR = "r10" +DEFAULT_PREFERENCE_poodle = "-99" + # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 diff --git a/packages/linux/linux-rp_2.6.23.bb b/packages/linux/linux-rp_2.6.23.bb index 83077b66b8..3fb304f51f 100644 --- a/packages/linux/linux-rp_2.6.23.bb +++ b/packages/linux/linux-rp_2.6.23.bb @@ -4,6 +4,7 @@ PR = "r9" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" +DEFAULT_PREFERENCE_poodle = "-99" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 -- cgit v1.2.3 From 83b9338edd0ff86800683c609e26ef8d6748c2bb Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 5 Dec 2007 13:02:47 +0000 Subject: =?UTF-8?q?build-release.sh:=20rewritten=20=C3=85ngstr=C3=B6m=20au?= =?UTF-8?q?tobuilder=20script=20-=20one=20function=20for=20building=20-=20?= =?UTF-8?q?uclibc=20is=20switchable=20in=20one=20place=20-=20simple=20func?= =?UTF-8?q?tion=20to=20give=20info=20about=20success=20of=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contrib/angstrom/build-release.sh | 110 ++++++++++++++++++++++++-------------- 1 file changed, 71 insertions(+), 39 deletions(-) diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index 7f594298b9..7ffad9690d 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -1,50 +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 "$target ($BUILD_MODE) built for $machine" >> autobuilder.log +} + # No graphics -for i in ep93xx ixp4xxle ixp4xxbe gumstix-connex efika - do - echo "MACHINE = \"$i\"" > conf/auto.conf - bitbake minimal-image ; bitbake console-image - done - -for i in ixp4xxle ixp4xxbe - do - echo "MACHINE = \"$i\"" > conf/auto.conf - bitbake nslu2-minimal-image - done +for machine in ep93xx ixp4xxle ixp4xxbe gumstix-connex efika +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 i in c7x0 poodle tosa akita spitz collie - do - echo "MACHINE = \"$i\"" > conf/auto.conf - bitbake altboot-console-image -# echo ANGSTROM_MODE = \"uclibc\" >> conf/auto.conf -# bitbake altboot-console-image - done +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 i in fic-gta01 a780 at91sam9263ek qemuarm h2200 h4000 omap5912osk poodle tosa hx4700 c7x0 spitz akita collie - do - echo "MACHINE = \"$i\"" > conf/auto.conf - bitbake minimal-image ; bitbake console-image ; bitbake x11-image - done +for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h4000 omap5912osk 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 i in spitz - do - echo "MACHINE = \"$i\"" > conf/auto.conf - bitbake -c clean qmake2-native ; bitbake x11-gpe-image ; bitbake x11-pimlico-image ; bitbake x11-office-image -# echo ANGSTROM_MODE = \"uclibc\" >> conf/auto.conf -# bitbake x11-gpe-mage ; bitbake x11-pimlico-image ; bitbake x11-office-image - done - +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 i in fic-gta01 a780 - do - echo "MACHINE = \"$i\"" > conf/auto.conf - bitbake -c clean qmake2-native ;bitbake openmoko-image -# echo ANGSTROM_MODE = \"uclibc\" >> conf/auto.conf -# bitbake openmoko-image - done - +for machine in fic-gta01 a780 +do + BUILD_MACHINE=$machine + BUILD_TARGETS="openmoko-image" + BUILD_CLEAN="qmake2-native" + do_build +done -- cgit v1.2.3 From b6d54b3a2341b5495cd24f1cdee826c3bc2cc425 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 5 Dec 2007 13:19:26 +0000 Subject: angstrom/build-release.sh : Remove graphics support from omap5912osk until flashing large image problem solved. --- contrib/angstrom/build-release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index 7ffad9690d..b6085f75dd 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -33,7 +33,7 @@ do_report_success() { } # No graphics -for machine in ep93xx ixp4xxle ixp4xxbe gumstix-connex efika +for machine in ep93xx ixp4xxle ixp4xxbe gumstix-connex efika omap5912osk do BUILD_MACHINE=$machine BUILD_TARGETS="minimal-image console-image" @@ -56,7 +56,7 @@ do done # graphics, flash storage -for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h4000 omap5912osk poodle tosa hx4700 c7x0 spitz akita collie +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" -- cgit v1.2.3 From 85ad8d701fd3606dabd76c7cce2c74f080d0d984 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 5 Dec 2007 13:53:36 +0000 Subject: build-release.sh: remove console-image from ixp4xx builds --- contrib/angstrom/build-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index b6085f75dd..8aec5ebebd 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -33,7 +33,7 @@ do_report_success() { } # No graphics -for machine in ep93xx ixp4xxle ixp4xxbe gumstix-connex efika omap5912osk +for machine in ep93xx gumstix-connex efika omap5912osk do BUILD_MACHINE=$machine BUILD_TARGETS="minimal-image console-image" -- cgit v1.2.3 From 20f081f50569670fdc7088d711ed2bd34b2bb11b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 5 Dec 2007 17:06:14 +0000 Subject: python 2.5.1 enable and package ctypes module/package. closes #3368 -- thanks emdete! --- contrib/python/generate-manifest-2.5.py | 12 +- packages/python/python-2.5-manifest.inc | 123 +++++++++++---------- .../python/python-2.5.1/enable-ctypes-module.patch | 106 ++++++++++++++++++ packages/python/python_2.5.1.bb | 3 +- 4 files changed, 180 insertions(+), 64 deletions(-) create mode 100644 packages/python/python-2.5.1/enable-ctypes-module.patch 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 -# 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 " -__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/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index 85d47c4c0d..b73959513b 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer ] on Thu Nov 15 16:11:01 2007 +### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer ] on Wed Dec 5 18:00:46 2007 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -8,287 +8,292 @@ ######################################################################################################################## -PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " -PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-profile="Python Basic Profiling Support" -PR_python-profile="ml2" +PR_python-profile="ml3" RDEPENDS_python-profile="python-core" FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* " DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml2" +PR_python-threading="ml3" RDEPENDS_python-threading="python-core python-lang" FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* " DESCRIPTION_python-distutils="Python Distribution Utilities" -PR_python-distutils="ml2" +PR_python-distutils="ml3" RDEPENDS_python-distutils="python-core" FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils " DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" -PR_python-textutils="ml2" +PR_python-textutils="ml3" RDEPENDS_python-textutils="python-core python-io python-re python-stringold" FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* " DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml2" +PR_python-codecs="ml3" RDEPENDS_python-codecs="python-core" FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* " +DESCRIPTION_python-ctypes="Python C Types Support" +PR_python-ctypes="ml3" +RDEPENDS_python-ctypes="python-core" +FILES_python-ctypes="${libdir}/python2.5/ctypes ${libdir}/python2.5/lib-dynload/_ctypes.so " + DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml2" +PR_python-pickle="ml3" RDEPENDS_python-pickle="python-core python-codecs python-io python-re" FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so " DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml2" +PR_python-datetime="ml3" RDEPENDS_python-datetime="python-core python-codecs" FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml4" +PR_python-core="ml5" RDEPENDS_python-core="" FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/struct.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/_struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* " DESCRIPTION_python-io="Python Low-Level I/O" -PR_python-io="ml2" +PR_python-io="ml3" RDEPENDS_python-io="python-core python-math" FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* " DESCRIPTION_python-compiler="Python Compiler Support" -PR_python-compiler="ml2" +PR_python-compiler="ml3" RDEPENDS_python-compiler="python-core" FILES_python-compiler="${libdir}/python2.5/compiler " DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml2" +PR_python-compression="ml3" RDEPENDS_python-compression="python-core python-zlib" FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* " DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml2" +PR_python-re="ml3" RDEPENDS_python-re="python-core" FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* " DESCRIPTION_python-xmlrpc="Python XMLRPC Support" -PR_python-xmlrpc="ml2" +PR_python-xmlrpc="ml3" RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* " DESCRIPTION_python-terminal="Python Terminal Controlling Support" -PR_python-terminal="ml2" +PR_python-terminal="ml3" RDEPENDS_python-terminal="python-core python-io" FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* " DESCRIPTION_python-email="Python Email Support" -PR_python-email="ml2" +PR_python-email="ml3" RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" FILES_python-email="${libdir}/python2.5/email " DESCRIPTION_python-image="Python Graphical Image Handling" -PR_python-image="ml2" +PR_python-image="ml3" RDEPENDS_python-image="python-core" FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so " DESCRIPTION_python-core-dbg="Python core module debug information" -PR_python-core-dbg="ml2" +PR_python-core-dbg="ml3" RDEPENDS_python-core-dbg="python-core" FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug " DESCRIPTION_python-resource="Python Resource Control Interface" -PR_python-resource="ml2" +PR_python-resource="ml3" RDEPENDS_python-resource="python-core" FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so " DESCRIPTION_python-devel="Python Development Package" -PR_python-devel="ml2" +PR_python-devel="ml3" RDEPENDS_python-devel="python-core" FILES_python-devel="${includedir} ${libdir}/python2.5/config " DESCRIPTION_python-math="Python Math Support" -PR_python-math="ml2" +PR_python-math="ml3" RDEPENDS_python-math="python-core" FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* " DESCRIPTION_python-hotshot="Python Hotshot Profiler" -PR_python-hotshot="ml2" +PR_python-hotshot="ml3" RDEPENDS_python-hotshot="python-core" FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so " DESCRIPTION_python-unixadmin="Python Unix Administration Support" -PR_python-unixadmin="ml2" +PR_python-unixadmin="ml3" RDEPENDS_python-unixadmin="python-core" FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* " DESCRIPTION_python-syslog="Python's syslog Interface" -PR_python-syslog="ml2" +PR_python-syslog="ml3" RDEPENDS_python-syslog="python-core" FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" -PR_python-tkinter="ml2" +PR_python-tkinter="ml3" RDEPENDS_python-tkinter="python-core" FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk " DESCRIPTION_python-gdbm="Python GNU Database Support" -PR_python-gdbm="ml2" +PR_python-gdbm="ml3" RDEPENDS_python-gdbm="python-core" FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so " DESCRIPTION_python-fcntl="Python's fcntl Interface" -PR_python-fcntl="ml2" +PR_python-fcntl="ml3" RDEPENDS_python-fcntl="python-core" FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml2" +PR_python-netclient="ml3" RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime" FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* " DESCRIPTION_python-pprint="Python Pretty-Print Support" -PR_python-pprint="ml2" +PR_python-pprint="ml3" RDEPENDS_python-pprint="python-core" FILES_python-pprint="${libdir}/python2.5/pprint.* " DESCRIPTION_python-netserver="Python Internet Protocol Servers" -PR_python-netserver="ml2" +PR_python-netserver="ml3" RDEPENDS_python-netserver="python-core python-netclient" FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* " DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml2" +PR_python-curses="ml3" RDEPENDS_python-curses="python-core" FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so " DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" -PR_python-smtpd="ml2" +PR_python-smtpd="ml3" RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime" FILES_python-smtpd="${bindir}/smtpd.* " DESCRIPTION_python-html="Python HTML Processing" -PR_python-html="ml2" +PR_python-html="ml3" RDEPENDS_python-html="python-core" FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* " DESCRIPTION_python-readline="Python Readline Support" -PR_python-readline="ml2" +PR_python-readline="ml3" RDEPENDS_python-readline="python-core" FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* " DESCRIPTION_python-subprocess="Python Subprocess Support" -PR_python-subprocess="ml2" +PR_python-subprocess="ml3" RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" FILES_python-subprocess="${libdir}/python2.5/subprocess.* " DESCRIPTION_python-pydoc="Python Interactive Help Support" -PR_python-pydoc="ml2" +PR_python-pydoc="ml3" RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* " DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml2" +PR_python-logging="ml3" RDEPENDS_python-logging="python-core python-io python-lang python-stringold" FILES_python-logging="${libdir}/python2.5/logging " DESCRIPTION_python-mailbox="Python Mailbox Format Support" -PR_python-mailbox="ml2" +PR_python-mailbox="ml3" RDEPENDS_python-mailbox="python-core python-mime" FILES_python-mailbox="${libdir}/python2.5/mailbox.* " DESCRIPTION_python-xml="Python basic XML support." -PR_python-xml="ml2" +PR_python-xml="ml3" RDEPENDS_python-xml="python-core python-re python-netclient" FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* " DESCRIPTION_python-mime="Python MIME Handling APIs" -PR_python-mime="ml2" +PR_python-mime="ml3" RDEPENDS_python-mime="python-core python-io" FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* " DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support" -PR_python-sqlite3="ml2" +PR_python-sqlite3="ml3" RDEPENDS_python-sqlite3="python-core" FILES_python-sqlite3="${libdir}/python2.5/sqlite3 " DESCRIPTION_python-tests="Python Tests" -PR_python-tests="ml2" +PR_python-tests="ml3" RDEPENDS_python-tests="python-core" FILES_python-tests="${libdir}/python2.5/test " DESCRIPTION_python-unittest="Python Unit Testing Framework" -PR_python-unittest="ml2" +PR_python-unittest="ml3" RDEPENDS_python-unittest="python-core python-stringold python-lang" FILES_python-unittest="${libdir}/python2.5/unittest.* " DESCRIPTION_python-stringold="Python String APIs [deprecated]" -PR_python-stringold="ml2" +PR_python-stringold="ml3" RDEPENDS_python-stringold="python-core python-re" FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* " DESCRIPTION_python-robotparser="Python robots.txt parser" -PR_python-robotparser="ml2" +PR_python-robotparser="ml3" RDEPENDS_python-robotparser="python-core python-netclient" FILES_python-robotparser="${libdir}/python2.5/robotparser.* " DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" -PR_python-lib-old-and-deprecated="ml2" +PR_python-lib-old-and-deprecated="ml3" RDEPENDS_python-lib-old-and-deprecated="python-core" FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old " DESCRIPTION_python-compile="Python Bytecode Compilation Support" -PR_python-compile="ml2" +PR_python-compile="ml3" RDEPENDS_python-compile="python-core" FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* " DESCRIPTION_python-debugger="Python Debugger" -PR_python-debugger="ml2" +PR_python-debugger="ml3" RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml2" +PR_python-shell="ml3" RDEPENDS_python-shell="python-core python-re" FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* " DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" -PR_python-bsddb="ml2" +PR_python-bsddb="ml3" RDEPENDS_python-bsddb="python-core" FILES_python-bsddb="${libdir}/python2.5/bsddb " DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" -PR_python-mmap="ml2" +PR_python-mmap="ml3" RDEPENDS_python-mmap="python-core python-io" FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so " DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml2" +PR_python-zlib="ml3" RDEPENDS_python-zlib="python-core" FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so " DESCRIPTION_python-db="Python File-Based Database Support" -PR_python-db="ml2" +PR_python-db="ml3" RDEPENDS_python-db="python-core" FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* " DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" -PR_python-crypt="ml2" +PR_python-crypt="ml3" RDEPENDS_python-crypt="python-core" FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so " DESCRIPTION_python-idle="Python Integrated Development Environment" -PR_python-idle="ml2" +PR_python-idle="ml3" RDEPENDS_python-idle="python-core python-tkinter" FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib " DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml2" +PR_python-lang="ml3" RDEPENDS_python-lang="python-core" FILES_python-lang="${libdir}/python2.5/lib-dynload/array.so ${libdir}/python2.5/lib-dynload/parser.so ${libdir}/python2.5/lib-dynload/operator.so ${libdir}/python2.5/lib-dynload/_weakref.so ${libdir}/python2.5/lib-dynload/itertools.so ${libdir}/python2.5/lib-dynload/collections.so ${libdir}/python2.5/lib-dynload/_bisect.so ${libdir}/python2.5/lib-dynload/_heapq.so ${libdir}/python2.5/atexit.* ${libdir}/python2.5/bisect.* ${libdir}/python2.5/code.* ${libdir}/python2.5/codeop.* ${libdir}/python2.5/dis.* ${libdir}/python2.5/heapq.* ${libdir}/python2.5/inspect.* ${libdir}/python2.5/keyword.* ${libdir}/python2.5/opcode.* ${libdir}/python2.5/repr.* ${libdir}/python2.5/token.* ${libdir}/python2.5/tokenize.* ${libdir}/python2.5/traceback.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/weakref.* " DESCRIPTION_python-audio="Python Audio Handling" -PR_python-audio="ml2" +PR_python-audio="ml3" RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so " diff --git a/packages/python/python-2.5.1/enable-ctypes-module.patch b/packages/python/python-2.5.1/enable-ctypes-module.patch new file mode 100644 index 0000000000..dd5adaf0e7 --- /dev/null +++ b/packages/python/python-2.5.1/enable-ctypes-module.patch @@ -0,0 +1,106 @@ +diff -Naur Python-2.5.1.orig/setup.py Python-2.5.1/setup.py +--- Python-2.5.orig/setup.py 2006-08-10 01:42:18.000000000 +0200 ++++ Python-2.5/setup.py 2007-11-21 18:00:43.000000000 +0100 +@@ -1321,16 +1329,16 @@ + ffi_configfile): + from distutils.dir_util import mkpath + mkpath(ffi_builddir) +- config_args = [] ++ config_args = ['--host=%s' % os.environ["HOST_SYS"], ] + + # Pass empty CFLAGS because we'll just append the resulting + # CFLAGS to Python's; -g or -O2 is to be avoided. +- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ +- % (ffi_builddir, ffi_srcdir, " ".join(config_args)) ++ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \ ++ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args)) + + res = os.system(cmd) + if res or not os.path.exists(ffi_configfile): +- print "Failed to configure _ctypes module" ++ print "Failed to configure _ctypes module, ret %d or missing %s"% (res, ffi_configfile, ) + return False + + fficonfig = {} +diff -Naur Python-2.5.1.orig/Modules/_ctypes/callbacks.c Python-2.5.1/Modules/_ctypes/callbacks.c +--- Python-2.5.1.orig/Modules/_ctypes/callbacks.c 2006-10-17 21:41:10.000000000 +0200 ++++ Python-2.5.1/Modules/_ctypes/callbacks.c 2007-11-22 10:29:33.000000000 +0100 +@@ -273,11 +273,13 @@ + PyErr_NoMemory(); + return NULL; + } ++#if FFI_CLOSURES + p->pcl = MallocClosure(); + if (p->pcl == NULL) { + PyErr_NoMemory(); + goto error; + } ++#endif + + for (i = 0; i < nArgs; ++i) { + PyObject *cnv = PySequence_GetItem(converters, i); +@@ -315,12 +317,14 @@ + "ffi_prep_cif failed with %d", result); + goto error; + } ++#if FFI_CLOSURES + result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p); + if (result != FFI_OK) { + PyErr_Format(PyExc_RuntimeError, + "ffi_prep_closure failed with %d", result); + goto error; + } ++#endif + + p->converters = converters; + p->callable = callable; +@@ -328,8 +332,10 @@ + + error: + if (p) { ++#if FFI_CLOSURES + if (p->pcl) + FreeClosure(p->pcl); ++#endif + PyMem_Free(p); + } + return NULL; +diff -Naur Python-2.5.1.orig/Modules/_ctypes/_ctypes.c Python-2.5.1/Modules/_ctypes/_ctypes.c +--- Python-2.5.1.orig/Modules/_ctypes/_ctypes.c 2007-03-23 20:56:45.000000000 +0100 ++++ Python-2.5.1/Modules/_ctypes/_ctypes.c 2007-11-22 10:29:01.000000000 +0100 +@@ -3419,7 +3419,9 @@ + Py_CLEAR(self->paramflags); + + if (self->thunk) { ++#if FFI_CLOSURES + FreeClosure(self->thunk->pcl); ++#endif + PyMem_Free(self->thunk); + self->thunk = NULL; + } +diff -Naur Python-2.5.1.orig/Modules/_ctypes/ctypes.h Python-2.5.1/Modules/_ctypes/ctypes.h +--- Python-2.5.1.orig/Modules/_ctypes/ctypes.h 2006-08-14 13:17:48.000000000 +0200 ++++ Python-2.5.1/Modules/_ctypes/ctypes.h 2007-11-22 10:29:44.000000000 +0100 +@@ -68,7 +68,9 @@ + }; + + typedef struct { ++#if FFI_CLOSURES + ffi_closure *pcl; /* the C callable */ ++#endif + ffi_cif cif; + PyObject *converters; + PyObject *callable; +diff -Naur Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c Python-2.5.1/Modules/_ctypes/malloc_closure.c +--- Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c 2006-06-12 22:56:48.000000000 +0200 ++++ Python-2.5.1/Modules/_ctypes/malloc_closure.c 2007-11-22 10:30:17.000000000 +0100 +@@ -27,7 +27,9 @@ + /******************************************************************/ + + typedef union _tagITEM { ++#if FFI_CLOSURES + ffi_closure closure; ++#endif + union _tagITEM *next; + } ITEM; + diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb inde