From bbfe419ac95af0ba2ecb367223cc087cd81123b0 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 30 Jul 2005 13:18:57 +0000 Subject: openembedded/classes/tinderclient.bbclass: -Use spaces only, no more tabs to avoid issues with python and level of indention --- classes/tinderclient.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 5de9b8755a..c424797d16 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -21,8 +21,8 @@ def tinder_send_http(da, header, log): from bb import data import httplib, urllib cont = "\n%s\n%s" % ( header, log) - headers = {"Content-type": "multipart/form-data" } - + headers = {"Content-type": "multipart/form-data" } + conn = httplib.HTTPConnection(data.getVar('TINDER_HOST',da, True)) conn.request("POST", data.getVar('TINDER_URL',da,True), cont, headers) conn.close() @@ -76,8 +76,8 @@ def tinder_do_tinder_report(event): if name == "PkgFailed" or name == "BuildCompleted": status = 'build_failed' - if name == "BuildCompleted": - status = "success" + if name == "BuildCompleted": + status = "success" header = tinder_prepare_mail_header(event.data, status) # append the log log_file = data.getVar('TINDER_LOG', event.data, True) @@ -120,7 +120,7 @@ def tinder_do_tinder_report(event): log_post_method = tinder_send_email if data.getVar('TINDER_SENDLOG', event.data, True) == "http": - log_post_method = tinder_send_http + log_post_method = tinder_send_http log_post_method(event.data, header, log) -- cgit v1.2.3 From b5edeb751c7d12b6526440022396f6a976b583d7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 30 Jul 2005 16:20:50 +0000 Subject: Apply dbus-init patch, Courtesy Philipp Zabel --- packages/dbus/dbus/dbus-1.init | 87 ++++++++++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 29 deletions(-) diff --git a/packages/dbus/dbus/dbus-1.init b/packages/dbus/dbus/dbus-1.init index 118b801da7..bd31b6208c 100644 --- a/packages/dbus/dbus/dbus-1.init +++ b/packages/dbus/dbus/dbus-1.init @@ -1,15 +1,17 @@ #! /bin/sh -# -*- coding: iso8859-1 -*- +# -*- coding: utf-8 -*- # Debian init.d script for D-BUS -# Copyright (c) 2003 Colin Walters +# Copyright © 2003 Colin Walters set -e DAEMON=/usr/bin/dbus-daemon-1 NAME=dbus-1 DAEMONUSER=messagebus -PIDFILE=/var/run/dbus/pid +PIDDIR=/var/run/dbus +PIDFILE=$PIDDIR/pid DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d test -x $DAEMON || exit 0 @@ -17,41 +19,68 @@ test -x $DAEMON || exit 0 ENABLED=1 PARAMS="" if [ -e /etc/default/dbus-1 ]; then - . /etc/default/dbus-1 + . /etc/default/dbus-1 fi test "$ENABLED" != "0" || exit 0 +start_it_up() +{ + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER $PIDDIR + chgrp $DAEMONUSER $PIDDIR + fi + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + echo "$DESC already started; not starting." + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + run-parts --reverse --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon --stop --retry 60 --quiet --oknodo --pidfile $PIDFILE \ + --user $DAEMONUSER + # We no longer include these arguments so that start-stop-daemon + # can do its job even given that we may have been upgraded. + # We rely on the pidfile being sanely managed + # --exec $DAEMON -- --system $PARAMS + echo "$NAME." + rm -f $PIDFILE +} + case "$1" in start) - echo -n "Starting $DESC: " - if [ ! -d /var/run/dbus ]; then - mkdir /var/run/dbus - chown $DAEMONUSER:$DAEMONUSER /var/run/dbus - fi - start-stop-daemon -S \ - -u $DAEMONUSER -x $DAEMON -- --system $PARAMS - echo "$NAME." - ;; + start_it_up + ;; stop) - echo -n "Stopping $DESC: " - start-stop-daemon -K \ - -u $DAEMONUSER -x $DAEMON -- --system $PARAMS - echo "$NAME." - ;; + shut_it_down + ;; restart|force-reload) - echo -n "Restarting $DESC: " - start-stop-daemon -K \ - -u $DAEMONUSER -x $DAEMON -- --system $PARAMS - sleep 1 - start-stop-daemon -S \ - -u $DAEMONUSER -x $DAEMON -- --system $PARAMS - echo "$NAME." - ;; + shut_it_down + sleep 1 + start_it_up + ;; *) - echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 - exit 1 - ;; + echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; esac exit 0 -- cgit v1.2.3 From 2d03a83abf7490b79e84fc77b58c12fc545a2e2c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 30 Jul 2005 17:12:11 +0000 Subject: linux-oz-2.6.11: Update SRC_URIs after cleanup --- packages/linux/linux-openzaurus_2.6.11.bb | 34 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb index d93006ffa7..ef1a97d2e4 100644 --- a/packages/linux/linux-openzaurus_2.6.11.bb +++ b/packages/linux/linux-openzaurus_2.6.11.bb @@ -21,31 +21,31 @@ JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files/" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ http://www.kernel.org/pub/linux/kernel/people/rml/inotify/v2.6/0.22/inotify-0.22-rml-2.6.11-1.patch;patch=1 \ ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 \ - ${RPSRC}/rndis_fix-r0.patch;patch=1 \ - ${RPSRC}/w100_malloc-r2.patch;patch=1 \ - ${RPSRC}/pxairq_printk-r0.patch;patch=1 \ - ${RPSRC}/corgi_kbd-r14.patch;patch=1 \ - ${RPSRC}/corgi_ts-r10.patch;patch=1 \ - ${RPSRC}/sharp_multi_scoop-r1.patch;patch=1 \ - ${RPSRC}/corgi_kbd1-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_param-r5.patch;patch=1 \ + ${RPSRC}/archive/rndis_fix-r0.patch;patch=1 \ + ${RPSRC}/archive/w100_malloc-r2.patch;patch=1 \ + ${RPSRC}/archive/pxairq_printk-r0.patch;patch=1 \ + ${RPSRC}/archive/corgi_kbd-r14.patch;patch=1 \ + ${RPSRC}/archive/corgi_ts-r10.patch;patch=1 \ + ${RPSRC}/archive/sharp_multi_scoop-r1.patch;patch=1 \ + ${RPSRC}/archive/corgi_kbd1-r0.patch;patch=1 \ + ${RPSRC}/archive/sharpsl_param-r5.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ - ${RPSRC}/pxa_irda-r1.patch;patch=1 \ - ${RPSRC}/pxaudc_susres-r1.patch;patch=1 \ + ${RPSRC}/archive/pxa_irda-r1.patch;patch=1 \ + ${RPSRC}/archive/pxaudc_susres-r1.patch;patch=1 \ ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \ - ${RPSRC}/pxa_turbo-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_mapprom-r1.patch;patch=1 \ - ${RPSRC}/input_power-r1.patch;patch=1 \ + ${RPSRC}/archive/pxa_turbo-r0.patch;patch=1 \ + ${RPSRC}/archive/sharpsl_mapprom-r1.patch;patch=1 \ + ${RPSRC}/archive/input_power-r1.patch;patch=1 \ ${RPSRC}/corgi_irda-r2.patch;patch=1 \ ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ - ${RPSRC}/corgi_power-r22.patch;patch=1 \ + ${RPSRC}/archive/corgi_power-r22.patch;patch=1 \ ${RPSRC}/corgi_power1-r1.patch;patch=1 \ - ${RPSRC}/ide_fixes-r1.patch;patch=1 \ - ${RPSRC}/mmc_sd-r4.patch;patch=1 \ + ${RPSRC}/archive/ide_fixes-r1.patch;patch=1 \ + ${RPSRC}/archive/mmc_sd-r4.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/corgi_snd-r6.patch;patch=1 \ - ${RPSRC}/w100_split-r5-r1.patch;patch=1 \ + ${RPSRC}/archive/w100_split-r5-r1.patch;patch=1 \ ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \ ${DOSRC}/tc6393-device-r2.patch;patch=1 \ ${DOSRC}/tc6393_nand-r2.patch;patch=1 \ -- cgit v1.2.3 From 09da4d19b4d3475ad990c5d680514117119ca913 Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Sat, 30 Jul 2005 17:20:53 +0000 Subject: Remove previuos change and create package perl-modules that recommends all the other 859 packages. Unfourtanly also recommends 86 packages packages that doesn't get created, so some warning messages gets displayed on ipkg install. --- packages/perl/perl_5.8.7.bb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 16c43cc8e9..a9daf10e68 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -4,7 +4,7 @@ include perl.inc SRC_URI += "file://config.sh-armeb-linux" -PR = "r5" +PR = "r6" do_configure() { ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl @@ -32,11 +32,9 @@ do_install_append() { ln -s libperl.so.${PV} ${D}/${libdir}/libperl.so.5 } -# Create a perl-modules package depending on all the other perl -# packages (actually the non modules packages too) -# This means creating lots of empty packages too, so its set to only -# openslug for the time beeing -ALLOW_EMPTY_openslug = 1 -PACKAGES_append_openslug = " perl-modules" -RDEPENDS_perl-modules_openslug = "${PACKAGES}" -RPROVIDES_perl-lib_openslug = "perl-lib" +# Create a perl-modules package recommending all the other perl +# packages (actually the non modules packages and not created too) +ALLOW_EMPTY_perl-modules = 1 +PACKAGES_append = " perl-modules" +RRECOMMENDS_perl-modules = "${PACKAGES}" +RPROVIDES_perl-lib = "perl-lib" -- cgit v1.2.3 From 57f5ce0fcbc1b16efb95dd0c23b9cebe20be7d96 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 30 Jul 2005 17:46:18 +0000 Subject: Make /etc/profile use TZ variable if /etc/localtime not present. link in comments explain usage. Bump base-files rev. --- packages/base-files/base-files/profile | 6 ++++++ packages/base-files/base-files_3.0.14.bb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/base-files/base-files/profile b/packages/base-files/base-files/profile index f24fec92ca..a4c16944b9 100644 --- a/packages/base-files/base-files/profile +++ b/packages/base-files/base-files/profile @@ -5,6 +5,12 @@ PATH="/usr/local/bin:/usr/bin:/bin" EDITOR="/bin/vi" # needed for packages like cron TERM="vt100" # Basic terminal capab. For screen etc. +if [ ! -e /etc/localtime ]; then + TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html + # for an explanation of how to set this to your local timezone. + export TZ +fi + if [ "`id -u`" -eq 0 ]; then PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin: fi diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index ec58e08bef..144bf2e135 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r38" +PR = "r39" LICENSE = "GPL" SRC_URI = " \ -- cgit v1.2.3 From dcbc7895ca2162117bb96a5418b4bafa28e85b0e Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 30 Jul 2005 18:08:52 +0000 Subject: Added nano --- packages/meta/openslug-packages.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 96d81e1d31..5f04863cfa 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -70,6 +70,7 @@ OPENSLUG_PACKAGES = "\ mutt \ mysql \ nail \ + nano \ ncftp \ obexftp openobex openobex-apps ircp \ openssh \ -- cgit v1.2.3 From 844ba2f9aed40306d4e3ad4c9fe12d2911abdeb4 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 30 Jul 2005 18:10:01 +0000 Subject: Added nano and cyrus-imapd --- conf/distro/openslug-packages.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index e4da231aa5..f09f827402 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -19,6 +19,7 @@ ${PKGDIR}/packages/bzip2/*.bb \ ${PKGDIR}/packages/coreutils/*.bb \ ${PKGDIR}/packages/cpio/*.bb \ ${PKGDIR}/packages/cron/*.bb \ +${PKGDIR}/packages/cyrus-imapd/*.bb \ ${PKGDIR}/packages/cvs/*.bb \ ${PKGDIR}/packages/db/*.bb \ ${PKGDIR}/packages/devio/*.bb \ @@ -92,6 +93,7 @@ ${PKGDIR}/packages/musicpd/*.bb \ ${PKGDIR}/packages/mutt/*.bb \ ${PKGDIR}/packages/mysql/*.bb \ ${PKGDIR}/packages/nail/*.bb \ +${PKGDIR}/packages/nano/*.bb \ ${PKGDIR}/packages/ncftp/*.bb \ ${PKGDIR}/packages/ncurses/*.bb \ ${PKGDIR}/packages/netbase/*.bb \ -- cgit v1.2.3 From a7a1e50073191021590bc1b8296ae95a970d5589 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 30 Jul 2005 18:49:16 +0000 Subject: Added cyrus-sasl, needed for cyrus-imapd --- conf/distro/openslug-packages.conf | 1 + conf/distro/openslug.conf | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index f09f827402..5972afdbf0 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -20,6 +20,7 @@ ${PKGDIR}/packages/coreutils/*.bb \ ${PKGDIR}/packages/cpio/*.bb \ ${PKGDIR}/packages/cron/*.bb \ ${PKGDIR}/packages/cyrus-imapd/*.bb \ +${PKGDIR}/packages/cyrus-sasl/*.bb \ ${PKGDIR}/packages/cvs/*.bb \ ${PKGDIR}/packages/db/*.bb \ ${PKGDIR}/packages/devio/*.bb \ diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index dd4d7c0b5b..7aad8d180e 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -10,13 +10,13 @@ DISTRO_TYPE ?= "beta" include conf/distro/freeze.conf # Add to the user's feeds from local.conf (there may be none) -FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/${DISTRO_VERSION}" -FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native/${DISTRO_VERSION}" +#FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/${DISTRO_VERSION}" +#FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native/${DISTRO_VERSION}" # # Uncomment the following to get the unstable feeds -#FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/unstable" -#FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/openslug/native/unstable" +FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/unstable" +FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/openslug/native/unstable" TARGET_FPU_local ?= "soft" -- cgit v1.2.3 From 8613f854b0c842b10976a64384d02524da8f8a7f Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 30 Jul 2005 18:57:16 +0000 Subject: Set the feeds correctly again --- conf/distro/openslug.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 7aad8d180e..dd4d7c0b5b 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -10,13 +10,13 @@ DISTRO_TYPE ?= "beta" include conf/distro/freeze.conf # Add to the user's feeds from local.conf (there may be none) -#FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/${DISTRO_VERSION}" -#FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native/${DISTRO_VERSION}" +FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/${DISTRO_VERSION}" +FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native/${DISTRO_VERSION}" # # Uncomment the following to get the unstable feeds -FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/unstable" -FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/openslug/native/unstable" +#FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/unstable" +#FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/openslug/native/unstable" TARGET_FPU_local ?= "soft" -- cgit v1.2.3 From 044d3e7f73701b5ff6d51cc52c5f4f17d3c09fe1 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 30 Jul 2005 18:57:45 +0000 Subject: Added cyrus-imapd back to packages --- packages/meta/openslug-packages.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 5f04863cfa..7a62698dd0 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -53,6 +53,7 @@ OPENSLUG_PACKAGES = "\ coreutils \ cron \ cvs\ + cyrus-imapd \ dnsmasq \ expat \ ftpd-topfield \ -- cgit v1.2.3 From 69b71953ab2ac88c4bb2e374e350c1432be8a56f Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Sat, 30 Jul 2005 19:05:22 +0000 Subject: Add perl and perl-modules to openslug-native --- packages/meta/openslug-native.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb index a3bd0a830a..d61815eb6a 100644 --- a/packages/meta/openslug-native.bb +++ b/packages/meta/openslug-native.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Packages that are required for the OpenSlug native build environment" LICENSE = MIT -PR = "r5" +PR = "r6" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 @@ -34,6 +34,7 @@ OPENSLUG_NATIVE = "\ monotone-5 \ ncurses ncurses-dev ncurses-terminfo \ patch \ + perl perl-modules \ python-core python-io python-lang python-pickle python-shell python-textutils \ sed \ tar \ -- cgit v1.2.3 From b752dff504cbe97abe3f2bfe4881263f4e91989f Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 30 Jul 2005 19:10:55 +0000 Subject: Remove perl from the feed since it doesn't work, and there's a working version in the native feed --- packages/meta/openslug-packages.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 7a62698dd0..8d4ba5bf50 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -40,7 +40,6 @@ OPENSLUG_DEVELOPMENT = "\ # These packages only build on TARGET_OS=linux, not # TARGET_OS=linux-uclibc OPENSLUG_DEVELOPMENT_append_linux = "\ - perl \ tar \ " -- cgit v1.2.3 From 6e48fbc5c8cb29f59c27fb02271f552b0ec57396 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 30 Jul 2005 19:14:04 +0000 Subject: disapproval of revision 5fbbe1c75e9bf5533a85c833ed875f3ceb27e7be --- packages/meta/openslug-packages.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 8d4ba5bf50..7a62698dd0 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -40,6 +40,7 @@ OPENSLUG_DEVELOPMENT = "\ # These packages only build on TARGET_OS=linux, not # TARGET_OS=linux-uclibc OPENSLUG_DEVELOPMENT_append_linux = "\ + perl \ tar \ " -- cgit v1.2.3 From 7bd115ab1019f19bc47de25df551dfff7cfce8d1 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 30 Jul 2005 19:21:18 +0000 Subject: openembedded/conf/tinder.conf: -Document the TINDER_TZ Option. It can either be Europe/Berlin (no kidding) or a timedelty (e.g. +0200) openembedded/classes/tinderclient.bbclass: -Send timenow as UTC + TINDER_TZ offset -Parse and send starttime as time + UTC (either set TINDER_START with gmtime or use the most recent bitbake from trunk for having BUILDSTART as UTC time) --- classes/tinderclient.bbclass | 30 +++++++++++++++++++++++++----- conf/tinder.conf | 3 +++ 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index c424797d16..5b55589ec0 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -1,6 +1,26 @@ -def tinder_tinder_time(): - import time - return time.strftime('%m/%d/%Y %H:%M:%S', time.localtime()) +def tinder_tz_offset(off): + # get the offset. Either it is a number like + # +200 or -300 + try: + return int(off) + except ValueError: + if off == "Europe/Berlin": + return 200 + else: + return 0 + +def tinder_tinder_time(offset): + import datetime + td = datetime.timedelta(tinder_tz_offset(offset)) + time = datetime.datetime.utcnow() + td + return time.strftime('%m/%d/%Y %H:%M:%S') + +def tinder_tinder_start(date,offset): + import datetime, time + td = datetime.timedelta(tinder_tz_offset(offset)) + ti = time.strptime(date, "%m/%d/%Y %H:%M:%S") + ti = datetime.datetime(*ti[0:7])-td + return time.strftime('%m/%d/%Y %H:%M:%S') def tinder_send_email(da, header, log): import smtplib @@ -33,11 +53,11 @@ def tinder_prepare_mail_header(da, status): from bb import data str = "tinderbox: administrator: %s\n" % data.getVar('TINDER_ADMIN', da, True) - str += "tinderbox: starttime: %s\n" % data.getVar('BUILDSTART', da, True) or data.getVar('TINDER_START', da, True) + str += "tinderbox: starttime: %s\n" % tinder_tinder_start(data.getVar('TINDER_START', da, True) or data.getVar('BUILDSTART', da, True), data.getVar('TINDER_TZ', da, True)) str += "tinderbox: buildname: %s\n" % data.getVar('TINDER_BUILD', da, True) str += "tinderbox: errorparser: %s\n" % data.getVar('TINDER_ERROR', da, True) str += "tinderbox: status: %s\n" % status - str += "tinderbox: timenow: %s\n" % tinder_tinder_time() + str += "tinderbox: timenow: %s\n" % tinder_tinder_time(data.getVar('TINDER_TZ', da, True)) str += "tinderbox: tree: %s\n" % data.getVar('TINDER_TREE', da, True) str += "tinderbox: buildfamily: %s\n" % "unix" str += "tinderbox: END" diff --git a/conf/tinder.conf b/conf/tinder.conf index 3d65dcb51b..c5d523ff4f 100644 --- a/conf/tinder.conf +++ b/conf/tinder.conf @@ -30,6 +30,9 @@ INHERIT += "tinderclient" #TINDER_SENDLOG = "http" +# TimeZone handling +#TINDER_TZ = "+0200" + # Do a report at all #TINDER_REPORT = "1" -- cgit v1.2.3 From 88e0f529270c88d29b808f32ac97a9fb057fabc1 Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Sat, 30 Jul 2005 19:51:32 +0000 Subject: Add -lgcc_s to perllibs for arm too (already added for armeb), Closes: OE-Bug#113 --- packages/perl/perl-5.8.7/config.sh-arm-linux.patch | 3 ++- packages/perl/perl_5.8.7.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/perl/perl-5.8.7/config.sh-arm-linux.patch b/packages/perl/perl-5.8.7/config.sh-arm-linux.patch index ae162fbdc6..0f56601b8b 100644 --- a/packages/perl/perl-5.8.7/config.sh-arm-linux.patch +++ b/packages/perl/perl-5.8.7/config.sh-arm-linux.patch @@ -17,7 +17,8 @@ perl='' perl_patchlevel='' perladmin='red@criticalintegration.com' - perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' +-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc -lgcc_s' -perlpath='/usr/bin/perl' +perlpath='hostperl' pg='pg' diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index a9daf10e68..7d79105065 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -4,7 +4,7 @@ include perl.inc SRC_URI += "file://config.sh-armeb-linux" -PR = "r6" +PR = "r7" do_configure() { ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl -- cgit v1.2.3