summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/tinderclient.bbclass74
-rw-r--r--conf/machine/zaurus-clamshell-2.4.conf23
-rw-r--r--conf/machine/zaurus-clamshell-2.6.conf20
-rw-r--r--conf/tinder.conf21
-rw-r--r--packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb5
-rw-r--r--packages/opie-taskbar/opie-taskbar/akita/qpe.conf2
-rw-r--r--packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf2
-rw-r--r--packages/opie-taskbar/opie-taskbar/spitz/qpe.conf2
-rw-r--r--packages/opie-taskbar/opie-taskbar/tosa/qpe.conf2
-rw-r--r--packages/t1lib/t1lib_5.0.2.bb2
-rw-r--r--packages/zaurus-updater/akita/updater.sh6
-rw-r--r--packages/zaurus-updater/zaurus-updater.bb2
12 files changed, 94 insertions, 67 deletions
diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass
index 869cd043ba..0c0c470bb8 100644
--- a/classes/tinderclient.bbclass
+++ b/classes/tinderclient.bbclass
@@ -1,24 +1,50 @@
-def base_tinder_time():
+def tinder_tinder_time():
import time
return time.strftime('%m/%d/%Y %H:%M:%S', time.localtime())
+def tinder_send_email(da, header, log):
+ import smtplib
+ from bb import data
+ from email.MIMEText import MIMEText
+ msg = MIMEText(header +'\n' + log)
+ msg['Subject'] = data.getVar('TINDER_SUBJECT',da, True) or "Tinder-Client build log"
+ msg['To'] = data.getVar('TINDER_MAILTO' ,da, True)
+ msg['From'] = data.getVar('TINDER_FROM', da, True)
+
+
+ s = smtplib.SMTP()
+ s.connect()
+ s.sendmail(data.getVar('TINDER_FROM', da, True), [data.getVar('TINDER_MAILTO', da, True)], msg.as_string())
+ s.close()
+
+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" }
+
+ conn = httplib.HTTPConnection(data.getVar('TINDER_HOST',da, True))
+ conn.request("POST", data.getVar('TINDER_URL',da,True), cont, headers)
+ conn.close()
+
+
# Prepare tinderbox mail header
-def base_prepare_mail_header(data, status):
- import bb
+def tinder_prepare_mail_header(da, status):
+ from bb import data
- str = "tinderbox: administrator: %s\n" % bb.data.getVar('TINDER_ADMIN', data, True)
- str += "tinderbox: starttime: %s\n" % bb.data.getVar('TINDER_START', data, True)
- str += "tinderbox: buildname: %s\n" % bb.data.getVar('TINDER_BUILD', data, True)
- str += "tinderbox: errorparser: %s\n" % bb.data.getVar('TINDER_ERROR', data, True)
+ 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: 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" % base_tinder_time()
- str += "tinderbox: tree: %s\n" % bb.data.getVar('TINDER_TREE', data, True)
+ str += "tinderbox: timenow: %s\n" % tinder_tinder_time()
+ str += "tinderbox: tree: %s\n" % data.getVar('TINDER_TREE', da, True)
str += "tinderbox: buildfamily: %s\n" % "unix"
str += "tinderbox: END"
return str
-def base_do_tinder_report(event):
+def tinder_do_tinder_report(event):
"""
Report to the tinderbox. Either we will report every step
(depending on TINDER_VERBOSE_REPORT) at the end we will send the
@@ -36,7 +62,7 @@ def base_do_tinder_report(event):
# Check what we need to do Build* shows we start or are done
if name == "BuildStarted":
- header = base_prepare_mail_header(event.data, 'building')
+ header = tinder_prepare_mail_header(event.data, 'building')
# generate
for var in os.environ:
log += "%s=%s\n" % (var, os.environ[var])
@@ -52,7 +78,7 @@ def base_do_tinder_report(event):
status = 'build_failed'
if name == "BuildCompleted":
status = "success"
- header = base_prepare_mail_header(event.data, status)
+ header = tinder_prepare_mail_header(event.data, status)
# append the log
log_file = data.getVar('TINDER_LOG', event.data, True)
file = open(log_file, 'r')
@@ -60,15 +86,15 @@ def base_do_tinder_report(event):
log += line
if verbose and name == "TaskStarted":
- header = base_prepare_mail_header(event.data, 'building')
+ header = tinder_prepare_mail_header(event.data, 'building')
log = "Task %s started" % event.task
if verbose and name == "PkgStarted":
- header = base_prepare_mail_header(event.data, 'building')
+ header = tinder_prepare_mail_header(event.data, 'building')
log = "Package %s started" % data.getVar('P', event.data, True)
if verbose and name == "PkgSucceeded":
- header = base_prepare_mail_header(event.data, 'building')
+ header = tinder_prepare_mail_header(event.data, 'building')
log = "Package %s done" % data.getVar('P', event.data, True)
# Append the Task Log
@@ -84,7 +110,7 @@ def base_do_tinder_report(event):
# append to the log
if verbose:
- header = base_prepare_mail_header(event.data, 'building')
+ header = tinder_prepare_mail_header(event.data, 'building')
for line in log_txt:
log += line
@@ -92,18 +118,12 @@ def base_do_tinder_report(event):
if len(log) == 0 or len(header) == 0:
return
- import smtplib
- from email.MIMEText import MIMEText
- msg = MIMEText(header +'\n' + log)
- msg['Subject'] = data.getVar('TINDER_SUBJECT',event.data, True) or "Tinder-Client build log"
- msg['To'] = data.getVar('TINDER_MAILTO',event.data, True)
- msg['From'] = data.getVar('TINDER_FROM', event.data, True)
+ log_post_method = tinder_send_email
+ if data.getVar('TINDER_SENDLOG', event.data, True) == "http":
+ log_post_method = tinder_send_http
+ log_post_method(event.data, header, log)
- s = smtplib.SMTP()
- s.connect()
- s.sendmail(data.getVar('TINDER_FROM', event.data, True), [data.getVar('TINDER_MAILTO', event.data, True)], msg.as_string())
- s.close()
addhandler tinderclient_eventhandler
python tinderclient_eventhandler() {
@@ -112,7 +132,7 @@ python tinderclient_eventhandler() {
do_tinder_report = data.getVar('TINDER_REPORT', e.data, True)
if do_tinder_report and do_tinder_report == "1":
- base_do_tinder_report(e)
+ tinder_do_tinder_report(e)
return NotHandled
}
diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf
index 5098b6beea..705dcd1905 100644
--- a/conf/machine/zaurus-clamshell-2.4.conf
+++ b/conf/machine/zaurus-clamshell-2.4.conf
@@ -1,3 +1,6 @@
+# Zaurus Clamshell specific configuration for kernel 2.4
+# Don't forget to include zaurus-clamshell.conf as well
+
PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix"
PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x"
PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x"
@@ -5,22 +8,16 @@ PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x"
# Later versions are broken on kernel 2.4
PREFERRED_VERSION_orinoco-modules = "0.13e"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
-pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin \
-hostap-utils prism3-firmware prism3-support"
-
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
-pcmcia-cs apm apmd ppp wireless-tools irda-utils console-tools \
-hostap-utils prism3-firmware prism3-support"
+BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
+pcmcia-cs apmd wireless-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
+wpa-supplicant-nossl ppp ppp-dialin openswan"
-# Spitz needs minimal bootstrap
-BOOTSTRAP_EXTRA_DEPENDS_spitz = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
-pcmcia-cs apmd wireless-tools irda-utils wpa-supplicant-nossl lrzsz hostap-utils prism3-firmware prism3-support"
-BOOTSTRAP_EXTRA_RDEPENDS_spitz = "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
-pcmcia-cs apmd apm wireless-tools irda-utils hostap-utils prism3-firmware prism3-support"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
+pcmcia-cs apmd apm wireless-tools irda-utils hostap-utils prism3-firmware prism3-support \
+wpa-supplicant-nossl ppp ppp-dialin openswan"
# Misc Modules
-BOOTSTRAP_EXTRA_RDEPENDS += kernel-module-net-fd kernel-module-registers
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers"
# USB Client Modules
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbdcore kernel-module-usbdmonitor"
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf
index 7b6761b250..9b0ef708fa 100644
--- a/conf/machine/zaurus-clamshell-2.6.conf
+++ b/conf/machine/zaurus-clamshell-2.6.conf
@@ -1,14 +1,16 @@
+# Zaurus Clamshell specific configuration for kernel 2.6
+# Don't forget to include zaurus-clamshell.conf as well
PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \
-pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin \
-hostap-utils prism3-firmware prism3-support"
+BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \
+pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
+ppp ppp-dialin openswan wpa-supplicant-nossl"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs \
-pcmcia-cs apm ppp wireless-tools irda-utils udev-utils console-tools \
-hostap-utils prism3-firmware prism3-support"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs \
+pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
+ppp ppp-dialin openswan wpa-supplicant-nossl"
# Ethernet modules
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
@@ -28,7 +30,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \
kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
-#USB Gadget Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \
- kernel-module-g-ether"
+# USB Gadget Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
+ kernel-module-g-serial kernel-module-g-ether"
diff --git a/conf/tinder.conf b/conf/tinder.conf
index 53ad6457ef..3d65dcb51b 100644
--- a/conf/tinder.conf
+++ b/conf/tinder.conf
@@ -10,17 +10,26 @@ INHERIT += "tinderclient"
#What error parser to use
#TINDER_ERROR = "unix"
-#One mail per task
+#One mail/post per task
#TINDER_VERBOSE_REPORT = "1"
#TINDER_LOG = "${TMPDIR}/tinder.log"
-#TINDER_MAILTO = "tinderbox-oe@gmx.net"
+#TINDER_TREE = "OpenEmbeddedBuild"
+
+# Mail posting
#We have fixed procmail rules for the subject
#TINDER_SUBJECT = "OpenEmbedded Tinder Log"
-#TINDER_TREE = "OpenEmbeddedBuild"
-
-#the From: of the report mails
+#TINDER_MAILTO = "tinderbox-oe@gmx.net"
#TINDER_FROM = "you@yourhost"
+
+# HTTP posting
+#TINDER_HOST = "ewi546.ewi.utwente.nl"
+#TINDER_URL = "/OE_qa/cgi-bin/process_builds.cgi"
+
+# Select the submit method http or mail
+#TINDER_SENDLOG = "http"
+
+
+# Do a report at all
#TINDER_REPORT = "1"
-TINDER_START := "${@time.strftime('%m/%d/%Y %H:%M:%S', time.localtime())}"
diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
index a3363d824f..65e01a18f7 100644
--- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
@@ -53,9 +53,8 @@ inherit kernel
#
# Create the kernel command line. CMDLINE_CONSOLE is set through kernel.oeclass.
#
-CMDLINE_MTDPARTS_spitz = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home) EQUIPMENT=0"
-CMDLINE_MTDPARTS_akita = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) EQUIPMENT=4"
-
+CMDLINE_MTDPARTS_spitz = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home) EQUIPMENT=4 RTC_RESET=1"
+CMDLINE_MTDPARTS_akita = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) EQUIPMENT=0"
CMDLINE_ROOT = "root=/dev/mtdblock2 jffs2_orphaned_inodes=delete LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q"
# CMDLINE_INIT = "init=/bin/busybox ash"
CMDLINE_INIT = " "
diff --git a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf
index 3740bfc351..e9922e4d86 100644
--- a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf
+++ b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf
@@ -15,7 +15,7 @@ ButtonText = #000000
Decoration = libliquid.so
Highlight = #52719c
HighlightedText = #ffffff
-Style = libphasestyle.so
+Style = Windows
Text = #000000
TabStyle = 1
[InputMethod]
diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf
index 3740bfc351..e9922e4d86 100644
--- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf
+++ b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf
@@ -15,7 +15,7 @@ ButtonText = #000000
Decoration = libliquid.so
Highlight = #52719c
HighlightedText = #ffffff
-Style = libphasestyle.so
+Style = Windows
Text = #000000
TabStyle = 1
[InputMethod]
diff --git a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf
index 3740bfc351..e9922e4d86 100644
--- a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf
+++ b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf
@@ -15,7 +15,7 @@ ButtonText = #000000
Decoration = libliquid.so
Highlight = #52719c
HighlightedText = #ffffff
-Style = libphasestyle.so
+Style = Windows
Text = #000000
TabStyle = 1
[InputMethod]
diff --git a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf
index 3740bfc351..e9922e4d86 100644
--- a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf
+++ b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf
@@ -15,7 +15,7 @@ ButtonText = #000000
Decoration = libliquid.so
Highlight = #52719c
HighlightedText = #ffffff
-Style = libphasestyle.so
+Style = Windows
Text = #000000
TabStyle = 1
[InputMethod]
diff --git a/packages/t1lib/t1lib_5.0.2.bb b/packages/t1lib/t1lib_5.0.2.bb
index 98b82a3a6b..95df45011b 100644
--- a/packages/t1lib/t1lib_5.0.2.bb
+++ b/packages/t1lib/t1lib_5.0.2.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
PR = "r2"
LICENSE = "LGPL GPL"
-SRC_URI = "ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-${PV}.tar.gz \
+SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \
file://configure.patch;patch=1 \
file://install.patch;patch=1 \
file://libtool.patch;patch=1"
diff --git a/packages/zaurus-updater/akita/updater.sh b/packages/zaurus-updater/akita/updater.sh
index 5940ed30ce..5399e5254e 100644
--- a/packages/zaurus-updater/akita/updater.sh
+++ b/packages/zaurus-updater/akita/updater.sh
@@ -198,9 +198,9 @@ do
DATAPOS=`expr $DATAPOS + $TMPSIZE`
#handle data file
- echo 'ADDR='$ADDR
- echo 'SIZE='$TMPSIZE
- echo 'TMPDATA='$TMPDATA
+ #echo 'ADDR='$ADDR
+ #echo 'SIZE='$TMPSIZE
+ #echo 'TMPDATA='$TMPDATA
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`
diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index 5e170f1cb0..c4db1055d5 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 = "r1"
+PR = "r2"
SRC_URI = "file://updater.sh"
S = "${WORKDIR}"
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-26 16:46:51 +0000