From: David-John Willis Date: Tue, 13 Oct 2009 08:57:34 +0000 (+0100) Subject: task-pandora-*: Update task files used by images. X-Git-Tag: Release-2010-05/1~190 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=85c56bf13f7851db02ceaa522ac788c21866c247 task-pandora-*: Update task files used by images. --- diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb index e8fe20c..96164bf 100755 --- a/recipes/tasks/task-pandora-core.bb +++ b/recipes/tasks/task-pandora-core.bb @@ -5,58 +5,61 @@ DESCRIPTION = "Task file for default core/console apps in the Pandora image" # Don't forget to bump the PR if you change it. -PR = "r0.2" +PR = "r3.1" inherit task -# Use the 'Powered by Angstrom' splashscreen for the Pandora default images. -# By doing this here we ensure that anyone building a standard Angstom image -# rather then one of these has all the Angstrom branding with no Pandora specifics. -PREFERRED_PROVIDER_virtual/psplash = "psplash-pandora" - RDEPENDS_${PN} = "\ - task-base-extended \ - task-proper-tools \ - pandora-firmware \ - wl1251-modules \ + task-base-extended \ + task-proper-tools \ + pandora-firmware \ + wl1251-modules \ # pandora-wifi pandora-wifi-tools \ - pandora-libpnd \ - omap3-deviceid \ - omap3-sgx-modules devmem2 libgles-omap3 \ - sudo \ - lsof \ - libsdl-gfx \ - nfs-utils nfs-utils-client \ - tslib tslib-tests tslib-calibrate pointercal \ - bash \ - bzip2 \ - psplash \ - fbgrab fbset fbset-modes \ - portmap \ - fuse sshfs-fuse ntfs-3g \ - file \ - aufs aufs-tools \ - socat \ - strace \ - python-pygame \ - ksymoops \ - kexec-tools \ - minicom \ - nano \ - alsa-utils alsa-utils-alsactl alsa-utils-alsamixer alsa-utils-aplay \ - openssh-scp \ - openssh-ssh \ - bluez4 \ - wireless-tools \ - rdesktop \ - zip \ - networkmanager netm-cli \ - openssh-scp openssh-ssh \ - mplayer \ + wpa-supplicant \ + pandora-libpnd lsof \ + omap3-deviceid \ + omap3-sgx-modules devmem2 \ + libgles-omap3 libgles-omap3-demos \ +# packagekit \ + libsdl-gfx libsdl-net mikmod \ + nfs-utils nfs-utils-client \ + tslib tslib-tests tslib-calibrate pointercal \ + fbgrab fbset fbset-modes \ + portmap \ + fuse sshfs-fuse ntfs-3g \ + file \ + aufs aufs-tools \ + socat \ + strace \ + python-pygame \ + 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 \ + \ " # Make sure we install all kernel modules with the Pandora images RRECOMMENDS_${PN} += "kernel-modules" PACKAGE_ARCH = "${MACHINE_ARCH}" -RRECOMMENDS_${PN}_append_armv7a = " omapfbplay" + +RRECOMMENDS_${PN}_append_armv7a = " \ + gnash gnash-browser-plugin \ + omapfbplay \ +" diff --git a/recipes/tasks/task-pandora-desktop.bb b/recipes/tasks/task-pandora-desktop.bb index c220a57..9b8a823 100755 --- a/recipes/tasks/task-pandora-desktop.bb +++ b/recipes/tasks/task-pandora-desktop.bb @@ -2,23 +2,119 @@ DESCRIPTION = "Task file for the 'desktop' Pandora image" # Don't forget to bump the PR if you change it. -PR = "r0.2" +PR = "r1.1" inherit task -ECONFIG ?= "places e-wm-config-angstrom e-wm-config-angstrom-touchscreen e-wm-config-angstrom-widescreen e-wm-config-default" +ANGSTROM_EXTRA_INSTALL ?= "" + +APPS = " \ + abiword \ + cheese \ + claws-mail \ + epiphany epiphany-extensions \ + swfdec swfdec-gnome swfdec-mozilla \ + evince \ + gcalctool \ + gedit \ + gimp \ + gnome-games \ + gnome-mplayer \ + gnumeric \ + gphoto2 \ + gthumb \ + pidgin \ + synergy \ + vnc \ + x11vnc angstrom-x11vnc-xinit \ + xmms \ + xterm \ +" + +E17 = " \ + e-wm \ + places \ + e-wm-config-angstrom e-wm-config-angstrom-touchscreen e-wm-config-angstrom-widescreen e-wm-config-default \ +" + +FONTS = " \ + font-adobe-75dpi \ + fontconfig fontconfig-utils font-util \ + ttf-arphic-uming \ + ttf-dejavu-common \ + ttf-dejavu-sans \ + ttf-dejavu-serif \ + ttf-dejavu-sans-mono \ + ttf-liberation-sans \ + ttf-liberation-serif \ + ttf-liberation-mono \ + xorg-minimal-fonts \ +" + +GSTREAMER = " \ + gst-ffmpeg \ + gst-omapfb \ + gst-plugin-pulse \ + gst-plugins-base-meta \ + gst-plugins-good-meta \ + gst-plugins-bad-meta \ +# gst-plugins-ugly-meta \ +" + +PERL = " \ + perl \ +# task-perl-module-all \ +# libnet-dbus-perl \ + libxml-parser-perl \ + libxml-twig-perl \ +" + +PULSEAUDIO = " \ + pulseaudio-alsa-wrapper \ + pulseaudio-esd-wrapper \ + pulseaudio-module-gconf \ + libasound-module-ctl-pulse \ + libasound-module-pcm-pulse \ +" + +XSERVER_BASE = " \ + ${XSERVER} \ + dbus-x11 \ + desktop-file-utils \ + iso-codes \ + mime-support \ + notification-daemon inotify-tools \ + xauth \ +# xdg-utils \ + xhost \ + xinetd \ + xinit \ + xlsfonts \ + xrdb \ + xrefresh \ + xset \ + xvinfo \ +" RDEPENDS_${PN} = "\ - task-pandora-core \ + task-pandora-core \ + ${ANGSTROM_EXTRA_INSTALL} \ + ${APPS} \ + ${E17} \ + ${FONTS} \ + ${GSTREAMER} \ + ${PERL} \ + ${PULSEAUDIO} \ + ${XSERVER_BASE} \ angstrom-x11-base-depends \ - angstrom-gpe-task-base angstrom-gpe-task-settings \ + angstrom-gpe-task-base angstrom-gpe-task-settings \ angstrom-zeroconf-audio \ angstrom-led-config \ gpe-scap \ - mime-support e-wm ${ECONFIG} exhibit \ + mime-support \ xterm xmms \ - firefox \ - swfdec-mozilla \ + firefox midori \ + gecko-mediaplayer-firefox-hack \ hicolor-icon-theme gnome-icon-theme \ jaaa nmap iperf gnuplot \ abiword \ @@ -30,6 +126,7 @@ RDEPENDS_${PN} = "\ synergy \ x11vnc angstrom-x11vnc-xinit \ angstrom-gnome-icon-theme-enable \ - connman-gnome \ - gnome-bluetooth \ +# connman-gnome \ + networkmanager network-manager-applet \ + gnome-bluetooth \ " diff --git a/recipes/tasks/task-pandora-gui.bb b/recipes/tasks/task-pandora-gui.bb index 28803c0..d441c9b 100755 --- a/recipes/tasks/task-pandora-gui.bb +++ b/recipes/tasks/task-pandora-gui.bb @@ -1,13 +1,104 @@ -DESCRIPTION = "Task file for default GUI apps in the Pandora image" +rDESCRIPTION = "Task file for default GUI apps in the Pandora image" # Don't forget to bump the PR if you change it. -PR = "r0.1" +PR = "r3.1" inherit task +ANGSTROM_EXTRA_INSTALL ?= "" + +APPS = " \ + abiword \ + cheese \ + claws-mail \ + epiphany epiphany-extensions \ + swfdec swfdec-gnome swfdec-mozilla \ + evince \ + gcalctool \ + gedit \ + gimp \ + gnome-games \ + gnome-mplayer \ + gnumeric \ + gphoto2 \ + gthumb \ + pidgin \ + synergy \ + vnc \ + x11vnc angstrom-x11vnc-xinit \ + xmms \ + xterm \ +" + +FONTS = " \ + font-adobe-75dpi \ + fontconfig fontconfig-utils font-util \ + ttf-arphic-uming \ + ttf-dejavu-common \ + ttf-dejavu-sans \ + ttf-dejavu-serif \ + ttf-dejavu-sans-mono \ + ttf-liberation-sans \ + ttf-liberation-serif \ + ttf-liberation-mono \ + xorg-minimal-fonts \ +" + +GSTREAMER = " \ + gst-ffmpeg \ + gst-omapfb \ + gst-plugin-pulse \ + gst-plugins-base-meta \ + gst-plugins-good-meta \ + gst-plugins-bad-meta \ +# gst-plugins-ugly-meta \ +" + +PERL = " \ + perl \ +# task-perl-module-all \ +# libnet-dbus-perl \ + libxml-parser-perl \ + libxml-twig-perl \ +" + +PULSEAUDIO = " \ + pulseaudio-alsa-wrapper \ + pulseaudio-esd-wrapper \ + pulseaudio-module-gconf \ + libasound-module-ctl-pulse \ + libasound-module-pcm-pulse \ +" + +XSERVER_BASE = " \ + ${XSERVER} \ + dbus-x11 \ + desktop-file-utils \ + iso-codes \ + mime-support \ + notification-daemon inotify-tools \ + xauth \ +# xdg-utils \ + xhost \ + xinetd \ + xinit \ + xlsfonts \ + xrdb \ + xrefresh \ + xset \ + xvinfo \ +" + RDEPENDS_${PN} = "\ - task-pandora-core \ + task-pandora-core \ + ${ANGSTROM_EXTRA_INSTALL} \ + ${APPS} \ + ${FONTS} \ + ${GSTREAMER} \ + ${PERL} \ + ${PULSEAUDIO} \ + ${XSERVER_BASE} \ angstrom-x11-base-depends \ angstrom-gpe-task-base angstrom-gpe-task-game angstrom-gpe-task-apps angstrom-gpe-task-settings \ angstrom-zeroconf-audio \ @@ -20,7 +111,6 @@ RDEPENDS_${PN} = "\ abiword \ claws-mail \ evince \ - exhibit \ pidgin \ gnome-games \ synergy \ @@ -28,10 +118,7 @@ RDEPENDS_${PN} = "\ xmms \ xterm \ xtscal \ - matchbox-wm \ - matchbox-desktop matchbox-panel matchbox-panel-manager matchbox-panel-hacks \ - matchbox-keyboard matchbox-keyboard-applet matchbox-keyboard-im \ - matchbox-common matchbox-config-gtk \ + matchbox2 \ matchbox-terminal \ matchbox-themes-gtk pandora-matchbox-gtk-theme \ pcmanfm \ @@ -43,6 +130,8 @@ RDEPENDS_${PN} = "\ matchbox-applet-inputmanager \ matchbox-applet-volume \ matchbox-applet-startup-monitor \ - connman-gnome \ +# connman-gnome \ + networkmanager \ scummvm \ + gnome-bluetooth \ "