task-pandora-core: make sure blkid is included

[openpandora.oe.git] / recipes / tasks / task-pandora-core.bb

diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb
index 96164bf..179c7b1 100755 (executable)
--- a/recipes/tasks/task-pandora-core.bb
+++ b/recipes/tasks/task-pandora-core.bb
@@ -1,65 +1,178 @@
-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 = "r3.1"
+PR = "r47"
 
 inherit task 
 
-RDEPENDS_${PN} = "\
-  task-base-extended \
-  task-proper-tools \
-  pandora-firmware \
-  wl1251-modules \
-#        pandora-wifi pandora-wifi-tools \
-  wpa-supplicant \
-  pandora-libpnd lsof \
-  omap3-deviceid \     
+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 \
+"
+
+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 \
-#        packagekit \
-  libsdl-gfx libsdl-net mikmod \
-  nfs-utils nfs-utils-client \
+  libgles-omap3-es23 \
+  libgles-omap3-dm3730 \
+#  libgles-omap3-rawdemos \
+"
+
+PAM = " \
+  libpam \
+  libpam-meta \
+"
+
+PANDORA_LIBS = " \
+  pandora-libpnd \
+  pandora-libpnd-pndnotifyd pandora-libpnd-pndevmapperd \
+  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 \
-  fuse sshfs-fuse ntfs-3g \
   file \
-  aufs aufs-tools \
   socat \
   strace \
-  python-pygame \
+  screen \
+  rsync \
+  unrar \
   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 \
+  gdb \
+  sessreg \
+  lua5.1 \
+  tzdata \
+  ca-certificates \
+"
+
+# 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-swaponoff \
+  util-linux-ng-blkid \
+  util-linux-ng-fsck \
+"
+
+# sysvinit-* used to not be needed, but after adding
+# recipes/sysvinit/sysvinit/omap3-pandora/*
+# they are no longer included automatically?
+SYSVINIT = " \
+  sysvinit-inittab \
+  sysvinit-sulogin \
+  sysvinit-utils \
+"
+
+RDEPENDS_${PN} = "\
+  task-base-extended \
+  task-proper-tools \
+  ${SYSVINIT} \
+  ${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}"
-
-RRECOMMENDS_${PN}_append_armv7a = " \
-       gnash gnash-browser-plugin \
-       omapfbplay \
-"