summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/bluez/bluez-libs_2.24.bb22
-rw-r--r--packages/bluez/bluez-utils-dbus-2.24/.mtn2git_empty0
-rw-r--r--packages/bluez/bluez-utils-dbus-2.24/dbus.patch53
-rw-r--r--packages/bluez/bluez-utils-dbus_2.20.bb1
-rw-r--r--packages/bluez/bluez-utils-dbus_2.21.bb1
-rw-r--r--packages/bluez/bluez-utils-dbus_2.24.bb7
-rw-r--r--packages/bluez/bluez-utils-nodbus_2.20.bb1
-rw-r--r--packages/bluez/bluez-utils-nodbus_2.21.bb1
-rw-r--r--packages/bluez/bluez-utils.inc1
-rw-r--r--packages/dbus/dbus_0.60.inc1
-rw-r--r--packages/gnome/gconf-dbus_svn.bb75
-rw-r--r--packages/hostap/files/hostap_cs.conf-upstream191
-rw-r--r--packages/hostap/hostap-conf_1.0.bb15
-rw-r--r--packages/hostap/hostap-modules_0.3.7.bb5
-rw-r--r--packages/hostap/hostap-modules_0.3.9.bb5
-rw-r--r--packages/hostap/hostap-modules_0.4.4.bb5
-rw-r--r--packages/linux/linux-openzaurus.inc5
-rw-r--r--packages/meta/meta-opie.bb211
-rw-r--r--packages/meta/opie-image.bb6
-rw-r--r--packages/meta/task-opie.bb174
-rw-r--r--packages/samba/samba_3.0.20.bb2
21 files changed, 561 insertions, 221 deletions
diff --git a/packages/bluez/bluez-libs_2.24.bb b/packages/bluez/bluez-libs_2.24.bb
new file mode 100644
index 0000000000..d740bd80a9
--- /dev/null
+++ b/packages/bluez/bluez-libs_2.24.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland Libaries."
+SECTION = "libs"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.bluez.org"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h"
+
+do_stage() {
+ oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
+
+ install -d ${STAGING_INCDIR}/bluetooth/
+ for f in ${HEADERS}
+ do
+ install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f
+ done
+}
diff --git a/packages/bluez/bluez-utils-dbus-2.24/.mtn2git_empty b/packages/bluez/bluez-utils-dbus-2.24/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bluez/bluez-utils-dbus-2.24/.mtn2git_empty
diff --git a/packages/bluez/bluez-utils-dbus-2.24/dbus.patch b/packages/bluez/bluez-utils-dbus-2.24/dbus.patch
new file mode 100644
index 0000000000..d8ec946a0b
--- /dev/null
+++ b/packages/bluez/bluez-utils-dbus-2.24/dbus.patch
@@ -0,0 +1,53 @@
+--- bluez-utils-2.24/acinclude.m4.orig 2006-01-12 08:21:38.000000000 +0100
++++ bluez-utils-2.24/acinclude.m4 2006-01-12 08:23:18.000000000 +0100
+@@ -131,46 +131,15 @@
+ ])
+
+ AC_DEFUN([AC_PATH_DBUS], [
+- dbus_prefix=${prefix}
+-
+- AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus=DIR], [D-BUS library is installed in DIR]), [
+- if (test "${withval}" != "yes"); then
+- dbus_prefix=${withval}
+- fi
+- ])
+-
+- ac_save_CPPFLAGS=$CPPFLAGS
+- ac_save_LDFLAGS=$LDFLAGS
+-
+- DBUS_CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE"
+- test -d "${dbus_prefix}/include/dbus-1.0" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/include/dbus-1.0"
+- if (test "${prefix}" = "${bluez_prefix}"); then
+- test -d "${libdir}/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${libdir}/dbus-1.0/include"
+- else
+- test -d "${dbus_prefix}/lib64/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib64/dbus-1.0/include"
+- test -d "${dbus_prefix}/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib/dbus-1.0/include"
+- fi
++ if pkg-config --exists dbus-1; then
++ dbus_found=yes ; DBUS_CFLAGS="`pkg-config --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
++ DBUS_LIBS="`pkg-config --libs dbus-1`"
+
+ CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
+- AC_CHECK_HEADER(dbus/dbus.h, dbus_found=yes, dbus_found=no)
+-
+- DBUS_LIBS=""
+- if (test "${prefix}" = "${dbus_prefix}"); then
+- test -d "${libdir}" && DBUS_LIBS="$DBUS_LIBS -L${libdir}"
+- else
+- test -d "${dbus_prefix}/lib64" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib64"
+- test -d "${dbus_prefix}/lib" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib"
+- fi
+-
+ LDFLAGS="$LDFLAGS $DBUS_LIBS"
+- AC_CHECK_LIB(dbus-1, dbus_error_init, DBUS_LIBS="$DBUS_LIBS -ldbus-1", dbus_found=no)
+- AC_CHECK_LIB(dbus-1, dbus_message_iter_get_basic, dummy=yes, dbus_found=no)
+-
+- CPPFLAGS=$ac_save_CPPFLAGS
+- LDFLAGS=$ac_save_LDFLAGS
+-
+ AC_SUBST(DBUS_CFLAGS)
+ AC_SUBST(DBUS_LIBS)
++ fi
+ ])
+
+ AC_DEFUN([AC_PATH_FUSE], [
diff --git a/packages/bluez/bluez-utils-dbus_2.20.bb b/packages/bluez/bluez-utils-dbus_2.20.bb
index 3a9baf4ebc..ca3b110d48 100644
--- a/packages/bluez/bluez-utils-dbus_2.20.bb
+++ b/packages/bluez/bluez-utils-dbus_2.20.bb
@@ -5,6 +5,7 @@ PR = "r9"
DEPENDS += "dbus"
SRC_URI += "file://dbus.patch;patch=1 \
file://smash.patch;patch=1 \
+ file://hciattach_devlength.patch;patch=1 \
file://hcid-alignment-fix.patch;patch=1"
EXTRA_OECONF += "--with-dbus"
diff --git a/packages/bluez/bluez-utils-dbus_2.21.bb b/packages/bluez/bluez-utils-dbus_2.21.bb
index 7eeb0a269a..bfd3994c24 100644
--- a/packages/bluez/bluez-utils-dbus_2.21.bb
+++ b/packages/bluez/bluez-utils-dbus_2.21.bb
@@ -5,5 +5,6 @@ PR = "r3"
DEPENDS += "dbus"
SRC_URI += "file://dbus.patch;patch=1 \
file://smash.patch;patch=1 \
+ file://hciattach_devlength.patch;patch=1 \
file://hcid-alignment-fix.patch;patch=1"
EXTRA_OECONF += "--with-dbus"
diff --git a/packages/bluez/bluez-utils-dbus_2.24.bb b/packages/bluez/bluez-utils-dbus_2.24.bb
new file mode 100644
index 0000000000..c05208a024
--- /dev/null
+++ b/packages/bluez/bluez-utils-dbus_2.24.bb
@@ -0,0 +1,7 @@
+include bluez-utils.inc
+
+PR = "r0"
+
+DEPENDS += "dbus"
+SRC_URI += "file://dbus.patch;patch=1"
+EXTRA_OECONF += "--with-dbus"
diff --git a/packages/bluez/bluez-utils-nodbus_2.20.bb b/packages/bluez/bluez-utils-nodbus_2.20.bb
index 2abe49aab3..3c47a030b2 100644
--- a/packages/bluez/bluez-utils-nodbus_2.20.bb
+++ b/packages/bluez/bluez-utils-nodbus_2.20.bb
@@ -2,5 +2,6 @@ include bluez-utils.inc
PR = "r1"
+SRC_URI += "file://hciattach_devlength.patch;patch=1"
EXTRA_OECONF += "--without-dbus"
diff --git a/packages/bluez/bluez-utils-nodbus_2.21.bb b/packages/bluez/bluez-utils-nodbus_2.21.bb
index 774549be3d..43c06a9587 100644
--- a/packages/bluez/bluez-utils-nodbus_2.21.bb
+++ b/packages/bluez/bluez-utils-nodbus_2.21.bb
@@ -2,4 +2,5 @@ include bluez-utils.inc
PR = "r1"
+SRC_URI += "file://hciattach_devlength.patch;patch=1"
EXTRA_OECONF += "--without-dbus"
diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc
index 9fddc5f759..5babed48dc 100644
--- a/packages/bluez/bluez-utils.inc
+++ b/packages/bluez/bluez-utils.inc
@@ -8,7 +8,6 @@ LICENSE = "GPL"
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://base.patch;patch=1 \
file://blueboxes.patch;patch=1 \
- file://hciattach_devlength.patch;patch=1 \
file://hcid.conf \
file://bluetooth.default \
file://bluetooth.conf "
diff --git a/packages/dbus/dbus_0.60.inc b/packages/dbus/dbus_0.60.inc
index 094a9b68d6..70546ed5b1 100644
--- a/packages/dbus/dbus_0.60.inc
+++ b/packages/dbus/dbus_0.60.inc
@@ -4,7 +4,6 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
DESCRIPTION = "message bus system for applications to talk to one another"
LICENSE = "GPL"
DEPENDS = "expat glib-2.0 virtual/libintl"
-DEFAULT_PREFERENCE = "-1"
SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
file://cross.patch;patch=1 \
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
new file mode 100644
index 0000000000..6199d2fde2
--- /dev/null
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -0,0 +1,75 @@
+SECTION = "x11/utils"
+DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt"
+DESCRIPTION = "Settings daemon using DBUS for communication."
+LICENSE = "GPL"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+PROVIDES = "gconf"
+RPROVIDES_${PN} = "gconf"
+RPROVIDES_${PN}-dev = "gconf-dev"
+
+PV = "0.0+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
+ file://gconf-dbus-update.patch;patch=1;pnum=0 \
+ file://69gconfd-dbus"
+
+inherit pkgconfig autotools
+S = "${WORKDIR}/trunk"
+
+FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
+
+EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
+
+HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
+
+do_stage() {
+ oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/gconf/2/gconf/
+ ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
+ install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+}
+
+do_install_append () {
+ install -d ${D}/${sysconfdir}/X11/Xsession.d
+ install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
+ install -d ${D}/${datadir}/dbus-1.0/services/
+ install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
+}
+SECTION = "x11/utils"
+DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt"
+DESCRIPTION = "Settings daemon using DBUS for communication."
+LICENSE = "GPL"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+PROVIDES = "gconf"
+RPROVIDES_${PN} = "gconf"
+RPROVIDES_${PN}-dev = "gconf-dev"
+
+PV = "0.0svn${CVSDATE}"
+PR = "r8"
+
+SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus/branches;module=dbus-0-23-branch;proto=http \
+ file://69gconfd-dbus"
+
+inherit pkgconfig autotools
+S = "${WORKDIR}/dbus-0-23-branch"
+
+FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
+
+EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
+
+HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
+
+do_stage() {
+ oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/gconf/2/gconf/
+ ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
+ install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+}
+
+do_install_append () {
+ install -d ${D}/${sysconfdir}/X11/Xsession.d
+ install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
+ install -d ${D}/${datadir}/dbus-1.0/services/
+ install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
+}
diff --git a/packages/hostap/files/hostap_cs.conf-upstream b/packages/hostap/files/hostap_cs.conf-upstream
new file mode 100644
index 0000000000..5b7385a7cb
--- /dev/null
+++ b/packages/hostap/files/hostap_cs.conf-upstream
@@ -0,0 +1,191 @@
+device "hostap_cs"
+ class "network" module "hostap", "hostap_cs"
+
+card "Intersil PRISM2 Reference Design 11Mb/s WLAN Card"
+ version "INTERSIL", "HFA384x/IEEE"
+ bind "hostap_cs"
+
+card "Compaq WL100 11Mb/s WLAN Card"
+ manfid 0x0138, 0x0002
+ bind "hostap_cs"
+
+card "Compaq WL200"
+ version "Compaq", "WL200_11Mbps_Wireless_PCI_Card"
+ bind "hostap_cs"
+
+card "EMTAC A2424i 11Mbps WLAN Card"
+ manfid 0xc250, 0x0002
+# cis "cis/Emtac.dat"
+ bind "hostap_cs"
+
+card "Linksys WPC11 11Mbps WLAN Card"
+ version "Instant Wireless ", " Network PC CARD", "Version 01.02"
+ bind "hostap_cs"
+
+card "Linksys WPC11 Ver 2.5 11Mbps WLAN Card"
+ manfid 0x0274, 0x1612
+ bind "hostap_cs"
+
+card "Linksys WPC11 Ver 3 11Mbps WLAN Card"
+ manfid 0x0274, 0x1613
+ bind "hostap_cs"
+
+card "Linksys WCF12 Wireless CompactFlash Card"
+ version "Linksys", "Wireless CompactFlash Card"
+ bind "hostap_cs"
+
+card "D-Link DWL-650 11Mbps WLAN Card"
+ version "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02"
+ bind "hostap_cs"
+
+card "D-Link DRC-650 11Mbps WLAN Card"
+# version "D", "Link DRC-650 11Mbps WLAN Card", "Version 01.02"
+ manfid 0x028a, 0x0002
+ bind "hostap_cs"
+
+card "ZoomAir 4100 11Mb/s WLAN Card"
+ version "ZoomAir 11Mbps High", "Rate wireless Networking"
+ bind "hostap_cs"
+
+card "Addtron AWP-100 11Mbps WLAN Card"
+ version "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02"
+ bind "hostap_cs"
+
+card "Samsung SWL2000-N 11Mb/s WLAN Card"
+ manfid 0x0250, 0x0002
+ bind "hostap_cs"
+
+card "SMC 2632W 11Mbps WLAN Card"
+ version "SMC", "SMC2632W", "Version 01.02"
+ bind "hostap_cs"
+
+card "BroMax Freeport 11Mbps WLAN Card"
+ version "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P", "Eval-RevA"
+ bind "hostap_cs"
+
+card "Z-Com XI300 11Mb/s WLAN Card"
+ manfid 0xd601, 0x0002
+ bind "hostap_cs"
+
+card "Zcomax XI-325H 200mW"
+# version " ", "IEEE 802.11 Wireless LAN/PC Card"
+ manfid 0xd601, 0x0005
+ bind "hostap_cs"
+
+card "3Com AirConnect PCI 777A"
+ manfid 0x0101, 0x0777
+ bind "hostap_cs"
+
+card "U.S. Robotics IEEE 802.11b PC-CARD"
+ version "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02"
+# manfid 0x0156, 0x0002
+ bind "hostap_cs"
+
+card "Longshine LCR-8531 11Mbps WLAN PCMCIA CARD"
+ version "OEM", "PRISM2 IEEE 802.11 PC-Card", "Version 01.02"
+# manfid 0x0156, 0x0002
+ bind "hostap_cs"
+
+card "Philips 802.11b WLAN PCMCIA"
+ manfid 0x000b, 0x7300
+ bind "hostap_cs"
+
+card "Proxim RangeLAN"
+# version "PROXIM", "RangeLAN-DS/LAN PC CARD"
+ manfid 0x0126, 0x8000
+ bind "hostap_cs"
+
+card "Buffalo WLI-CF-S11G"
+ version "BUFFALO", "WLI-CF-S11G"
+# manfid 0x026f, 0x030b
+ bind "hostap_cs"
+
+card "Level-One WPC-0100"
+ version "Digital Data Communications", "WPC-0100", "Version 00.00"
+ manfid 0x0156, 0x0002
+ bind "hostap_cs"
+
+card "Belkin 802.11b WLAN PCMCIA"
+ version "Belkin", "11Mbps Wireless Notebook Network Adapter", "Version 01.02"
+ manfid 0x0156, 0x0002
+ bind "hostap_cs"
+
+card "Senao SL-2011CD/SL-2011CDPLUS"
+ version "INTERSIL", "HFA384x/IEEE", "Version 01.02"
+ manfid 0x0156, 0x0002
+ bind "hostap_cs"
+
+card "Fulbond Airbond XI-300B"
+ version " ", "IEEE 802.11 Wireless LAN/PC Card"
+ manfid 0xd601, 0x0002
+ bind "hostap_cs"
+
+card "Netgear MA401"
+ version "NETGEAR MA401 Wireless PC", "Card", "Version 01.00"
+# manfid 0x0156, 0x0002
+ bind "hostap_cs"
+
+card "D-Link DWL-650 Rev. P1"
+ version "D-Link", "DWL-650 Wireless PC Card RevP", "ISL37101P-10", "A3"
+# manfid 0x000b, 0x7110
+ bind "hostap_cs"
+
+card "SonicWALL Long Range Wireless Card"
+ version "SonicWALL", "Long Range Wireless Card", "ISL37100P", "1.0"
+ manfid 0x000b, 0x7100
+ bind "hostap_cs"
+
+card "Senao NL-2011CD PLUS Ext2 Mercury"
+ version "WLAN", "11Mbps_PC-Card_3.0", "ISL37100P", "Eval-RevA"
+ manfid 0x000b, 0x7100
+ bind "hostap_cs"
+
+card "Airvast WL100"
+ version "AIRVAST", "IEEE 802.11b Wireless PCMCIA Card", "HFA3863"
+ manfid 0x50c2, 0x0001
+ bind "hostap_cs"
+
+card "Microsoft Wireless Notebook Adapter MN-520 1.0.3"
+ version "Microsoft", "Wireless Notebook Adapter MN-520", "", "1.0.3"
+ manfid 0x02d2, 0x0001
+ bind "hostap_cs"
+
+card "NETGEAR MA401RA"
+ version "NETGEAR MA401RA Wireless PC", "Card", "ISL37300P", "Eval-RevA"
+ manfid 0x000b, 0x7300
+ bind "hostap_cs"
+
+card "Allied Telesyn AT-WCL452"
+ version "Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio", "Ver. 1.00"
+ manfid 0xc00f, 0x0000
+ bind "hostap_cs"
+
+card "corega WL PCCL-11"
+ version "corega", "WL PCCL-11", "ISL37300P", "RevA"
+ manfid 0xc00f, 0x0000
+ bind "hostap_cs"
+
+card "SanDisk ConnectPlus"
+ version "SanDisk", "ConnectPlus"
+ manfid 0xd601, 0x0101
+ bind "hostap_cs" to 0
+ bind "ide-cs" to 1
+
+card "ASUS WL-100 8011b WLAN PC Card"
+ version "ASUS", "802_11b_PC_CARD_25", "Version 01.00"
+ manfid 0x02aa, 0x0002
+ bind "hostap_cs"
+
+card "ZyXel Zyair B-101 802.11b WLAN card"
+ version " ", "IEEE 802.11 Wireless LAN/PC Card"
+ manfid 0xd601, 0x0010
+ bind "hostap_cs"
+
+card "WLAN PRISM PCMCIA CARD 37300P RevB6"
+ version "WLAN", "PRISM PCMCIA CARD", "37300P", "Revision B6"
+ manfid 0x50c2, 0x7300
+ bind "hostap_cs"
+
+
+# Optional configuration parameters for hostap_cs.o
+# module "hostap_cs" opts "channel=3 iw_mode=3 essid=test ignore_cis_vcc=0"
diff --git a/packages/hostap/hostap-conf_1.0.bb b/packages/hostap/hostap-conf_1.0.bb
new file mode 100644
index 0000000000..6c9cb09e60
--- /dev/null
+++ b/packages/hostap/hostap-conf_1.0.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "PCMCIA-cs configuration files for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PACKAGE_ARCH = "all"
+PR = "r0"
+
+SRC_URI = "file://hostap_cs.conf \
+ file://hostap_cs.conf-upstream"
+
+do_install() {
+ install -d ${D}${sysconfdir}/pcmcia
+ install -m 0644 ${WORKDIR}/hostap_cs.conf-upstream ${D}${sysconfdir}/pcmcia/hostap_cs.conf
+ cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf
+}
diff --git a/packages/hostap/hostap-modules_0.3.7.bb b/packages/hostap/hostap-modules_0.3.7.bb
index 81ce9358b9..0beb792c0d 100644
--- a/packages/hostap/hostap-modules_0.3.7.bb
+++ b/packages/hostap/hostap-modules_0.3.7.bb
@@ -3,8 +3,8 @@ SECTION = "kernel/modules"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PROVIDES = "virtual/kernel-hostap"
-PR = "r5"
+PROVIDES = "virtual/kernel-hostap hostap-conf"
+PR = "r6"
SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
file://hostap_cs.conf \
@@ -44,3 +44,4 @@ FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNE
FILES_hostap-modules = "/lib/modules/"
RDEPENDS_hostap-modules-cs = "hostap-modules"
RDEPENDS_hostap-modules-pci = "hostap-modules"
+RPROVIDES_hostap-modules-cs = "hostap-conf"
diff --git a/packages/hostap/hostap-modules_0.3.9.bb b/packages/hostap/hostap-modules_0.3.9.bb
index 93ab8a595d..940b23863b 100644
--- a/packages/hostap/hostap-modules_0.3.9.bb
+++ b/packages/hostap/hostap-modules_0.3.9.bb
@@ -3,8 +3,8 @@ SECTION = "kernel/modules"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PROVIDES = "virtual/kernel-hostap"
-PR = "r7"
+PROVIDES = "virtual/kernel-hostap hostap-conf"
+PR = "r8"
SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
file://hostap_cs.conf \
@@ -45,3 +45,4 @@ FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNE
FILES_hostap-modules = "/lib/modules/"
RDEPENDS_hostap-modules-cs = "hostap-modules"
RDEPENDS_hostap-modules-pci = "hostap-modules"
+RPROVIDES_hostap-modules-cs = "hostap-conf"
diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb
index 678dec3857..32d282446c 100644
--- a/packages/hostap/hostap-modules_0.4.4.bb
+++ b/packages/hostap/hostap-modules_0.4.4.bb
@@ -3,8 +3,8 @@ SECTION = "kernel/modules"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PROVIDES = "virtual/kernel-hostap"
-PR = "r3"
+PROVIDES = "virtual/kernel-hostap hostap-conf"
+PR = "r4"
SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
file://kernel_updates.patch;patch=1 \
@@ -43,3 +43,4 @@ FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNE
FILES_hostap-modules = "/lib/modules/"
RDEPENDS_hostap-modules-cs = "hostap-modules"
RDEPENDS_hostap-modules-pci = "hostap-modules"
+RPROVIDES_hostap-modules-cs = "hostap-conf"
diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc
index 7b7a6e72f2..2fc6f58007 100644
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-openzaurus.inc
@@ -25,7 +25,8 @@ CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2"
CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw"
CMDLINE_ROOT_borzoi = "root=/dev/hda1 rootfstype=ext3 rw"
-CMDLINE_OTHER = "dyntick=enable debug"
+CMDLINE_OTHER = "dyntick=enable"
+CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
##############################################################
# Configure memory/ramdisk split for collie
@@ -37,7 +38,7 @@ CMDLINE_MEM_collie = "mem=${mem}M"
CMDLINE_ROTATE_spitz = "fbcon=rotate:1"
CMDLINE_ROTATE_akita = "fbcon=rotate:1"
CMDLINE_ROTATE_borzoi = "fbcon=rotate:1"
-CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER}"
+CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"
###############################################################
# Enable or disable ELPP via local.conf - default is "no"
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 30f3358d8f..eafd34aae8 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -1,11 +1,13 @@
DESCRIPTION = "Meta-package for Opie"
SECTION = "opie/base"
ALLOW_EMPTY = 1
-PR = "r33"
+PR = "r34"
PACKAGE_ARCH = "all"
LICENSE = "MIT"
+BUILD_ALL_DEPS=1
-PACKAGES = "task-opie-applets task-opie-apps task-opie-base \
+DEPENDS = "task-opie"
+RDEPENDS = "task-opie-applets task-opie-apps task-opie-base \
task-opie-base-applets task-opie-base-apps \
task-opie-base-decorations task-opie-base-inputmethods \
task-opie-base-pim task-opie-base-settings \
@@ -17,208 +19,3 @@ PACKAGES = "task-opie-applets task-opie-apps task-opie-base \
task-opie-multimedia task-opie-pim task-opie-settings \
task-opie-styles task-opie-todayplugins task-opie-wlan"
-#
-# This is created by hand - we need konqueror-embedded and qpdf2
-# for devices with >16M of flash
-#
-
-#DEPENDS = "irda-utils ntp timezones ttf-dejavu \
-# bluez-utils-nodbus wireless-tools \
-# opie-ttf-support libopieobex0 opie-examples-python \
-# opie-freetype opie-help-en opie-i18n opie-login \
-# opie-securityplugin-blueping opie-securityplugin-dummy \
-# opie-securityplugin-notice opie-securityplugin-pin \
-# opie-sh opie-symlinker opie-alarm openobex \
-# konqueror-embedded qpdf2"
-
-#
-# Dependencies to get the launcher up and running
-#
-
-task-opie-base = "bluez-utils-nodbus wireless-tools opie-alarm \
- opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics \
- opie-sounds opie-freetype ttf-dejavu-sans ttf-dejavu-sans-mono"
-
-#
-# things for reasonable bootstrap image
-#
-
-task-opie-base-applets = "opie-aboutapplet opie-clockapplet opie-suspendapplet \
- opie-homeapplet opie-rotateapplet \
- opie-irdaapplet opie-brightnessapplet opie-batteryapplet \
- opie-pcmciaapplet opie-volumeapplet \
- opie-screenshotapplet"
-
-#
-# keyboard models can benefit from the vt and logout applets
-#
-task-opie-base-applets_append_openzaurus = " opie-vtapplet opie-logoutapplet"
-task-opie-base-applets_append_mnci = " opie-vtapplet opie-logoutapplet"
-
-#
-# clamshell models can benefit from the autorotate applet
-#
-task-opie-base-depends_append_c7x0 = " opie-autorotateapplet"
-task-opie-base-depends_append_spitz = " opie-autorotateapplet"
-task-opie-base-depends_append_akita = " opie-autorotateapplet"
-task-opie-base-depends_append_borzoi = " opie-autorotateapplet"
-
-task-opie-base-inputmethods = "opie-multikey opie-handwriting opie-pickboard \
- opie-handwriting-classicset"
-
-task-opie-base-apps = "opie-console opie-clock opie-citytime opie-backup opie-sysinfo \
- opie-advancedfm"
-
-task-opie-base-settings = "opie-packagemanager opie-light-and-power opie-appearance \
- opie-systemtime opie-networksettings opie-button-settings \
- opie-icon-reload opie-launcher-settings opie-security \
- opie-securityplugin-pin"
-
-#
-# That settings can be removed and device will be still usable
-#
-
-task-opie-extra-settings = "opie-language opie-doctab opie-mediummount \
- opie-networksettings-wlanplugin opie-networksettings-pppplugin"
-
-task-opie-base-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"
-
-task-opie-base-styles = "opie-style-flat opie-style-fresh opie-style-web opie-style-phase"
-
-#
-# Those styles are big and does not look good on QVGA screen
-#
-
-task-opie-extra-styles = "opie-style-liquid opie-style-metal"
-
-task-opie-base-todayplugins = "opie-today-addressbookplugin opie-today-datebookplugin \
- opie-today-todolistplugin"
-
-task-opie-base-pim = "opie-addressbook opie-datebook opie-drawpad \
- opie-search opie-textedit opie-today opie-todo \
- ${task-opie-base-todayplugins} \
- opie-datebook-birthdayplugin"
-
-#
-# all OPIE stuff
-#
-
-task-opie-applets = "opie-aboutapplet opie-autorotateapplet opie-batteryapplet \
- opie-bluetoothapplet opie-brightnessapplet opie-cardmon \
- opie-clipboardapplet opie-clockapplet opie-homeapplet \
- opie-irdaapplet opie-lockapplet opie-logoutapplet \
- opie-mailapplet opie-memoryapplet opie-multikeyapplet \
- opie-networkapplet opie-notesapplet opie-pcmciaapplet \
- opie-pyquicklaunchapplet opie-restartapplet \
- opie-restartapplet2 opie-rotateapplet \
- opie-screenshotapplet opie-suspendapplet opie-vmemo \
- opie-volumeapplet opie-vtapplet opie-zkbapplet \
- "
-task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \
- opie-camera opie-checkbook opie-clock \
- opie-console opie-dagger opie-embeddedkonsole \
- opie-euroconv opie-eye opie-ftp opie-gutenbrowser \
- opie-helpbrowser opie-irc opie-keypebble opie-odict \
- opie-oxygen opie-rdesktop opie-reader opie-remote \
- opie-sheet opie-tableviewer opie-tinykate \
- opie-wellenreiter opie-write opie-zsafe"
-
-task-opie-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"
-
-task-opie-games = "opie-backgammon opie-bounce opie-buzzword opie-fifteen \
- opie-go opie-kbill opie-kcheckers opie-kpacman opie-mindbreaker \
- opie-minesweep opie-oyatzee opie-parashoot opie-qasteroids \
- opie-sfcave opie-snake opie-solitaire opie-tetrix opie-tictac \
- opie-wordgame opie-zlines opie-zsame"
-
-task-opie-inputmethods = "opie-dasher opie-dvorak opie-handwriting opie-jumpx \
- opie-keyboard opie-keyview opie-kjumpx opie-multikey \
- opie-pickboard opie-unikeyboard"
-
-task-opie-multimedia = "opie-mediaplayer1 \
- opie-mediaplayer1-libmadplugin \
- opie-mediaplayer1-libmodplugin \
- opie-mediaplayer1-libtremorplugin \
- opie-mediaplayer1-libwavplugin \
- opie-mediaplayer1-ogg-mp3 \
- opie-mediaplayer2 \
- opie-mediaplayer2-skin-default \
- opie-mediaplayer2-skin-default-landscape \
- opie-mediaplayer2-skin-pod \
- opie-mediaplayer2-skin-techno \
- opie-powerchord opie-recorder opie-tonleiter"
-
-task-opie-settings = "opie-appearance opie-aqpkg opie-backup opie-button-settings \
- opie-calibrate opie-citytime opie-confeditor opie-doctab \
- opie-formatter opie-language opie-launcher-settings \
- opie-light-and-power opie-mediummount opie-networksettings \
- opie-packagemanager opie-security opie-sshkeys opie-sysinfo \
- opie-systemtime opie-usermanager opie-icon-reload \
- opie-vmemo-settings"
-
-task-opie-styles = "opie-style-flat opie-style-fresh opie-style-liquid opie-style-metal \
- opie-style-web opie-style-phase opie-theme"
-
-task-opie-datebookplugins= "opie-datebook-birthdayplugin \
- opie-datebook-chrisholidayplugin \
- opie-datebook-nationalholidayplugin"
-
-task-opie-todayplugins = "opie-today-addressbookplugin opie-today-datebookplugin \
- opie-today-fortuneplugin opie-today-mailplugin \
- opie-today-stocktickerplugin opie-today-todolistplugin \
- opie-today-weatherplugin"
-
-task-opie-pim = "${task-opie-base-pim} opie-mail opie-pimconverter"
-
-task-opie-bluetooth = "bluez-utils-nodbus obexftp obexpush libopieobex0 \
- opie-bluepin opie-bluetoothmanager opie-bluetoothapplet"
-
-task-opie-wlan = "wireless-tools opie-wellenreiter"
-
-task-opie-irda = "irda-utils libopieobex0 obexftp obexpush"
-
-#
-# additional things for a >= 24mb distribution
-#
-
-task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \
- opie-rdesktop opie-wellenreiter opie-irc \
- opie-mediaplayer2 \
- konqueror-embedded qpdf2"
-
-task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-tictac \
- opie-tetrix"
-
-#
-# Let's build DEPENDS and RDEPENDS now
-#
-
-## FIXME - these shouldn't be here
-#DEPENDS += "opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics \
-# opie-sounds opie-ttf-support ttf-dejavu"
-
-RDEPENDS_task-opie-applets = "${task-opie-applets}"
-RDEPENDS_task-opie-apps = "${task-opie-apps}"
-RDEPENDS_task-opie-base-applets = "${task-opie-base-applets}"
-RDEPENDS_task-opie-base-apps = "${task-opie-base-apps}"
-RDEPENDS_task-opie-base-decorations = "${task-opie-base-decorations}"
-RDEPENDS_task-opie-base-inputmethods = "${task-opie-base-inputmethods}"
-RDEPENDS_task-opie-base-pim = "${task-opie-base-pim}"
-RDEPENDS_task-opie-base-settings = "${task-opie-base-settings}"
-RDEPENDS_task-opie-base-styles = "${task-opie-base-styles}"
-RDEPENDS_task-opie-base = "${task-opie-base}"
-RDEPENDS_task-opie-bluetooth = "${task-opie-bluetooth}"
-RDEPENDS_task-opie-datebookplugins = "${task-opie-datebookplugins}"
-RDEPENDS_task-opie-decorations = "${task-opie-decorations}"
-RDEPENDS_task-opie-extra-apps = "${task-opie-extra-apps}"
-RDEPENDS_task-opie-extra-games = "${task-opie-extra-games}"
-RDEPENDS_task-opie-extra-settings = "${task-opie-extra-settings}"
-RDEPENDS_task-opie-games = "${task-opie-games}"
-RDEPENDS_task-opie-inputmethods = "${task-opie-inputmethods}"
-RDEPENDS_task-opie-irda = "${task-opie-irda}"
-RDEPENDS_task-opie-multimedia = "${task-opie-multimedia}"
-RDEPENDS_task-opie-pim = "${task-opie-pim}"
-RDEPENDS_task-opie-settings = "${task-opie-settings}"
-RDEPENDS_task-opie-styles = "${task-opie-styles}"
-RDEPENDS_task-opie-todayplugins = "${task-opie-todayplugins}"
-RDEPENDS_task-opie-wlan = "${task-opie-wlan}"
diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index 421fe53ea0..b68995e2da 100644
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -6,12 +6,12 @@ FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${
FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
LICENSE = "MIT"
-PR = "r19"
+PR = "r20"
-DEPENDS = "task-bootstrap meta-opie"
+DEPENDS = "task-bootstrap task-opie"
RDEPENDS = "${INSTALL_PACKAGES}"
-extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles",d)}'
+extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "24", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles",d)}'
INSTALL_PACKAGES = "task-bootstrap task-opie-base task-opie-base-applets \
task-opie-base-inputmethods task-opie-base-apps \
diff --git a/packages/meta/task-opie.bb b/packages/meta/task-opie.bb
new file mode 100644
index 0000000000..7800847f0d
--- /dev/null
+++ b/packages/meta/task-opie.bb
@@ -0,0 +1,174 @@
+DESCRIPTION = "Tasks for OPIE stuff"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+SECTION = "opie/base"
+ALLOW_EMPTY = 1
+PACKAGE_ARCH = "all"
+LICENSE = "MIT"
+
+PR = "r0"
+
+PACKAGES = "task-opie-applets task-opie-apps task-opie-base \
+ task-opie-base-applets task-opie-base-apps \
+ task-opie-base-decorations task-opie-base-inputmethods \
+ task-opie-base-pim task-opie-base-settings \
+ task-opie-base-styles task-opie-bluetooth \
+ task-opie-base-todayplugins \
+ task-opie-datebookplugins task-opie-decorations \
+ task-opie-extra-apps task-opie-extra-settings \
+ task-opie-extra-styles task-opie-extra-games \
+ task-opie-games task-opie-inputmethods task-opie-irda \
+ task-opie-multimedia task-opie-pim task-opie-settings \
+ task-opie-styles task-opie-todayplugins task-opie-wlan"
+
+#
+# Dependencies to get the launcher up and running
+#
+RDEPENDS_task-opie-base = "opie-alarm opie-qcop opie-quicklauncher opie-taskbar \
+ opie-pics opie-sounds opie-freetype ttf-dejavu-sans \
+ ttf-dejavu-sans-mono"
+
+#
+# things for reasonable bootstrap image
+#
+RDEPENDS_task-opie-base-applets = "opie-aboutapplet opie-clockapplet opie-suspendapplet \
+ opie-homeapplet opie-rotateapplet \
+ opie-irdaapplet opie-brightnessapplet opie-batteryapplet \
+ opie-pcmciaapplet opie-volumeapplet \
+ opie-screenshotapplet"
+
+#
+# keyboard models can benefit from the vt and logout applets
+#
+RDEPENDS_task-opie-base-applets_append_openzaurus = " opie-vtapplet opie-logoutapplet"
+RDEPENDS_task-opie-base-applets_append_mnci = " opie-vtapplet opie-logoutapplet"
+
+#
+# clamshell models can benefit from the autorotate applet
+#
+RDEPENDS_task-opie-base-applets_append_c7x0 = " opie-autorotateapplet"
+RDEPENDS_task-opie-base-applets_append_spitz = " opie-autorotateapplet"
+RDEPENDS_task-opie-base-applets_append_akita = " opie-autorotateapplet"
+RDEPENDS_task-opie-base-applets_append_borzoi = " opie-autorotateapplet"
+
+RDEPENDS_task-opie-base-inputmethods = "opie-multikey opie-handwriting opie-handwriting-classicset"
+
+RDEPENDS_task-opie-base-apps = "opie-console opie-clock opie-citytime opie-backup opie-sysinfo \
+ opie-advancedfm"
+
+RDEPENDS_task-opie-base-settings = "opie-packagemanager opie-light-and-power opie-appearance \
+ opie-systemtime opie-networksettings opie-button-settings \
+ opie-icon-reload opie-launcher-settings opie-security \
+ opie-securityplugin-pin"
+
+#
+# That settings can be removed and device will be still usable
+#
+RDEPENDS_task-opie-extra-settings = "opie-language opie-doctab opie-mediummount \
+ opie-networksettings-wlanplugin opie-networksettings-pppplugin"
+
+RDEPENDS_task-opie-base-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"
+
+RDEPENDS_task-opie-base-styles = "opie-style-flat opie-style-fresh opie-style-web opie-style-phase"
+
+#
+# Those styles are big and does not look good on QVGA screen
+#
+RDEPENDS_task-opie-extra-styles = "opie-style-liquid opie-style-metal"
+
+RDEPENDS_task-opie-base-todayplugins = "opie-today-addressbookplugin opie-today-datebookplugin \
+ opie-today-todolistplugin"
+
+RDEPENDS_task-opie-base-pim = "opie-addressbook opie-datebook opie-drawpad \
+ opie-search opie-textedit opie-today opie-todo \
+ task-opie-base-todayplugins \
+ opie-datebook-birthdayplugin"
+
+#
+# all OPIE stuff
+#
+RDEPENDS_task-opie-applets = "opie-aboutapplet opie-autorotateapplet opie-batteryapplet \
+ opie-bluetoothapplet opie-brightnessapplet opie-cardmon \
+ opie-clipboardapplet opie-clockapplet opie-homeapplet \
+ opie-irdaapplet opie-lockapplet opie-logoutapplet \
+ opie-mailapplet opie-memoryapplet opie-multikeyapplet \
+ opie-networkapplet opie-notesapplet opie-pcmciaapplet \
+ opie-pyquicklaunchapplet opie-restartapplet \
+ opie-restartapplet2 opie-rotateapplet \
+ opie-screenshotapplet opie-suspendapplet opie-vmemo \
+ opie-volumeapplet opie-vtapplet opie-zkbapplet \
+ "
+RDEPENDS_task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \
+ opie-checkbook opie-clock \
+ opie-console opie-dagger opie-embeddedkonsole \
+ opie-euroconv opie-eye opie-ftp opie-gutenbrowser \
+ opie-helpbrowser opie-irc opie-keypebble opie-odict \
+ opie-oxygen opie-rdesktop opie-reader opie-remote \
+ opie-sheet opie-tableviewer opie-tinykate \
+ opie-wellenreiter opie-write opie-zsafe"
+
+RDEPENDS_task-opie-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"
+
+RDEPENDS_task-opie-games = "opie-backgammon opie-bounce opie-buzzword opie-fifteen \
+ opie-go opie-kbill opie-kcheckers opie-kpacman opie-mindbreaker \
+ opie-minesweep opie-oyatzee opie-parashoot opie-qasteroids \
+ opie-sfcave opie-snake opie-solitaire opie-tetrix opie-tictac \
+ opie-wordgame opie-zlines opie-zsame"
+
+RDEPENDS_task-opie-inputmethods = "opie-dasher opie-dvorak opie-handwriting \
+ opie-handwriting-classicset opie-jumpx opie-keyboard \
+ opie-keyview opie-kjumpx opie-multikey opie-unikeyboard"
+
+RDEPENDS_task-opie-multimedia = "opie-mediaplayer1 \
+ opie-mediaplayer1-libmadplugin \
+ opie-mediaplayer1-libmodplugin \
+ opie-mediaplayer1-libtremorplugin \
+ opie-mediaplayer1-libwavplugin \
+ opie-mediaplayer2 \
+ opie-mediaplayer2-skin-default \
+ opie-mediaplayer2-skin-default-landscape \
+ opie-mediaplayer2-skin-pod \
+ opie-mediaplayer2-skin-techno \
+ opie-powerchord opie-recorder opie-tonleiter"
+
+RDEPENDS_task-opie-settings = "opie-appearance opie-aqpkg opie-backup opie-button-settings \
+ opie-calibrate opie-citytime opie-confeditor opie-doctab \
+ opie-formatter opie-language opie-launcher-settings \
+ opie-light-and-power opie-mediummount opie-networksettings \
+ opie-packagemanager opie-security opie-sshkeys opie-sysinfo \
+ opie-systemtime opie-usermanager opie-icon-reload \
+ opie-vmemo-settings"
+
+RDEPENDS_task-opie-styles = "opie-style-flat opie-style-fresh opie-style-liquid opie-style-metal \
+ opie-style-web opie-style-phase opie-theme"
+
+RDEPENDS_task-opie-datebookplugins= "opie-datebook-birthdayplugin \
+ opie-datebook-chrisholidayplugin \
+ opie-datebook-nationalholidayplugin"
+
+RDEPENDS_task-opie-todayplugins = "opie-today-addressbookplugin opie-today-datebookplugin \
+ opie-today-fortuneplugin opie-today-mailplugin \
+ opie-today-stocktickerplugin opie-today-todolistplugin \
+ opie-today-weatherplugin"
+
+RDEPENDS_task-opie-pim = "task-opie-base-pim task-opie-todayplugins task-opie-datebookplugins \
+ opie-mail opie-pimconverter"
+
+RDEPENDS_task-opie-bluetooth = "bluez-utils-nodbus obexftp obexpush libopieobex0 \
+ opie-bluepin opie-bluetoothmanager opie-bluetoothapplet"
+
+RDEPENDS_task-opie-wlan = "wireless-tools opie-wellenreiter opie-networksettings-wlanplugin"
+
+RDEPENDS_task-opie-irda = "irda-utils libopieobex0 obexftp obexpush"
+
+#
+# additional things for a >= 24mb distribution
+#
+
+RDEPENDS_task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \
+ opie-rdesktop opie-wellenreiter opie-irc \
+ opie-mediaplayer2 \
+ konqueror-embedded qpdf2"
+
+RDEPENDS_task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-tictac \
+ opie-tetrix"
+
diff --git a/packages/samba/samba_3.0.20.bb b/packages/samba/samba_3.0.20.bb
index 498fd6ebc6..0531ab575e 100644
--- a/packages/samba/samba_3.0.20.bb
+++ b/packages/samba/samba_3.0.20.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
file://configure.patch;patch=1 \