X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=blobdiff_plain;f=recipes%2Ftasks%2Ftask-pandora-core.bb;h=7915bfad5617c6e849eaee988abde303228ae16b;hp=fbfc5219cbae32127a8ae0860dbd8c3049301de3;hb=c4d4823a2b2daee50d9403ee0518fc3fd2b51e1d;hpb=8e3487198628ea181fa637f04935d899dfa4070b

diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb
index fbfc521..7915bfa 100755
--- a/recipes/tasks/task-pandora-core.bb
+++ b/recipes/tasks/task-pandora-core.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Task file for Pandora core/console image (with Wifi)"
+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.
@@ -9,14 +9,154 @@ PR = "r40"
 
 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-firmware \
+#  wl1251-modules \
+#  pandora-wifi pandora-wifi-tools \
+  wireless-tools \
+  wpa-supplicant \  
+  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-rawdemos \
+"
+
+PAM = " \
+  libpam \
+  libpam-meta \
+"
+
+PANDORA_LIBS = " \
+  pandora-libpnd lsof \
+  omap3-deviceid \
+  pandora-skel \
+  pandora-state \
+  pandora-usbhost \
+"
+
+SUDO = " \
+  sudo sudo-enable-wheel-group \ 
+  pandora-sudoers \
+"
+
+SSH = " \
+  openssh-scp \
+  openssh-ssh \
+"
+
+TOUCHSCREEN = " \
+  tslib tslib-tests tslib-calibrate pointercal \
+"
+
+FS_SUPPORT = " \
+#  nfs-utils \
+  nfs-utils-client \
+  fuse fuse-utils \
+  sshfs-fuse gmailfs curlftpfs \
+  ntfs-3g \
+  squashfs-tools \
+"
+
+EXTRA_TOOLS = " \
+  avahi \
+  fbgrab fbset fbset-modes \
+  portmap \
+  file \
+  socat \
+  strace \
+  screen \
+  rsync \
+  unrar \
+  ksymoops \
+  kexec-tools \
+  zip \        
+  gzip \
+  bash \
+  bzip2 \  
+  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-pandora-core-nowifi \
+  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 \
+  python-pygame \
+  python-misc \
+  python-modules \
+  alsa-utils alsa-utils-alsactl alsa-utils-alsamixer alsa-utils-aplay \
+  openal-soft \
+  rdesktop \
+  \
+#  angstrom-zeroconf-audio \
+  angstrom-led-config \ 
+  ntpdate \ 
+  omap3-pandora-kernel2 \
 "
 
+# Make sure we install all kernel modules with the Pandora images
+RRECOMMENDS_${PN} += "kernel-modules"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"