From b816cbd0aeb7598fb1401e7ffbf1a44eaf5cabbb Mon Sep 17 00:00:00 2001 From: David-John Willis Date: Sat, 13 Feb 2010 22:07:01 +0000 Subject: [PATCH] task-pandora-core/xfce: Commit latest image tasks. --- recipes/tasks/task-pandora-core.bb | 62 ++++++++++++++----- recipes/tasks/task-pandora-xfce.bb | 96 +++++++++++++++++------------- 2 files changed, 104 insertions(+), 54 deletions(-) diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb index 86ffb7f..24956cc 100755 --- a/recipes/tasks/task-pandora-core.bb +++ b/recipes/tasks/task-pandora-core.bb @@ -1,16 +1,16 @@ -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 = "r1" +PR = "r13" inherit task AUFS = " \ - aufs2-27 \ +# aufs2-27 \ aufs2-util \ " @@ -20,6 +20,12 @@ BLUETOOTH = " \ 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 \ +" + WIRELESS = " \ pandora-firmware \ wl1251-modules \ @@ -29,6 +35,14 @@ WIRELESS = " \ networkmanager netm-cli \ " +MEDIA_LIBS = " \ + libmodplug \ + libsdl-x11 libsdl-mixer libsdl-image \ + libsdl-gfx libsdl-net libsdl-ttf \ + mikmod \ + speex \ + +" OPENGLES = " \ omap3-sgx-modules devmem2 \ libgles-omap3 \ @@ -40,24 +54,33 @@ PAM = " \ libpam-meta \ " -SSH = " \ - openssh-scp \ - openssh-ssh \ -" - PANDORA_LIBS = " \ pandora-libpnd lsof \ omap3-deviceid \ pandora-skel \ " +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 sshfs-fuse ntfs-3g \ +# nfs-utils \ + nfs-utils-client \ + fuse fuse-utils \ + sshfs-fuse gmailfs curlftpfs \ + ntfs-3g \ + squashfs-tools \ " EXTRA_TOOLS = " \ @@ -73,31 +96,42 @@ EXTRA_TOOLS = " \ gzip \ bash \ bzip2 \ - sudo sudo-enable-wheel-group \ minicom \ nano \ + gdb \ + sessreg \ " +# 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} \ ${WIRELESS} \ ${BLUETOOTH} \ + ${BOOT} \ + ${MEDIA_LIBS} \ ${OPENGLES} \ ${PANDORA_LIBS} \ ${SSH} \ + ${SUDO} \ ${TOUCHSCREEN} \ ${FS_SUPPORT} \ ${EXTRA_TOOLS} \ + ${UTIL_LINUX_NG_EXTRAS} \ # 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-zeroconf-audio \ angstrom-led-config \ \ ${PAM} \ @@ -109,6 +143,6 @@ RRECOMMENDS_${PN} += "kernel-modules" PACKAGE_ARCH = "${MACHINE_ARCH}" RRECOMMENDS_${PN}_append_armv7a = " \ - gnash gnash-browser-plugin \ +# gnash gnash-browser-plugin \ omapfbplay \ " diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb index 5b49a6c..3610db4 100755 --- a/recipes/tasks/task-pandora-xfce.bb +++ b/recipes/tasks/task-pandora-xfce.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Task file for the XFCE Pandora image" # Don't forget to bump the PR if you change it. -PR = "r2" +PR = "r28" inherit task @@ -14,18 +14,17 @@ APPS = " \ claws-mail \ swfdec swfdec-gnome swfdec-mozilla \ firefox \ - gnumeric \ - gimp \ +# gnumeric \ +# gimp \ networkmanager network-manager-applet \ - synergy \ - vnc \ - x11vnc angstrom-x11vnc-xinit \ - xterm \ - xchat \ +# synergy \ + vnc x11vnc angstrom-x11vnc-xinit \ +# xchat \ + xournal \ " BLUETOOTH_GUI = " \ -# blueman \ + blueman \ gnome-bluetooth \ " @@ -59,44 +58,51 @@ FONTS = " \ # Any default games we want to ship. GAMES = " \ scummvm \ +# frozen-bubble \ + gnome-games \ " GNOME_APPS = " \ -# epiphany epiphany-extensions \ -# evince \ - gnome-games \ gnome-mplayer \ - gcalctool \ +# gcalctool \ gnome-keyring gnome-keyring-pam-plugin \ + gksu \ " GNOME_GTK = " \ -# hicolor-icon-theme \ # gnome-icon-theme \ # angstrom-gnome-icon-theme-enable \ " GSTREAMER = " \ +# gstreamer-ti \ gst-ffmpeg \ gst-omapfb \ - gst-plugin-pulse \ +# gst-plugin-pulse \ + gst-plugin-xvimagesink \ gst-plugins-base-meta \ -# gst-plugins-good-meta \ - gst-plugins-bad-meta \ + gst-plugins-good-meta gst-plugins-bad-meta \ # gst-plugins-ugly-meta \ " ICON_THEME = " \ + hicolor-icon-theme \ elementary-icon-theme \ elementary-icon-theme-enable \ " +LAUNCHERS = " \ + netbook-launcher-efl \ +" + PANDORA = " \ pandora-first-run-wizard hsetroot \ pandora-scripts \ pandora-wallpaper-official pandora-wallpaper-community \ pandora-xfce-defaults \ pandora-xmms-defaults xmms \ + pandora-midori-defaults midori \ + pandora-pmenu libgles2d \ " PERL = " \ @@ -108,16 +114,24 @@ PERL = " \ " PULSEAUDIO = " \ - pulseaudio-alsa-wrapper \ - pulseaudio-esd-wrapper \ - pulseaudio-module-gconf \ - libasound-module-ctl-pulse \ - libasound-module-pcm-pulse \ +# pulseaudio-alsa-wrapper \ +# pulseaudio-esd-wrapper \ +# pulseaudio-module-gconf \ +# libasound-module-ctl-pulse \ +# libasound-module-pcm-pulse \ " -QT_SUPPORT = " \ - qt4-x11-free \ +QT_SELECTED = "qt4-x11-free" # qt4-x11-free-gles \ + +QT_SUPPORT = " \ + ${QT_SELECTED} \ +" + +# We want all of the Qt metapackage (for dev use) without the demos/examples. +BAD_RRECOMMENDS += " \ + ${QT_SELECTED}-demos \ + ${QT_SELECTED}-examples \ " TOTEM = " \ @@ -134,9 +148,9 @@ TOTEM = " \ " TOUCHSCREEN = " \ - xf86-input-tslib \ gtk-touchscreen-mode-enable \ libgtkstylus \ + xinput-calibrator \ " XFCE46_BASE = " \ @@ -148,6 +162,7 @@ XFCE46_BASE = " \ xfconf \ xfdesktop \ xfce4-panel \ + xfce4-power-manager \ \ gtk-xfce-engine \ \ @@ -171,7 +186,6 @@ XFCE46_EXTRAS = " \ xfce4-mixer \ xfce4-appfinder \ xfprint \ - midori \ orage \ squeeze \ ristretto \ @@ -182,16 +196,16 @@ XFCE46_EXTRAS = " \ XFCE_THEMES = " \ xfwm4-theme-daloa \ xfwm4-theme-moheli \ - xfwm4-theme-default-4.0 \ - xfwm4-theme-default-4.2 \ - xfwm4-theme-default-4.4 \ +# xfwm4-theme-default-4.0 \ +# xfwm4-theme-default-4.2 \ +# xfwm4-theme-default-4.4 \ xfwm4-theme-kokodi \ - xfwm4-theme-moheli \ xfwm4-theme-sassandra \ - xfwm4-theme-stoneage \ - xfwm4-theme-therapy \ - xfwm4-theme-tyrex \ - xfwm4-theme-wallis \ +# xfwm4-theme-stoneage \ +# xfwm4-theme-therapy \ +# xfwm4-theme-tyrex \ +# xfwm4-theme-wallis \ + xfwm4-themes \ " XSERVER_BASE = " \ @@ -212,6 +226,8 @@ XSERVER_BASE = " \ xset \ xvinfo \ devilspie \ + encodings \ + xterm \ " RDEPENDS_${PN} = " \ @@ -228,6 +244,7 @@ RDEPENDS_${PN} = " \ ${GNOME_APPS} \ ${GSTREAMER} \ ${ICON_THEME} \ + ${LAUNCHERS} \ ${PANDORA} \ ${PERL} \ ${PULSEAUDIO} \ @@ -240,17 +257,16 @@ RDEPENDS_${PN} = " \ ${XFCE_THEMES} \ \ rxvt-unicode \ - xst \ - suspend-desktop \ - teleport \ +# xst \ +# suspend-desktop \ +# teleport \ gdk-pixbuf-loader-png \ gdk-pixbuf-loader-xpm \ gdk-pixbuf-loader-jpeg \ pango-module-basic-x \ pango-module-basic-fc \ xcursor-transparent-theme \ - mime-support \ xterm xmms \ - jaaa nmap iperf gnuplot \ - x11vnc angstrom-x11vnc-xinit \ + jaaa nmap iperf \ +# gnuplot \ " -- 2.39.2