diff options
Diffstat (limited to 'recipes/tasks')
| -rw-r--r-- | recipes/tasks/angstrom-task-gnome.bb | 23 | ||||
| -rw-r--r-- | recipes/tasks/task-base.bb | 7 | ||||
| -rw-r--r-- | recipes/tasks/task-beagleboard-demo.bb | 3 | ||||
| -rw-r--r-- | recipes/tasks/task-boot.bb | 10 | ||||
| -rw-r--r-- | recipes/tasks/task-fso2-compliance.bb | 8 | ||||
| -rw-r--r-- | recipes/tasks/task-sdk-bare.bb | 1 | ||||
| -rw-r--r-- | recipes/tasks/task-shr-feed.bb | 114 | ||||
| -rw-r--r-- | recipes/tasks/task-shr-minimal.bb | 6 | ||||
| -rw-r--r-- | recipes/tasks/task-slugos.bb | 4 |
9 files changed, 115 insertions, 61 deletions
diff --git a/recipes/tasks/angstrom-task-gnome.bb b/recipes/tasks/angstrom-task-gnome.bb index ac3fee978f..0062772ce8 100644 --- a/recipes/tasks/angstrom-task-gnome.bb +++ b/recipes/tasks/angstrom-task-gnome.bb @@ -2,6 +2,9 @@ DESCRIPTION = "Task for a GNOME based image" inherit task +# Most of these tasks are arch independant +PACKAGE_ARCH = "all" + XSERVER ?= "xserver-xorg \ xf86-input-evdev \ xf86-input-mouse \ @@ -9,9 +12,11 @@ XSERVER ?= "xserver-xorg \ xf86-input-keyboard \ " -PR = "r1" +PR = "r4" + +PACKAGES += "task-gnome-apps task-gnome-fonts task-gnome task-gnome-gstreamer task-gnome-perl task-gnome-pulseaudio task-gnome-themes task-gnome-totem task-gnome-xserver-base task-gnome-xserver" -PACKAGES += "task-gnome-apps task-gnome-fonts task-gnome task-gnome-gstreamer task-gnome-perl task-gnome-pulseaudio task-gnome-themes task-gnome-totem task-gnome-xserver-base" +DEPENDS = "gst-plugins-ugly" RDEPENDS_task-gnome-apps = " \ abiword \ @@ -34,6 +39,7 @@ RDEPENDS_task-gnome-apps = " \ x11vnc angstrom-x11vnc-xinit \ xmms \ xterm \ + eog \ " RDEPENDS_task-gnome-fonts = " \ @@ -105,7 +111,6 @@ DEPENDS_task-gnome-gstreamer = " \ RDEPENDS_task-gnome-gstreamer = " \ gst-ffmpeg \ - gst-omapfb \ gst-plugin-pulse \ gst-plugins-base-meta \ gst-plugins-good-meta \ @@ -167,7 +172,6 @@ RDEPENDS_task-gnome-totem = " \ " RDEPENDS_task-gnome-xserver-base = " \ - ${XSERVER} \ dbus-x11 \ desktop-file-utils \ iso-codes \ @@ -179,13 +183,18 @@ RDEPENDS_task-gnome-xserver-base = " \ xinetd \ xinit \ xlsfonts \ + xrandr \ xrdb \ xrefresh \ xset \ xvinfo \ " -PACKAGE_ARCH_task-gnome-xserver-base = "${MACHINE_ARCH}" +RDEPENDS_task-gnome-xserver = " \ + ${XSERVER} \ +" + +PACKAGE_ARCH_task-gnome-xserver = "${MACHINE_ARCH}" RDEPENDS_${PN} = " \ task-gnome-apps \ @@ -200,3 +209,7 @@ RDEPENDS_${PN} = " \ task-gnome-xserver-base \ " +RRECOMMENDS_${PN} = " \ + task-gnome-xserver \ +" + diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb index 37b051a83f..d59acba026 100644 --- a/recipes/tasks/task-base.bb +++ b/recipes/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r85" +PR = "r87" inherit task @@ -60,6 +60,9 @@ HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","" # DISTRO_SSH_DAEMON ?= "dropbear" +# Distro can override apm provider +DISTRO_APM ?= "apm" + # # bluetooth manager # @@ -190,7 +193,7 @@ RDEPENDS_task-base-acpi = "\ acpid" RDEPENDS_task-base-apm = "\ - apm \ + ${DISTRO_APM} \ apmd \ ${@base_contains('MACHINE_FEATURES', 'kernel24', 'network-suspend-scripts', '',d)}" diff --git a/recipes/tasks/task-beagleboard-demo.bb b/recipes/tasks/task-beagleboard-demo.bb index ca26baaaff..f9867afeea 100644 --- a/recipes/tasks/task-beagleboard-demo.bb +++ b/recipes/tasks/task-beagleboard-demo.bb @@ -5,6 +5,7 @@ PR = "r15" inherit task ECONFIG ?= "places e-wm-config-angstrom e-wm-config-angstrom-touchscreen e-wm-config-angstrom-widescreen e-wm-config-default" +EMENU ?= "e-wm-menu" RDEPENDS_${PN} = "\ task-proper-tools \ @@ -15,7 +16,7 @@ RDEPENDS_${PN} = "\ angstrom-zeroconf-audio \ angstrom-led-config \ gpe-scap \ - mime-support e-wm ${ECONFIG} \ + mime-support e-wm ${ECONFIG} ${EMENU} \ xterm xmms \ firefox midori \ gecko-mediaplayer-firefox-hack \ diff --git a/recipes/tasks/task-boot.bb b/recipes/tasks/task-boot.bb index 0ce9ee4415..45d50ef672 100644 --- a/recipes/tasks/task-boot.bb +++ b/recipes/tasks/task-boot.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a device booting" -PR = "r50" +PR = "r52" inherit task @@ -13,6 +13,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +# update-alternatives script installed in rootfs needs to be the same as +# u-a script used for building image which is defined with +# PREFERRED_PROVIDER_virtual/update-alternatives-native + +DISTRO_UPDATE_ALTERNATIVES ?= "${PREFERRED_PROVIDER_virtual/update-alternatives}" + # Make sure we build the kernel DEPENDS = "virtual/kernel" @@ -26,7 +32,7 @@ RDEPENDS_task-boot = "\ ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ modutils-initscripts \ netbase \ - update-alternatives \ + ${DISTRO_UPDATE_ALTERNATIVES} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ " diff --git a/recipes/tasks/task-fso2-compliance.bb b/recipes/tasks/task-fso2-compliance.bb index 063088d4e8..de7d6c1281 100644 --- a/recipes/tasks/task-fso2-compliance.bb +++ b/recipes/tasks/task-fso2-compliance.bb @@ -3,7 +3,7 @@ Install this task to make your distribution FSO 2.0-compliant." SECTION = "fso/base" LICENSE = "MIT" PV = "1.9.0" -PR = "r3" +PR = "r5" inherit task @@ -17,10 +17,12 @@ RDEPENDS_${PN} = "\ libfsoframework \ libfsoresource \ \ + fsodatad \ fsodeviced \ -# fsogsmd \ + fsogsmd \ + fsotdld \ + fsomusicd \ fsonetworkd \ -# fsotimed \ fsousaged \ \ fso-alsa-data \ diff --git a/recipes/tasks/task-sdk-bare.bb b/recipes/tasks/task-sdk-bare.bb index 9c78cfa45d..f86cc9d81d 100644 --- a/recipes/tasks/task-sdk-bare.bb +++ b/recipes/tasks/task-sdk-bare.bb @@ -22,6 +22,7 @@ GLIBC_PKGS = "\ LIBC_PKGS_linux = "${GLIBC_PKGS}" LIBC_PKGS_linux-gnueabi = "${GLIBC_PKGS}" +LIBC_PKGS_linux-gnuspe = "${GLIBC_PKGS}" LIBC_PKGS_linux-uclibc = "uclibc uclibc-dev uclibc-thread-db" LIBC_PKGS_linux-uclibceabi = "uclibc uclibc-dev uclibc-thread-db" diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index 0a93d39079..7b5d1a2067 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -1,72 +1,85 @@ DESCRIPTION = "SHR Feed" -PR = "r25" +PR = "r35" PV = "1.0" LICENSE = "GPL" inherit task RDEPENDS_${PN} += "\ - python-elementary \ - openmoko-agpsui \ + babiloo-efl \ + claws-mail \ + claws-plugin-mailmbox \ +# claws-plugin-gtkhtml2-viewer \ + claws-plugin-rssyl \ + di \ + dictator \ + dosbox \ + enotes \ + epdfview \ + fbreader \ + ffalarms \ + gpe-calendar \ + gpe-todo \ + gpe-scap \ + gpe-sketchbook \ + gpe-filemanager \ + gpe-gallery \ + gpe-timesheet \ + gpe-contacts \ + gtkmm \ + guitartune \ mc \ mplayer \ - x11vnc \ - omview \ - openvpn \ navit \ + omview \ + orrery \ + python-elementary \ pythm \ - fbreader \ + python-wifi \ omoney \ - enotes \ - epdfview \ + openmoko-agpsui \ + openvpn \ pyphonelog \ +# shr-config \ + shr-today \ + shr-theme-neo \ + shr-theme-niebiee \ + shr-theme-sixteen \ +# gry should be in image already +# shr-theme-gry \ + shr-splash \ + shr-splash-theme-simple \ + shr-splash-theme-dontpanic \ + shr-splash-theme-handy \ + vagalume \ + wireshark \ + x11vnc \ + pingus \ openmoocow \ - dosbox \ - vagalume \ python-pygame \ mokoko \ exhibit \ edje-viewer \ # obexpush \ # obexftp \ + obex-data-server \ mtpaint \ telepathy-python \ intone-video \ ipkg-link \ ipkg-utils \ mysql \ - gpe-calendar \ - gpe-todo \ - gpe-scap \ - gpe-sketchbook \ - gpe-filemanager \ - gpe-gallery \ - gpe-timesheet \ - gpe-contacts \ fltk-chess \ remoko \ -# shr-config \ - shr-today \ - shr-theme-neo \ - shr-theme-niebiee \ - shr-theme-sixteen \ -# gry should be in image already -# shr-theme-gry \ - shr-splash \ - shr-splash-theme-simple \ - shr-splash-theme-dontpanic \ - shr-splash-theme-handy \ openbmap-logger \ pisi \ - ffalarms \ libnotify \ accelges \ ebrainy \ sms-sentry \ cellhunter \ dillo2 \ - usbmode \ pyefl-sudoku \ tasks \ dates \ @@ -84,7 +97,6 @@ RDEPENDS_${PN} += "\ links-x11 \ e-wm-illume-dict-pl \ callrec \ - dictator \ midori \ numptyphysics \ pidgin \ @@ -92,13 +104,9 @@ RDEPENDS_${PN} += "\ libpurple-protocol-icq \ vagalume \ ppp \ -# bluez-hcidump \ + bluez-hcidump \ kbdd \ kexec-tools \ - claws-mail \ - claws-plugin-mailmbox \ -# claws-plugin-gtkhtml2-viewer \ - claws-plugin-rssyl \ mc \ iotop \ xprop \ @@ -135,7 +143,6 @@ RDEPENDS_${PN} += "\ # asterisk \ git \ ruby \ - orrery \ synergy \ irssi \ zhone \ @@ -192,14 +199,12 @@ RDEPENDS_${PN} += "\ font-winitzki-cyrillic \ # font-xfree86-type1 \ # msn-pecan \ - erminig \ qwo \ fso-apm \ fso-abyss \ fsousaged \ fsodeviced \ fsonetworkd \ - fsotimed \ opimd-utils \ omgps \ shr-launcher \ @@ -207,7 +212,6 @@ RDEPENDS_${PN} += "\ elmdentica \ shr-installer \ eject \ - illume-keyboard-german \ illume-keyboard-arabic \ illume-keyboard-browse \ illume-keyboard-danish \ @@ -215,10 +219,11 @@ RDEPENDS_${PN} += "\ illume-keyboard-dutch \ illume-keyboard-dvorak \ illume-keyboard-french \ + illume-keyboard-german \ illume-keyboard-hebrew \ illume-keyboard-numeric-alt \ - illume-keyboard-russian-terminal \ illume-keyboard-russian \ + illume-keyboard-russian-terminal \ python-xlib \ xcompmgr \ man \ @@ -226,7 +231,7 @@ RDEPENDS_${PN} += "\ aceofpenguins-launcher \ om-neon \ ipython \ - phoneme-advanced-foundation \ +# phoneme-advanced-foundation \ eve \ # python-pybluez \ x11perf \ @@ -235,6 +240,7 @@ RDEPENDS_${PN} += "\ bt-gps \ advancedcaching \ glamo-dri-tests \ + bonnie++ \ reiserfsprogs \ blipomoko \ imagemagick \ @@ -242,4 +248,24 @@ RDEPENDS_${PN} += "\ sox \ mpg123 \ zile \ + speex \ + podpooch \ + fltkclock \ + fltkhackdiet \ + fltkwwpointcal \ + transmission \ + xf86-input-tslib \ + fltkcocktailbar \ + fltkcurrency \ + mokoeightball \ + babiloo-efl \ + make \ + dnsmasq \ + libsyncml \ + qi \ + qi-ubi \ + wpa-gui \ + gabriel \ + stopwatch \ + rtmom \ " diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb index c2eb32ad00..8538391df3 100644 --- a/recipes/tasks/task-shr-minimal.bb +++ b/recipes/tasks/task-shr-minimal.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Lite Image Feed" -PR = "r16" +PR = "r20" PV = "2.0" LICENSE = "GPL" @@ -114,12 +114,15 @@ RDEPENDS_${PN}-audio_append_om-gta02 = "\ RDEPENDS_${PN}-x = "\ glibc-utils \ glibc-charmap-utf-8 \ + e-wm-menu-shr \ + shr-wizard \ shr-theme-gry \ etk-theme-shr \ ${@get_rdepends(bb, d)} \ libx11-locale \ libmokoui2 \ xcursor-transparent-theme \ + xinput-calibrator \ " RDEPENDS_${PN}-apps = "\ @@ -134,7 +137,6 @@ RDEPENDS_${PN}-apps = "\ ffalarms \ shr-settings \ shr-theme \ - shr-today \ calc \ " diff --git a/recipes/tasks/task-slugos.bb b/recipes/tasks/task-slugos.bb index 35b0f8382e..8ed43b1983 100644 --- a/recipes/tasks/task-slugos.bb +++ b/recipes/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r23" +PR = "r24" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(nslu2|ixp4xx|sheevaplug)" ALLOW_EMPTY = "1" @@ -129,7 +129,7 @@ RDEPENDS += "\ busybox initscripts-slugos slugos-init \ update-modules sysvinit udev \ module-init-tools modutils-initscripts \ - opkg-collateral opkg-nogpg-nocurl \ + opkg-collateral ${IPKG_VARIANT} \ libgcc \ beep \ util-linux-mount \ |