diff options
50 files changed, 253 insertions, 141 deletions
diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index f544c203fe..1c8079ebc9 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -255,6 +255,14 @@ def tinder_do_tinder_report(event): information immediately. The caching/queuing needs to be implemented. Also sending more or less information is not implemented yet. + + We have two temporary files stored in the TMP directory. One file + contains the assigned machine id for the tinderclient. This id gets + assigned when we connect the box and start the build process the second + file is used to workaround an EventHandler limitation. If BitBake is ran + with the continue option we want the Build to fail even if we get the + BuildCompleted Event. In this case we have to look up the status and + send it instead of 100/success. """ from bb.event import getName from bb import data, mkdirhier, build @@ -264,7 +272,6 @@ def tinder_do_tinder_report(event): name = getName(event) log = "" status = 1 - #print asd # Check what we need to do Build* shows we start or are done if name == "BuildStarted": tinder_build_start(event.data) @@ -272,9 +279,18 @@ def tinder_do_tinder_report(event): try: # truncate the tinder log file - f = file(data.getVar('TINDER_LOG', event.data, True), 'rw+') - f.truncate(0) + f = file(data.getVar('TINDER_LOG', event.data, True), 'w') + f.write("") f.close() + except: + pass + + try: + # write a status to the file. This is needed for the -k option + # of BitBake + g = file(data.getVar('TMPDIR', event.data, True)+"/tinder-status", 'w') + g.write("") + g.close() except IOError: pass @@ -299,12 +315,23 @@ def tinder_do_tinder_report(event): elif name == "PkgSucceeded": log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('P', event.data, True) elif name == "PkgFailed": - build.exec_task('do_clean', event.data) + if not data.getVar('TINDER_AUTOBUILD', event.data, True) == "0": + build.exec_task('do_clean', event.data) log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('P', event.data, True) status = 200 + # remember the failure for the -k case + h = file(data.getVar('TMPDIR', event.data, True)+"/tinder-status", 'w') + h.write("200") elif name == "BuildCompleted": log += "Build Completed\n" status = 100 + # Check if we have a old status... + try: + h = file(data.getVar('TMPDIR',event.data,True)+'/tinder-status', 'r') + status = int(h.read()) + except: + pass + elif name == "MultipleProviders": log += "---> TINDERBOX Multiple Providers\n" log += "multiple providers are available (%s);\n" % ", ".join(event.getCandidates()) @@ -315,6 +342,9 @@ def tinder_do_tinder_report(event): log += "Error: No Provider for: %s\n" % event.getItem() log += "Error:Was Runtime: %d\n" % event.isRuntime() status = 200 + # remember the failure for the -k case + h = file(data.getVar('TMPDIR', event.data, True)+"/tinder-status", 'w') + h.write("200") # now post the log if len(log) == 0: diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 058f39214e..4f732ecc2a 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -87,6 +87,10 @@ PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" PREFERRED_PROVIDER_gconf ?= gconf-dbus PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs PREFERRED_PROVIDER_tslib ?= tslib +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_ntp = "ntp" +PREFERRED_PROVIDER_hotplug = "udev" +PREFERRED_PROVIDER_libxss = "libxss" #EABI stuff PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 2652004f82..a6b4caf6fd 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv5te" -MACHINE_KERNEL_VERSION ?= "2.4" +MACHINE_KERNEL_VERSION ?= "2.6" include conf/machine/include/tosa-${MACHINE_KERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" diff --git a/packages/angstrom/angstrom-bootmanager.bb b/packages/angstrom/angstrom-bootmanager.bb index 3f7abe5c4b..a863256910 100644 --- a/packages/angstrom/angstrom-bootmanager.bb +++ b/packages/angstrom/angstrom-bootmanager.bb @@ -3,7 +3,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mickey@Vanille.de>" MAINTAINER = "${AUTHOR}" SECTION = "base" DEPENDS = "evas-fb ecore-fb esmart-fb imlib2-fb edje efl++-fb" -RDEPENDS = "libefl++0" +#RDEPENDS = "libefl++0" ALLOW_EMPTY = "1" diff --git a/packages/bitbake/bitbake.inc b/packages/bitbake/bitbake.inc index e454db2f40..1c5c7ad2a6 100644 --- a/packages/bitbake/bitbake.inc +++ b/packages/bitbake/bitbake.inc @@ -9,4 +9,3 @@ HOMEPAGE = "http://developer.berlios.de/projects/bitbake/" LICENSE = "GPL MIT" SECTION = "devel" SUMMARY = "BitBake build tool" -PACKAGE_ARCH = "all" diff --git a/packages/bitbake/bitbake_1.0.bb b/packages/bitbake/bitbake_1.0.bb deleted file mode 100644 index c4b724d967..0000000000 --- a/packages/bitbake/bitbake_1.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require bitbake.inc - -# We don't need a toolchain... -INHIBIT_DEFAULT_DEPS = "1" - -SRC_URI = "svn://svn.berlios.de/bitbake/tags;module=bitbake-${PV}" -S = "${WORKDIR}/bitbake-${PV}" - -inherit distutils - -require bitbake-package.inc diff --git a/packages/bitbake/bitbake_1.1.bb b/packages/bitbake/bitbake_1.1.bb deleted file mode 100644 index c4b724d967..0000000000 --- a/packages/bitbake/bitbake_1.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require bitbake.inc - -# We don't need a toolchain... -INHIBIT_DEFAULT_DEPS = "1" - -SRC_URI = "svn://svn.berlios.de/bitbake/tags;module=bitbake-${PV}" -S = "${WORKDIR}/bitbake-${PV}" - -inherit distutils - -require bitbake-package.inc diff --git a/packages/bitbake/bitbake_1.4.2.bb b/packages/bitbake/bitbake_1.6.0.bb index ac4a1ce122..4289c49a04 100644 --- a/packages/bitbake/bitbake_1.4.2.bb +++ b/packages/bitbake/bitbake_1.6.0.bb @@ -1,9 +1,12 @@ require bitbake.inc +PR = "r1" + # We don't need a toolchain... INHIBIT_DEFAULT_DEPS = "1" -SRC_URI = "svn://svn.berlios.de/bitbake/tags;module=bitbake-${PV}" +SRC_URI = "http://download.berlios.de/bitbake/bitbake-${PV}.tar.gz" + S = "${WORKDIR}/bitbake-${PV}" inherit distutils @@ -11,7 +14,3 @@ inherit distutils require bitbake-package.inc RDEPENDS += "python-shell python-lang python-textutils python-pickle" - -PR = "r1" - - diff --git a/packages/esmtp/esmtp_0.4.1.bb b/packages/esmtp/esmtp_0.5.1.bb index 081c7ab208..2ab587a505 100644 --- a/packages/esmtp/esmtp_0.4.1.bb +++ b/packages/esmtp/esmtp_0.5.1.bb @@ -1,10 +1,10 @@ -SECTION = "console/network" -LICENSE = "GPL" -DEPENDS = "libesmtp" DESCRIPTION = "ESMTP is a user-configurable relay-only MTA \ with a sendmail-compatible syntax, based on libESMTP and \ supporting the AUTH (including the CRAM-MD5 and NTLM SASL \ mechanisms) and StartTLS SMTP extensions." +SECTION = "console/network" +LICENSE = "GPL" +DEPENDS = "libesmtp" SRC_URI = "${SOURCEFORGE_MIRROR}/esmtp/esmtp-${PV}.tar.bz2" diff --git a/packages/feh/feh_1.2.6.bb b/packages/feh/feh_1.2.6.bb index 37cbd49d2f..2cdf8d53c4 100644 --- a/packages/feh/feh_1.2.6.bb +++ b/packages/feh/feh_1.2.6.bb @@ -2,7 +2,7 @@ SECTION = "x11/utils" DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" LICENSE = "MIT" -DEPENDS = "imlib2 giblib jpeg virtual/libx11 libxext libxt" +DEPENDS = "virtual/imlib2 giblib jpeg virtual/libx11 libxext libxt" SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \ file://cross.patch;patch=1" diff --git a/packages/feh/feh_1.2.7.bb b/packages/feh/feh_1.2.7.bb index 37cbd49d2f..2cdf8d53c4 100644 --- a/packages/feh/feh_1.2.7.bb +++ b/packages/feh/feh_1.2.7.bb @@ -2,7 +2,7 @@ SECTION = "x11/utils" DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" LICENSE = "MIT" -DEPENDS = "imlib2 giblib jpeg virtual/libx11 libxext libxt" +DEPENDS = "virtual/imlib2 giblib jpeg virtual/libx11 libxext libxt" SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \ file://cross.patch;patch=1" diff --git a/packages/giblib/giblib.inc b/packages/giblib/giblib.inc index 33f59d407c..05efc330ec 100644 --- a/packages/giblib/giblib.inc +++ b/packages/giblib/giblib.inc @@ -3,7 +3,7 @@ DESCRIPTION = "giblib is a utility library that incorporates doubly linked \ lists, some string functions, and a wrapper for imlib2." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" LICENSE = "BSD" -DEPENDS = "imlib2" +DEPENDS = "virtual/imlib2" SRC_URI = "http://linuxbrit.co.uk/downloads/giblib-${PV}.tar.gz \ file://binconfig.patch;patch=1" diff --git a/packages/glib-2.0/glib-2.0_2.12.1.bb b/packages/glib-2.0/glib-2.0_2.12.1.bb index 9cdbb3e17c..c796f08090 100644 --- a/packages/glib-2.0/glib-2.0_2.12.1.bb +++ b/packages/glib-2.0/glib-2.0_2.12.1.bb @@ -17,7 +17,7 @@ FILES_glib-2.0-utils = "${bindir}/*" EXTRA_OECONF = "--disable-debug" -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.12/glib-${PV}.tar.bz2 \ +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ file://configure-libtool.patch;patch=1" diff --git a/packages/gpe-contacts/gpe-contacts_0.46.bb b/packages/gpe-contacts/gpe-contacts_0.46.bb index 04bea951f6..dadb085f06 100644 --- a/packages/gpe-contacts/gpe-contacts_0.46.bb +++ b/packages/gpe-contacts/gpe-contacts_0.46.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GPE contacts manager" LICENSE = "GPL" SECTION = "gpe" -DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" +DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus-glib" RDEPENDS = "gpe-icons" GPE_TARBALL_SUFFIX = "bz2" diff --git a/packages/gsoap/gsoap-native_2.7.7.bb b/packages/gsoap/gsoap-native_2.7.7.bb index 3ee6daf247..b7553b404d 100644 --- a/packages/gsoap/gsoap-native_2.7.7.bb +++ b/packages/gsoap/gsoap-native_2.7.7.bb @@ -1,4 +1,7 @@ require gsoap_${PV}.bb + +DEPENDS = "" + inherit native do_stage() { diff --git a/packages/irk/irk-belkin_0.11.bb b/packages/irk/irk-belkin_0.11.bb index b743544903..e543ebdcc5 100644 --- a/packages/irk/irk-belkin_0.11.bb +++ b/packages/irk/irk-belkin_0.11.bb @@ -5,5 +5,5 @@ RCONFLICTS = "irk-targus" RREPLACES = "irk-targus" PR = "r3" -SRC_URI = "http://kopsisengineering.com/irk-current.tgz \ +SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/irk-current.tgz \ file://install-default-conf.patch;patch=1" diff --git a/packages/irk/irk-targus_0.11.0.bb b/packages/irk/irk-targus_0.11.0.bb index 1b130776a8..87b74cb5eb 100644 --- a/packages/irk/irk-targus_0.11.0.bb +++ b/packages/irk/irk-targus_0.11.0.bb @@ -7,5 +7,5 @@ HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php" RCONFLICTS = "irk-belkin" RREPLACES = "irk-belkin" -SRC_URI = "http://angela1.data-uncertain.co.uk/~zaurus/irk-${PV}.tgz \ +SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/irk-${PV}.tgz \ file://install-default-conf.patch;patch=1" diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc index ea308f1043..2d536b3dea 100644 --- a/packages/kaffe/kaffe.inc +++ b/packages/kaffe/kaffe.inc @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.kaffe.org/" LICENSE = "GPL LGPL W3C Classpath BSD" DEPENDS = "jikes-native fastjar-native libffi zip-native" +RDEPENDS_${PN} = "${PN}-common (>= ${PV})" SRC_URI += "file://disable-automake-checks.patch;patch=1" @@ -45,7 +46,6 @@ oe_runconf () { PACKAGES =+ "${PN}-common" FILES_${PN} += "${libdir}/${PN}" -RDEPENDS_${PN} = "${PN}-common (>= ${PV})" FILES_${PN}-common = "${libdir}/${PN}/jre/lib/*.jar" do_install () { diff --git a/packages/kaffe/kaffeh-native_1.1.5.bb b/packages/kaffe/kaffeh-native_1.1.5.bb index 54737ce8f6..d4d6287592 100644 --- a/packages/kaffe/kaffeh-native_1.1.5.bb +++ b/packages/kaffe/kaffeh-native_1.1.5.bb @@ -4,6 +4,8 @@ PR = "r3" require kaffe.inc +RDEPENDS_${PN} = "" + inherit native EXTRA_OECONF = "--disable-alsatest \ diff --git a/packages/libesmtp/libesmtp-1.0.1/configure.patch b/packages/libesmtp/libesmtp-1.0.1/configure.patch deleted file mode 100644 index 5058db4b99..0000000000 --- a/packages/libesmtp/libesmtp-1.0.1/configure.patch +++ /dev/null @@ -1,45 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libesmtp-1.0.1/configure.in~configure 2003-09-11 17:23:26.000000000 -0400 -+++ libesmtp-1.0.1/configure.in 2004-01-20 11:59:35.000000000 -0500 -@@ -231,7 +231,7 @@ - if test x$enable_emulate_getaddrinfo != xyes ; then - AC_MSG_ERROR([getaddrinfo not found: try --with-lwres or --enable-emulate-getaddrinfo]) - fi -- LIBOBJS="$LIBOBJS getaddrinfo.o" -+ AC_LIBOBJ([getaddrinfo]) - fi - - if test x"$enable_emulate_getaddrinfo" != xno ; then -@@ -259,7 +259,7 @@ - AC_SEARCH_LIBS(gethostbyname, resolv bind nsl, , - [AC_MSG_ERROR([cannot find gethostbyname])]) - fi -- LIBOBJS="$LIBOBJS gethostbyname.o" -+ AC_LIBOBJ([gethostbyname]) - - AC_CACHE_CHECK([for IPv6 support], acx_cv_sys_use_ipv6, [ - AC_TRY_COMPILE([ -@@ -572,7 +572,7 @@ - dnl ######################################################################### - dnl Check that snprintf works correctly. - dnl ######################################################################### --ACX_SNPRINTF(,[LIBOBJS="$LIBOBJS snprintf.o"]) -+ACX_SNPRINTF(,[AC_LIBOBJ([snprintf])]) - - dnl ######################################################################### - dnl Make substitutions -@@ -588,8 +588,8 @@ - AC_SUBST(RANLIB) - AC_SUBST(subdirs) - --LTLIBOBJS=`echo "$LIBOBJS" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']` --AC_SUBST(LTLIBOBJS) -+#LTLIBOBJS=`echo "$LIBOBJS" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']` -+#AC_SUBST(LTLIBOBJS) - LTALLOCA=`echo "$ALLOCA" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']` - AC_SUBST(LTALLOCA) - diff --git a/packages/libesmtp/libesmtp_1.0.1.bb b/packages/libesmtp/libesmtp_1.0.1.bb deleted file mode 100644 index fe6d958f1b..0000000000 --- a/packages/libesmtp/libesmtp_1.0.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SECTION = "libs" -DEPENDS = "openssl" -DESCRIPTION = "LibESMTP is a library to manage posting \ -(or submission of) electronic mail using SMTP to a \ -preconfigured Mail Transport Agent (MTA) such as Exim." -FILES_libesmtp_append = " ${libdir}/esmtp-plugins" - -SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2 \ - file://configure.patch;patch=1" -LICENSE = "LGPL GPL" -inherit autotools - -EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.." - -do_stage () { - oe_libinstall -a -so libesmtp ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR} - install -m 644 auth-client.h ${STAGING_INCDIR} - install -m 644 auth-plugin.h ${STAGING_INCDIR} - install -m 644 libesmtp.h ${STAGING_INCDIR} -} diff --git a/packages/libesmtp/libesmtp_1.0.3r1.bb b/packages/libesmtp/libesmtp_1.0.4.bb index baff0d8931..294333c579 100644 --- a/packages/libesmtp/libesmtp_1.0.3r1.bb +++ b/packages/libesmtp/libesmtp_1.0.4.bb @@ -1,22 +1,19 @@ -LICENSE = "GPL" -SECTION = "libs" -DEPENDS = "openssl" DESCRIPTION = "LibESMTP is a library to manage posting \ (or submission of) electronic mail using SMTP to a \ -preconfigured Mail Transport Agent (MTA) such as Exim." -FILES_libesmtp_append = " ${libdir}/esmtp-plugins" +preconfigured Mail Transport Agent (MTA) such as Exim or PostFix." +LICENSE = "GPL" +SECTION = "libs/network" +DEPENDS = "openssl" +PR = "r1" SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2" -inherit autotools +inherit autotools binconfig EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.." -do_stage () { - oe_libinstall -a -so libesmtp ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR} - install -m 644 auth-client.h ${STAGING_INCDIR} - install -m 644 auth-plugin.h ${STAGING_INCDIR} - install -m 644 libesmtp.h ${STAGING_INCDIR} +do_stage() { + autotools_stage_all } + +FILES_libesmtp_append = " ${libdir}/esmtp-plugins" diff --git a/packages/linux/LAB-kernel/greatwall_header b/packages/linux/LAB-kernel/greatwall_header Binary files differnew file mode 100644 index 0000000000..8a9589627e --- /dev/null +++ b/packages/linux/LAB-kernel/greatwall_header diff --git a/packages/linux/LAB-kernel/greatwall_trailer b/packages/linux/LAB-kernel/greatwall_trailer new file mode 100644 index 0000000000..96f565db6b --- /dev/null +++ b/packages/linux/LAB-kernel/greatwall_trailer @@ -0,0 +1 @@ +HTCE
\ No newline at end of file diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb index 156c26693b..aae29cd23f 100644 --- a/packages/linux/LAB-kernel_cvs.bb +++ b/packages/linux/LAB-kernel_cvs.bb @@ -15,7 +15,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ file://initramfs_list \ - file://defconfig" + file://defconfig \ + file://greatwall_header \ + file://greatwall_trailer" S = "${WORKDIR}/kernel26" @@ -26,7 +28,7 @@ ALLOW_EMPTY_kernel-image_h2200 = 1 K_MAJOR = "2" K_MINOR = "6" -K_MICRO = "15" +K_MICRO = "16" HHV = "0" # @@ -47,6 +49,9 @@ do_configure() { do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/LAB-image-${MACHINE} + + # Generate the HTC flavor, which must be a multiple of 512 bytes long. + cat ${WORKDIR}/greatwall_header arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${WORKDIR}/greatwall_trailer | dd conv=sync of=${DEPLOY_DIR_IMAGE}/LAB-image-${MACHINE}.htc } do_stage() { diff --git a/packages/netbase/netbase/tosa/interfaces b/packages/netbase/netbase/tosa/interfaces index 92b022475c..0da7168535 100644 --- a/packages/netbase/netbase/tosa/interfaces +++ b/packages/netbase/netbase/tosa/interfaces @@ -9,8 +9,8 @@ iface wlan0 inet dhcp wireless_type wlan-ng wireless_mode Managed pre-up modprobe prism2_usb - pre-up /sbin/usbctl on 1 - post-down /sbin/usbctl off 1 +# pre-up /sbin/usbctl on 1 +# post-down /sbin/usbctl off 1 post-down rmmod prism2_usb # Wired or wireless interfaces diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb index 7654ebd9a3..ca0beacb47 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb @@ -4,4 +4,3 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -EXTRA_QMAKEVARS_POST += "HEADERS+=rssparser.h SOURCES+=rssparser.cpp" diff --git a/packages/portabase/metakit_2.4.9.3.bb b/packages/portabase/metakit_2.4.9.3.bb index 5c0197d2d6..c1ead5c0be 100644 --- a/packages/portabase/metakit_2.4.9.3.bb +++ b/packages/portabase/metakit_2.4.9.3.bb @@ -12,7 +12,7 @@ PR = "r1" do_configure_prepend() { - cp ${STAGING_DATADIR}/libtool/* ${S}/unix/scripts/ + cp ${STAGING_DATADIR}/libtool/*.* ${S}/unix/scripts/ } do_configure () { diff --git a/packages/python/python-pymp3_0.3.4.bb b/packages/python/python-pymp3_0.3.4.bb index b9529b28b4..a6d205dd5d 100644 --- a/packages/python/python-pymp3_0.3.4.bb +++ b/packages/python/python-pymp3_0.3.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A Curses-based mp3 player. See http://damien.degois.info/PyMP3/" SECTION = "console/multimedia" PRIORITY = "optional" -RDEPENDS = "python-core python-ncurses python-pyid3lib python-mad python-ao" +RDEPENDS = "python-core python-curses python-pyid3lib python-mad python-ao" LICENSE = "GPL" PR = "r2" diff --git a/packages/qpf-fonts/qpf-dejavusans_2.7.bb b/packages/qpf-fonts/qpf-dejavusans_2.9.bb index 7673efe936..7673efe936 100644 --- a/packages/qpf-fonts/qpf-dejavusans_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavusans_2.9.bb diff --git a/packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb b/packages/qpf-fonts/qpf-dejavusanscondensed_2.9.bb index 0a753d90a8..0a753d90a8 100644 --- a/packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavusanscondensed_2.9.bb diff --git a/packages/qpf-fonts/qpf-dejavusansmono_2.7.bb b/packages/qpf-fonts/qpf-dejavusansmono_2.9.bb index e2b07e4015..e2b07e4015 100644 --- a/packages/qpf-fonts/qpf-dejavusansmono_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavusansmono_2.9.bb diff --git a/packages/qpf-fonts/qpf-dejavuserif_2.7.bb b/packages/qpf-fonts/qpf-dejavuserif_2.9.bb index 863d6a3e45..863d6a3e45 100644 --- a/packages/qpf-fonts/qpf-dejavuserif_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavuserif_2.9.bb diff --git a/packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb b/packages/qpf-fonts/qpf-dejavuserifcondensed_2.9.bb index d84cdff195..d84cdff195 100644 --- a/packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb +++ b/packages/qpf-fonts/qpf-dejavuserifcondensed_2.9.bb diff --git a/packages/libesmtp/libesmtp-1.0.1/.mtn2git_empty b/packages/rt2x00/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/libesmtp/libesmtp-1.0.1/.mtn2git_empty +++ b/packages/rt2x00/.mtn2git_empty diff --git a/packages/rt2x00/rt2570_1.1.0-b2.bb b/packages/rt2x00/rt2570_1.1.0-b2.bb new file mode 100644 index 0000000000..a3cc233351 --- /dev/null +++ b/packages/rt2x00/rt2570_1.1.0-b2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Driver for Ralink rt2570 USB 802.11g WiFi sticks" +HOMEPAGE = "http://rt2x00.serialmonkey.com/" +SECTION = "kernel/modules" +LICENSE = "GPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/rt2400/rt2570-${PV}.tar.gz" + +inherit module + +S = "${WORKDIR}/${PN}-${PV}/Module/" + +EXTRA_OEMAKE = "KERNDIR=${STAGING_KERNEL_DIR}" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra + install -m 0644 rt2570${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/ +} diff --git a/packages/slcalc/slcalc_1.2.1.bb b/packages/slcalc/slcalc_1.2.1.bb index fa5720e0ce..a399defb76 100644 --- a/packages/slcalc/slcalc_1.2.1.bb +++ b/packages/slcalc/slcalc_1.2.1.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Scientific calculator with user definable constants and functions HOMEPAGE = "http://homepage3.nifty.com/cam/slcalc.htm" SECTION = "opie/applications" LICENSE = "GPL" +PR = "r1" APPTYPE = "binary" APPDESKTOP = "${S}" @@ -14,5 +15,5 @@ S = "${WORKDIR}/slcalc_source" do_install() { install -d ${D}${palmtopdir}/pics - install -m 0644 slcalc2.png ${D}${palmtopdir}/pics/ + install -m 0644 slcalc2.png ${D}${palmtopdir}/pics/slcalc.png } diff --git a/packages/sudo/sudo.inc b/packages/sudo/sudo.inc index 92d3c47266..0dfb22ba8a 100644 --- a/packages/sudo/sudo.inc +++ b/packages/sudo/sudo.inc @@ -1,4 +1,3 @@ -SECTION = "base" DESCRIPTION = "Sudo (superuser do) allows a system \ administrator to give certain users (or groups of \ users) the ability to run some (or all) commands \ diff --git a/packages/swig/swig-native_1.3.29.bb b/packages/swig/swig-native_1.3.29.bb new file mode 100644 index 0000000000..8210bb9cfb --- /dev/null +++ b/packages/swig/swig-native_1.3.29.bb @@ -0,0 +1,7 @@ +require swig_${PV}.bb +inherit native + +do_stage() { + oe_runmake install PREFIX=${STAGING_BINDIR}/.. +} + diff --git a/packages/tasks/task-dvb.bb b/packages/tasks/task-dvb.bb index 5a5c37a565..335ab27e8d 100644 --- a/packages/tasks/task-dvb.bb +++ b/packages/tasks/task-dvb.bb @@ -7,3 +7,6 @@ PR = "r5" RDEPENDS = "dvbstream dvbtune xserver-xorg tda1004x-firmware mythtv lirc lirc-modules drm-module-via" LICENSE = MIT + +# there is a -march=586 somewhere in the source tree of mythtv +COMPATIBLE_HOST = 'i.86.*-linux' diff --git a/packages/tasks/task-mythfront.bb b/packages/tasks/task-mythfront.bb index a1532c1739..a938a12e57 100644 --- a/packages/tasks/task-mythfront.bb +++ b/packages/tasks/task-mythfront.bb @@ -7,3 +7,6 @@ PR = "r6" RDEPENDS = "xserver-xorg mythtv lirc lirc-modules drm-module-via ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd drm-module-drm" LICENSE = MIT + +# there is a -march=586 somewhere in the source tree of mythtv +COMPATIBLE_HOST = 'i.86.*-linux' diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb new file mode 100644 index 0000000000..6a4bc321c9 --- /dev/null +++ b/packages/tslib/tslib_1.0.bb @@ -0,0 +1,98 @@ +DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library." +HOMEPAGE = "http://cvs.arm.linux.org.uk/" +AUTHOR = "Russell King w/ plugins by Chris Larson et. al." +SECTION = "base" +LICENSE = "LGPL" + +PR = "r0" +SRCDATE_tslib = "now" + +SRC_URI = "svn://svn.berlios.de/svnroot/repos/tslib/tags/tslib;module=${PV};proto=http \ + file://ts.conf \ + file://ts-2.6.conf \ + file://ts.conf-h3600-2.4 \ + file://ts.conf-simpad-2.4 \ + file://ts.conf-corgi-2.4 \ + file://ts.conf-collie-2.4 \ + file://tslib.sh" +SRC_URI_append_mnci += " file://devfs.patch;patch=1" +SRC_URI_append_mnci += " file://event1.patch;patch=1" +S = "${WORKDIR}/${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-shared" +EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " + +do_stage() { + autotools_stage_all +} + +do_install_prepend() { + install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf +} + +do_install_append() { + install -d ${D}${sysconfdir}/profile.d/ + install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ + case ${MACHINE} in + a780 | e680 | h3600 | h3900 | h5xxx | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel | h4000) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-h3600-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + c7x0 | spitz | akita | tosa ) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-corgi-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + collie | poodle ) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-collie-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + + simpad ) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-simpad-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + *) + ;; + esac +} + +SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" +CONFFILES_${PN} = "${sysconfdir}/ts.conf" + +RDEPENDS_tslib-conf_h1940 = "detect-stylus" +RDEPENDS_tslib-conf_h2200 = "detect-stylus" +RDEPENDS_tslib-conf_h3600 = "detect-stylus" +RDEPENDS_tslib-conf_h3900 = "detect-stylus" +RDEPENDS_tslib-conf_h5xxx = "detect-stylus" +RDEPENDS_tslib-conf_h6300 = "detect-stylus" +RDEPENDS_tslib-conf_blueangel = "detect-stylus" +RDEPENDS_tslib-conf_htcuniversal = "detect-stylus" +RDEPENDS_tslib-conf_h4000 = "detect-stylus" +RDEPENDS_tslib-conf_ipaq-pxa270 = "detect-stylus" + +PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" +PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" + +PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate" + +RDEPENDS_libts = "tslib-conf" + +FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" +FILES_libts = "${libdir}/*.so.* ${libdir}/ts/*.so*" +FILES_libts-dev = "${FILES_tslib-dev}" +FILES_tslib-calibrate += "${bindir}/ts_calibrate" +FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" diff --git a/packages/ttf-fonts/ttf-dejavu_2.7.bb b/packages/ttf-fonts/ttf-dejavu_2.9.bb index 4599e6e016..4599e6e016 100644 --- a/packages/ttf-fonts/ttf-dejavu_2.7.bb +++ b/packages/ttf-fonts/ttf-dejavu_2.9.bb diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb index d5a8e70332..0c7a77e7f9 100644 --- a/packages/xqt/xqt_0.0.9.bb +++ b/packages/xqt/xqt_0.0.9.bb @@ -2,15 +2,13 @@ HOMEPAGE = "http://xqt.sourceforge.jp" LICENSE = "GPL" SECTION = "x11" - SRCDATE = "20041111" -DEPENDS = "freetype libxi libxmu flex-2.5.4-native virtual/libqte2 libqpe-opie" +DEPENDS = "freetype libxi libxmu flex-native virtual/libqte2 libqpe-opie" SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xc;method=pserver \ file://imake-staging.patch;patch=1 \ file://moc_call.patch;patch=1 " - S = "${WORKDIR}/xc" do_configure() { diff --git a/site/i386-linux b/site/i386-linux index 422c825bef..7640a45d88 100644 --- a/site/i386-linux +++ b/site/i386-linux @@ -104,3 +104,13 @@ with_broken_putenv=${with_broken_putenv=no} # xffm jm_cv_func_working_readdir=yes + +# ipsec-tools +ac_cv_va_copy=${ac_cv_va_copy=no} +ac_cv___va_copy=${ac_cv___va_copy=yes} +racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no} + +# slrn +slrn_cv___va_copy=${slrn_cv___va_copy=yes} +slrn_cv_va_copy=${slrn_cv_va_copy=no} +slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} diff --git a/site/i486-linux b/site/i486-linux index 1791e58ea7..1d4115be90 100644 --- a/site/i486-linux +++ b/site/i486-linux @@ -140,3 +140,13 @@ ac_cv_file_lib_src_libmad_frame_h=${ac_cv_file_lib_src_libmad_frame_h=no} # xorg X11R7 ac_cv_sys_linker_h=${ac_cv_sys_linker_h=no} ac_cv_file__usr_share_X11_sgml_defs_ent=${ac_cv_file__usr_share_X11_sgml_defs_ent=no} + +# ipsec-tools +ac_cv_va_copy=${ac_cv_va_copy=no} +ac_cv___va_copy=${ac_cv___va_copy=yes} +racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no} + +# slrn +slrn_cv___va_copy=${slrn_cv___va_copy=yes} +slrn_cv_va_copy=${slrn_cv_va_copy=no} +slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} diff --git a/site/i586-linux b/site/i586-linux index 65b7c0dd8a..f78dbbfe04 100644 --- a/site/i586-linux +++ b/site/i586-linux @@ -123,3 +123,13 @@ php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_ # xffm jm_cv_func_working_readdir=yes + +# ipsec-tools +ac_cv_va_copy=${ac_cv_va_copy=no} +ac_cv___va_copy=${ac_cv___va_copy=yes} +racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no} + +# slrn +slrn_cv___va_copy=${slrn_cv___va_copy=yes} +slrn_cv_va_copy=${slrn_cv_va_copy=no} +slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} diff --git a/site/i686-linux b/site/i686-linux index 113929adbb..ce5580f973 100644 --- a/site/i686-linux +++ b/site/i686-linux @@ -202,3 +202,8 @@ jm_cv_func_working_readdir=yes #xserver-xorg ac_cv_sys_linker_h=${ac_cv_sys_linker_h=no} ac_cv_file__usr_share_X11_sgml_defs_ent=${ac_cv_file__usr_share_X11_sgml_defs_ent=no} + +# slrn +slrn_cv___va_copy=${slrn_cv___va_copy=yes} +slrn_cv_va_copy=${slrn_cv_va_copy=no} +slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} diff --git a/site/sh4-linux b/site/sh4-linux index 7189cd1615..8e25cad4a5 100644 --- a/site/sh4-linux +++ b/site/sh4-linux @@ -196,10 +196,6 @@ compat_cv_func_dirname_works=${compat_cv_func_dirname_works=no} slrn_cv___va_copy=${slrn_cv___va_copy=yes} slrn_cv_va_copy=${slrn_cv_va_copy=no} slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} -ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes} -ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} -ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} -ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} # startup-notification lf_cv_sane_realloc=yes diff --git a/site/sh4-linux-uclibc b/site/sh4-linux-uclibc index 734e0924f7..30054561f2 100644 --- a/site/sh4-linux-uclibc +++ b/site/sh4-linux-uclibc @@ -35,3 +35,8 @@ ac_cv_sizeof_int=${ac_cv_sizeof_int=4} ac_cv_va_copy=${ac_cv_va_copy=no} ac_cv___va_copy=${ac_cv___va_copy=yes} racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no} + +# slrn +slrn_cv___va_copy=${slrn_cv___va_copy=yes} +slrn_cv_va_copy=${slrn_cv_va_copy=no} +slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} |