From: David-John Willis <John.Willis@Distant-earth.com>
Date: Mon, 23 Nov 2009 09:50:19 +0000 (+0000)
Subject: task-pandora-*: Commit latest Xfce and Core tasks to build PAM correctly and package... 
X-Git-Tag: Release-2010-05/1~162
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9693bf92ad4a033030c5ef152db84741839c0183;p=openpandora.oe.git

task-pandora-*: Commit latest Xfce and Core tasks to build PAM correctly and package up what is needed.
---

diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb
index ab35602..3558f72 100755
--- a/recipes/tasks/task-pandora-core.bb
+++ b/recipes/tasks/task-pandora-core.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Task file for default core/console apps in the Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r2.3"
+PR = "r5"
 
 inherit task 
 
@@ -30,8 +30,8 @@ OPENGLES = " \
 "
 
 PAM = " \
-  libpam pam-plugins-group pam-plugins-xauth pam-plugins-wheel \
-  pam-plugins-loginuid pam-plugins-localuser \
+  libpam \
+  libpam-meta \
 "
 
 SSH = " \
@@ -41,7 +41,7 @@ SSH = " \
 
 PANDORA_LIBS = " \
   pandora-libpnd lsof \
-  omap3-deviceid \  
+  omap3-deviceid \
 "
 
 TOUCHSCREEN = " \
@@ -50,7 +50,7 @@ TOUCHSCREEN = " \
 
 FS_SUPPORT = " \
   nfs-utils nfs-utils-client \
-  aufs aufs-tools \
+  aufs2-27 aufs2-util \
   fuse sshfs-fuse ntfs-3g \
 "
 
@@ -67,7 +67,7 @@ EXTRA_TOOLS = " \
   gzip \
   bash \
   bzip2 \  
-  sudo \ 
+  sudo sudo-enable-wheel-group \ 
   minicom \
   nano \
 "
diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb
index bcca6fc..380d201 100755
--- a/recipes/tasks/task-pandora-xfce.bb
+++ b/recipes/tasks/task-pandora-xfce.bb
@@ -1,8 +1,8 @@
-DESCRIPTION = "Task file for the XFCE Pandora image"
+DESCRI-PTION = "Task file for the XFCE Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r6.1"
+PR = "r12"
 
 inherit task
 
@@ -24,6 +24,10 @@ APPS = " \
   xterm \
 "
 
+BLUETOOTH_GUI = " \
+  blueman \
+"
+
 IM_CLIENT = " \
   pidgin \
   libpurple-protocol-msn \
@@ -34,6 +38,7 @@ IM_CLIENT = " \
 
 DISPMAN = " \
   slim \
+  slim-op-themes \
 "
 
 FONTS = " \
@@ -56,7 +61,7 @@ GNOME_APPS = " \
   gnome-games \
   gnome-mplayer \
   gcalctool \ 
-  gnome-bluetooth \	
+#  gnome-bluetooth \	
   gnome-keyring gnome-keyring-pam-plugin \
 "
 
@@ -81,6 +86,12 @@ ICON_THEME = " \
   tango-icon-theme-enable \
 "
 
+PANDORA = " \
+#	pandora-auto-startx \
+  pandora-first-run-wizard hsetroot xtscal \
+  pandora-scripts \
+"
+
 PERL = " \
   perl \
   task-perl-module-all \
@@ -97,6 +108,11 @@ PULSEAUDIO = " \
   libasound-module-pcm-pulse \
 "
 
+QT_SUPPORT = " \
+  qt4-x11-free \
+#  qt4-x11-free-gles \
+"
+
 TOTEM = " \
   totem \
   totem-browser-plugin \
@@ -196,6 +212,7 @@ RDEPENDS_${PN} = " \
   angstrom-x11-base-depends \
   ${ANGSTROM_EXTRA_INSTALL} \
   ${APPS} \
+  ${BLUETOOTH_GUI} \
   ${IM_CLIENT} \
   ${DISPMAN} \
   ${FONTS} \
@@ -203,8 +220,10 @@ RDEPENDS_${PN} = " \
   ${GNOME_APPS} \
   ${GSTREAMER} \
   ${ICON_THEME} \
+  ${PANDORA} \
   ${PERL} \
   ${PULSEAUDIO} \
+  ${QT_SUPPORT} \
   ${TOTEM} \
   ${TOUCHSCREEN} \
   ${XSERVER_BASE} \
@@ -212,9 +231,6 @@ RDEPENDS_${PN} = " \
   ${XFCE46_EXTRAS} \
   ${XFCE_THEMES} \
   \
-#	pandora-auto-startx \
-  pandora-first-run-wizard \
-  \
   rxvt-unicode \
   xst \
   suspend-desktop \