summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2005-07-30 21:02:51 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-30 21:02:51 +0000
commitdb73bdddcba33027c35cf6f8910fa0b00e23eb96 (patch)
tree50ecb4f4d7912ff781db9d68d9280479aee4a4cf
parent0f23819ddca7eb0894efb2a85f4a4f39bd48c617 (diff)
parent82eca06c34e4483962439a7e363e1c299cc1c59e (diff)
merge of bd5f9b1ebde1d70cbb0331d6fe4e949ecb9eeb50
and d5c1c82a4f4d4259c9ae9a22865774bf9df663ca
-rw-r--r--classes/tinderclient.bbclass40
-rw-r--r--conf/distro/openslug-packages.conf3
-rw-r--r--conf/tinder.conf5
-rw-r--r--packages/at76c503a/at76c503a-modules/.mtn2git_empty (renamed from packages/linux/linux-openzaurus-2.6.13-rc3-mm1/.mtn2git_empty)0
-rw-r--r--packages/at76c503a/at76c503a-modules/makefile.cc.patch11
-rw-r--r--packages/at76c503a/at76c503a-modules_cvs.bb7
-rw-r--r--packages/base-files/base-files/profile6
-rw-r--r--packages/base-files/base-files_3.0.14.bb2
-rw-r--r--packages/dbus/dbus/dbus-1.init87
-rw-r--r--packages/ipkg/ipkg-native.inc12
-rw-r--r--packages/ipkg/ipkg.inc51
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty0
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-elpp-stuff.patch (renamed from packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-elpp-stuff.patch)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-oz-release-string.patch (renamed from packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-oz-release-string.patch)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-c7x0 (renamed from packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-c7x0)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-collie (renamed from packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-collie)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-ipaq-pxa-2.6 (renamed from packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-ipaq-pxa-2.6)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-poodle (renamed from packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-poodle)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-spitz (renamed from packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-spitz)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-tosa (renamed from packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-tosa)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-rc3-mm3/dtl1_cs-add-socket-revE.patch (renamed from packages/linux/linux-openzaurus-2.6.13-rc3-mm1/dtl1_cs-add-socket-revE.patch)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-rc3-mm3/pxa-serial-hack.patch (renamed from packages/linux/linux-openzaurus-2.6.13-rc3-mm1/pxa-serial-hack.patch)0
-rw-r--r--packages/linux/linux-openzaurus_2.6.11.bb34
-rw-r--r--packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb (renamed from packages/linux/linux-openzaurus_2.6.13-rc3-mm1.bb)13
-rw-r--r--packages/meta/openslug-native.bb3
-rw-r--r--packages/meta/openslug-packages.bb2
-rw-r--r--packages/perl/perl-5.8.7/config.sh-arm-linux.patch3
-rw-r--r--packages/perl/perl_5.8.7.bb8
28 files changed, 216 insertions, 71 deletions
diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass
index 5de9b8755a..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
@@ -21,8 +41,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()
@@ -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"
@@ -76,8 +96,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 +140,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)
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index e4da231aa5..5972afdbf0 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -19,6 +19,8 @@ ${PKGDIR}/packages/bzip2/*.bb \
${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 \
@@ -92,6 +94,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 \
diff --git a/conf/tinder.conf b/conf/tinder.conf
index 3d65dcb51b..2c50b62a17 100644
--- a/conf/tinder.conf
+++ b/conf/tinder.conf
@@ -12,7 +12,7 @@ INHERIT += "tinderclient"
#One mail/post per task
#TINDER_VERBOSE_REPORT = "1"
-#TINDER_LOG = "${TMPDIR}/tinder.log"
+#TINDER_LOG = "${TMPbDIR}/tinder.log"
#TINDER_TREE = "OpenEmbeddedBuild"
@@ -30,6 +30,9 @@ INHERIT += "tinderclient"
#TINDER_SENDLOG = "http"
+# TimeZone handling
+#TINDER_TZ = "+0200"
+
# Do a report at all
#TINDER_REPORT = "1"
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/.mtn2git_empty b/packages/at76c503a/at76c503a-modules/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/.mtn2git_empty
+++ b/packages/at76c503a/at76c503a-modules/.mtn2git_empty
diff --git a/packages/at76c503a/at76c503a-modules/makefile.cc.patch b/packages/at76c503a/at76c503a-modules/makefile.cc.patch
new file mode 100644
index 0000000000..c7a41990d3
--- /dev/null
+++ b/packages/at76c503a/at76c503a-modules/makefile.cc.patch
@@ -0,0 +1,11 @@
+--- at76c503a/Makefile.old 2005-07-29 21:57:34.000000000 +0200
++++ at76c503a/Makefile 2005-07-29 21:57:43.000000000 +0200
+@@ -9,7 +9,7 @@
+ # the License, or (at your option) any later version.
+ #
+
+-CC=gcc
++#CC=gcc
+
+ ifneq (,$(KVERS))
+ KERNEL_VERSION=$(KVERS)
diff --git a/packages/at76c503a/at76c503a-modules_cvs.bb b/packages/at76c503a/at76c503a-modules_cvs.bb
index 9673e5fb1b..8f11aeeff3 100644
--- a/packages/at76c503a/at76c503a-modules_cvs.bb
+++ b/packages/at76c503a/at76c503a-modules_cvs.bb
@@ -1,14 +1,15 @@
SECTION = "base"
LICENSE = "GPL"
-SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a"
+SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \
+ file://makefile.cc.patch;patch=1"
S = "${WORKDIR}/at76c503a"
PR = "r1"
PV = "0.0cvs${CVSDATE}"
inherit module
-MODULES = "at76c503.o at76_usbdfu.o at76c503-i3861.o at76c503-rfmd.o at76c503-rfmd-acc.o \
- at76c505-rfmd.o at76c503-i3863.o at76c505-rfmd2958.o"
+MODULES = "at76c503.ko at76_usbdfu.ko at76c503-i3861.ko at76c503-rfmd.ko at76c503-rfmd-acc.ko \
+ at76c505-rfmd.ko at76c503-i3863.ko at76c505-rfmd2958.ko"
pkg_postinst() {
#!/bin/sh
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 = " \
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 <walters@debian.org>
+# Copyright © 2003 Colin Walters <walters@debian.org>
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
diff --git a/packages/ipkg/ipkg-native.inc b/packages/ipkg/ipkg-native.inc
new file mode 100644
index 0000000000..b52b7b5e20
--- /dev/null
+++ b/packages/ipkg/ipkg-native.inc
@@ -0,0 +1,12 @@
+# NOTE: ipkg now obeys ${libdir}, so ipkg-native now installs
+# things into the wrong location inside of offline_root. Backup
+# the target libdir and use that.
+target_libdir := "${libdir}"
+
+inherit native
+
+EXTRA_OECONF += "--with-ipkgdir=${target_libdir}/ipkg"
+
+DEPENDS = "libtool-native automake-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}"
+PROVIDES = ""
diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc
new file mode 100644
index 0000000000..f535cfbef0
--- /dev/null
+++ b/packages/ipkg/ipkg.inc
@@ -0,0 +1,51 @@
+DESCRIPTION = "Itsy Package Manager"
+DESCRIPTION_libipkg = "Itsy Package Manager Library"
+SECTION = "base"
+LICENSE = "GPL"
+PROVIDES = "virtual/ipkg libipkg"
+
+PACKAGES =+ "libipkg-dev libipkg"
+FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
+FILES_libipkg = "${libdir}"
+AUTO_LIBNAME_PKGS = "libipkg"
+
+SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+ file://terse.patch;patch=1"
+
+S = "${WORKDIR}/ipkg/C"
+
+inherit autotools pkgconfig
+
+pkg_postinst_ipkg () {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+ install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
+ # this happens at S98 where our good 'ole packages script used to run
+ echo -e "#!/bin/sh
+ipkg-cl configure
+" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+ chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+fi
+
+update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
+}
+
+pkg_postrm_ipkg () {
+#!/bin/sh
+update-alternatives --remove ipkg ${bindir}/ipkg-cl
+}
+
+do_stage() {
+ oe_libinstall -so libipkg ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/replace/
+ install -m 0644 replace/replace.h ${STAGING_INCDIR}/replace/
+ install -d ${STAGING_INCDIR}/libipkg/
+ for f in *.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/libipkg/
+ done
+}
+
+#
+# FIXME: Install /etc/ipkg.conf and /etc/ipkg/arch.conf
+#
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-elpp-stuff.patch
index 85d07191b9..85d07191b9 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-elpp-stuff.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-elpp-stuff.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-oz-release-string.patch
index 22a6fd3943..22a6fd3943 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-oz-release-string.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-c7x0
index b993f2ac26..b993f2ac26 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-c7x0
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-collie b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-collie
index 9f51b61169..9f51b61169 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-collie
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-ipaq-pxa-2.6 b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-ipaq-pxa-2.6
index 8b41380784..8b41380784 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-ipaq-pxa-2.6
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-ipaq-pxa-2.6
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-poodle
index 42a851dd5f..42a851dd5f 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-poodle
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-spitz
index ed5010d5c8..ed5010d5c8 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-spitz
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-spitz
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-tosa
index c7eba4a337..c7eba4a337 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-tosa
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/dtl1_cs-add-socket-revE.patch
index a2dbce3325..a2dbce3325 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/dtl1_cs-add-socket-revE.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/dtl1_cs-add-socket-revE.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/pxa-serial-hack.patch
index ee761b75ad..ee761b75ad 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/pxa-serial-hack.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/pxa-serial-hack.patch
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 \
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc3-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb
index 4f764c7803..2c7042c7ca 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc3-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r2"
+PR = "r0"
DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -23,10 +23,9 @@ BASRC = "http://www.orca.cx/zaurus/patches"
# Patches submitted upstream are towards top of this list
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc3.bz2;patch=1 \
- ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm1/2.6.13-rc3-mm1.bz2;patch=1 \
- ${RPSRC}/nand_softlockup-r0.patch;patch=1 \
- ${RPSRC}/oprofile_irqfix-r0.patch;patch=1 \
- ${RPSRC}/preempt_nwfpe-r1.patch;patch=1 \
+ ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm3/2.6.13-rc3-mm3.bz2;patch=1 \
+ ${RPSRC}/2.6.13-rc3-mm3_fix-r0.patch;patch=1 \
+ ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \
${RPSRC}/oprofile_typo-r0.patch;patch=1 \
${RPSRC}/corgi_tspmu-r2.patch;patch=1 \
${RPSRC}/w100_core-r1.patch;patch=1 \
@@ -52,7 +51,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \
${RPSRC}/spitz_mtd-r0.patch;patch=1 \
${RPSRC}/ipaq/hx2750_base-r19.patch;patch=1 \
- ${RPSRC}/ipaq/hx2750_bl-r0.patch;patch=1 \
+ ${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \
${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \
${RPSRC}/ipaq/pxa_keys-r1.patch;patch=1 \
${RPSRC}/ipaq/tsc2101-r7.patch;patch=1 \
@@ -70,7 +69,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
${DOSRC}/tosa-udc-r3.patch;patch=1 \
${DOSRC}/tosa-irda-r2.patch;patch=1 \
${DOSRC}/tosa-lcd-r3.patch;patch=1 \
- ${DOSRC}/tosa-bl-r4.patch;patch=1 \
+ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
file://add-oz-release-string.patch;patch=1 \
file://add-elpp-stuff.patch;patch=1 \
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 \
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 96d81e1d31..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 \
@@ -70,6 +71,7 @@ OPENSLUG_PACKAGES = "\
mutt \
mysql \
nail \
+ nano \
ncftp \
obexftp openobex openobex-apps ircp \
openssh \
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 dc457b43ff..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 = "r4"
+PR = "r7"
do_configure() {
ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl
@@ -32,3 +32,9 @@ do_install_append() {
ln -s libperl.so.${PV} ${D}/${libdir}/libperl.so.5
}
+# 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"