X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=recipes%2Ftasks%2Ftask-pandora-core.bb;h=f24a7b1a646990d3ef144c14c74d42baf7d60e8b;hb=b982718972339148bf52325ff82da4c07a21a116;hp=ad0d2253b983d00a4f7f9332015e852639ab8060;hpb=f09f0932b47ea7dbe6464373aa748c009a2792a7;p=openpandora.oe.git

diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb
index ad0d225..f24a7b1 100755
--- a/recipes/tasks/task-pandora-core.bb
+++ b/recipes/tasks/task-pandora-core.bb
@@ -1,32 +1,60 @@
-DESCRIPTION = "Task file for default core/console apps in the Pandora image"
+DESCRIPTION = "Task file for default core/console apps and libs in the Pandora image"
 
 # Use this task as a base to ship all kernel modules and make sure firmware and drivers are installed for BT and WiFi.
 # Please see metadata/openpandora.oe.git/packages/pandora-system/pandora-firmware/pandora-firmware/readme.txt for info on the hacks for firmware.
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r6"
+PR = "r34"
 
 inherit task 
 
+AUFS = " \
+  aufs2-util \
+"
+
 BLUETOOTH = " \
   blueprobe \
   bluez4 gst-plugin-bluez \
   libsndfile1 libasound-module-bluez \
 "
 
+# Package up the boot scripts and bootchart to help us work to drop the startup time.
+BOOT = " \
+  pandora-uboot-scripts \
+  bootchart \
+  mtd-utils \
+"
+
+# Package BOOST libs so people can use them in apps. It will pull in the RRECOMENDS.
+BOOST = " \
+  boost \
+"
+
 WIRELESS = " \
   pandora-firmware \
   wl1251-modules \
 #  pandora-wifi pandora-wifi-tools \
   wireless-tools \
   wpa-supplicant \  
-  networkmanager netm-cli \  
+  networkmanager netm-cli \
 "
 
+MEDIA_LIBS = " \
+  libmodplug \
+  libsdl-x11 libsdl-mixer libsdl-image \
+  libsdl-gfx libsdl-net libsdl-ttf \
+  libpng libpng12 libpng3 \
+  faad2 \
+  mikmod \
+  speex \  
+  flac \
+  audiofile \
+"
 OPENGLES = " \
   omap3-sgx-modules devmem2 \
-  libgles-omap3 libgles-omap3-demos \
+  libgles-omap3 \
+#  libgles-omap3-rawdemos \
 "
 
 PAM = " \
@@ -34,15 +62,21 @@ PAM = " \
   libpam-meta \
 "
 
-SSH = " \
-  openssh-scp \
-  openssh-ssh \
-"
-
 PANDORA_LIBS = " \
   pandora-libpnd lsof \
   omap3-deviceid \
   pandora-skel \
+  pandora-state \
+"
+
+SUDO = " \
+  sudo sudo-enable-wheel-group \ 
+  pandora-sudoers \
+"
+
+SSH = " \
+  openssh-scp \
+  openssh-ssh \
 "
 
 TOUCHSCREEN = " \
@@ -50,9 +84,12 @@ TOUCHSCREEN = " \
 "
 
 FS_SUPPORT = " \
-  nfs-utils nfs-utils-client \
-  aufs2-27 aufs2-util \
-  fuse sshfs-fuse ntfs-3g \
+#  nfs-utils \
+  nfs-utils-client \
+  fuse fuse-utils \
+  sshfs-fuse gmailfs curlftpfs \
+  ntfs-3g \
+  squashfs-tools \
 "
 
 EXTRA_TOOLS = " \
@@ -62,47 +99,60 @@ EXTRA_TOOLS = " \
   file \
   socat \
   strace \
+  screen \
+  rsync \
+  unrar \
   ksymoops \
   kexec-tools \
   zip \        
   gzip \
   bash \
   bzip2 \  
-  sudo sudo-enable-wheel-group \ 
   minicom \
   nano \
+  gdb \
+  sessreg \
+  lua5.1 \
+  tzdata \
 "
 
+# Add extra util-linux-ng utils to image. 
+# TODO: Fix util-linux-ng to meta depend on all subpackages.
+UTIL_LINUX_NG_EXTRAS = " \
+  util-linux-ng-losetup util-linux-ng-mountall \
+  util-linux-ng-swaponoff \
+"
+  
 RDEPENDS_${PN} = "\
   task-base-extended \
   task-proper-tools \
+  ${AUFS} \
+  ${BOOST} \
   ${WIRELESS} \
   ${BLUETOOTH} \  
+  ${BOOT} \
+  ${MEDIA_LIBS} \
   ${OPENGLES} \
   ${PANDORA_LIBS} \
+  ${PAM} \  
   ${SSH} \
+  ${SUDO} \
   ${TOUCHSCREEN} \
   ${FS_SUPPORT} \
   ${EXTRA_TOOLS} \
+  ${UTIL_LINUX_NG_EXTRAS} \
 #        packagekit \
-  libsdl-gfx libsdl-net mikmod \
   python-pygame \
+  python-misc \
+  python-modules \
   alsa-utils alsa-utils-alsactl alsa-utils-alsamixer alsa-utils-aplay \
   rdesktop \
-  mplayer \
   \
-  angstrom-zeroconf-audio \
+#  angstrom-zeroconf-audio \
   angstrom-led-config \ 
-  \
-  ${PAM} \
 "
 
 # Make sure we install all kernel modules with the Pandora images
 RRECOMMENDS_${PN} += "kernel-modules"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-RRECOMMENDS_${PN}_append_armv7a = " \
-	gnash gnash-browser-plugin \
-	omapfbplay \
-"