task-pandora-*: Cleanup image tasks.

diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb
index 1959e54..ab35602 100755 (executable)
--- a/recipes/tasks/task-pandora-core.bb
+++ b/recipes/tasks/task-pandora-core.bb
@@ -5,53 +5,95 @@ DESCRIPTION = "Task file for default core/console apps in the Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r1"
+PR = "r2.3"
 
 inherit task 
 
-RDEPENDS_${PN} = "\
-  task-base-extended \
-  task-proper-tools \
+BLUETOOTH = " \
+  blueprobe \
+  bluez4 gst-plugin-bluez \
+  libsndfile1 libasound-module-bluez \
+"
+
+WIRELESS = " \
   pandora-firmware \
   wl1251-modules \
-#        pandora-wifi pandora-wifi-tools \
-  wpa-supplicant \
-  pandora-libpnd lsof \
-  omap3-deviceid \     
+#  pandora-wifi pandora-wifi-tools \
+  wireless-tools \
+  wpa-supplicant \  
+  networkmanager netm-cli \  
+"
+
+OPENGLES = " \
   omap3-sgx-modules devmem2 \
   libgles-omap3 libgles-omap3-demos \
-#        packagekit \
-  libsdl-gfx libsdl-net mikmod \
-  nfs-utils nfs-utils-client \
+"
+
+PAM = " \
+  libpam pam-plugins-group pam-plugins-xauth pam-plugins-wheel \
+  pam-plugins-loginuid pam-plugins-localuser \
+"
+
+SSH = " \
+  openssh-scp \
+  openssh-ssh \
+"
+
+PANDORA_LIBS = " \
+  pandora-libpnd lsof \
+  omap3-deviceid \  
+"
+
+TOUCHSCREEN = " \
   tslib tslib-tests tslib-calibrate pointercal \
+"
+
+FS_SUPPORT = " \
+  nfs-utils nfs-utils-client \
+  aufs aufs-tools \
+  fuse sshfs-fuse ntfs-3g \
+"
+
+EXTRA_TOOLS = " \
+  avahi \
   fbgrab fbset fbset-modes \
   portmap \
-  fuse sshfs-fuse ntfs-3g \
   file \
-  aufs aufs-tools \
   socat \
   strace \
-  python-pygame \
   ksymoops \
   kexec-tools \
-  alsa-utils alsa-utils-alsactl alsa-utils-alsamixer alsa-utils-aplay \
-  openssh-scp \
-  openssh-ssh \
-  bluez4 \
-  wireless-tools \
-  rdesktop \
-  networkmanager netm-cli \
-  openssh-scp openssh-ssh \
-  mplayer \
-  \
   zip \        
   gzip \
   bash \
   bzip2 \  
   sudo \ 
   minicom \
-  nano \        
+  nano \
+"
+
+RDEPENDS_${PN} = "\
+  task-base-extended \
+  task-proper-tools \
+  ${WIRELESS} \
+  ${BLUETOOTH} \  
+  ${OPENGLES} \
+  ${PANDORA_LIBS} \
+  ${SSH} \
+  ${TOUCHSCREEN} \
+  ${FS_SUPPORT} \
+  ${EXTRA_TOOLS} \
+#        packagekit \
+  libsdl-gfx libsdl-net mikmod \
+  python-pygame \
+  alsa-utils alsa-utils-alsactl alsa-utils-alsamixer alsa-utils-aplay \
+  rdesktop \
+  mplayer \
+  \
+  angstrom-zeroconf-audio \
+  angstrom-led-config \ 
   \
+  ${PAM} \
 "
 
 # Make sure we install all kernel modules with the Pandora images

diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb
index 4042b9f..bcca6fc 100755 (executable)
--- a/recipes/tasks/task-pandora-xfce.bb
+++ b/recipes/tasks/task-pandora-xfce.bb
@@ -2,13 +2,14 @@ DESCRIPTION = "Task file for the XFCE Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r4"
+PR = "r6.1"
 
 inherit task
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 
 APPS = " \
+  avahi-ui \
   abiword \
   claws-mail \
   swfdec swfdec-gnome swfdec-mozilla \
@@ -50,12 +51,13 @@ FONTS = " \
 "  
 
 GNOME_APPS = " \
-  epiphany epiphany-extensions \
-  evince \  
+#  epiphany epiphany-extensions \
+#  evince \  
   gnome-games \
   gnome-mplayer \
   gcalctool \ 
   gnome-bluetooth \    
+  gnome-keyring gnome-keyring-pam-plugin \
 "
 
 GNOME_GTK = " \
@@ -108,6 +110,13 @@ TOTEM = " \
   totem-plugin-thumbnail \
 "
 
+TOUCHSCREEN = " \
+#  xf86-input-evtouch \
+  xf86-input-tslib \
+  gtk-touchscreen-mode-enable \
+  libgtkstylus \
+"
+
 XFCE46_BASE = " \
   xfce4-dev-tools \
   xfwm4 \
@@ -165,7 +174,6 @@ XFCE_THEMES = " \
 
 XSERVER_BASE = " \
   ${XSERVER} \
-  xf86-input-evtouch \
   dbus-x11 \
   desktop-file-utils \
   iso-codes \
@@ -198,6 +206,7 @@ RDEPENDS_${PN} = " \
   ${PERL} \
   ${PULSEAUDIO} \
   ${TOTEM} \
+  ${TOUCHSCREEN} \
   ${XSERVER_BASE} \
   ${XFCE46_BASE} \
   ${XFCE46_EXTRAS} \
@@ -216,8 +225,6 @@ RDEPENDS_${PN} = " \
   pango-module-basic-x \
   pango-module-basic-fc \
   xcursor-transparent-theme \  
-  angstrom-zeroconf-audio \
-  angstrom-led-config \        
   mime-support \
   xterm xmms \
   jaaa nmap iperf gnuplot \