diff options
Diffstat (limited to 'packages/tasks')
| -rw-r--r-- | packages/tasks/task-base.bb | 16 | ||||
| -rw-r--r-- | packages/tasks/task-openmoko.bb | 5 | ||||
| -rw-r--r-- | packages/tasks/task-opie.bb | 4 |
3 files changed, 18 insertions, 7 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 4d16501d6b..17fc9a30f5 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r21" +PR = "r20" PACKAGES = "task-base \ task-base-oh-minimal \ @@ -38,9 +38,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" # irda # pci # pcmcia +# redboot +# uboot # usbgadget # usbhost + DISTRO_CORE_PACKAGE ?= "task-base-core-default" # @@ -62,9 +65,12 @@ RDEPENDS_task-base = "\ ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "uboot", "${task-base-uboot-rdepends}", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "redboot", "${task-base-redboot-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \ + ${@base_contains("DISTRO_FEATURES", "raid", "${task-distro-raid-rdepends}", "",d)} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ ${MACHINE_EXTRA_RDEPENDS} \ ${DISTRO_EXTRA_RDEPENDS}" @@ -247,6 +253,12 @@ task-base-usbhost-rrecommends = "\ kernel-module-usbserial \ kernel-module-usb-storage " +task-base-uboot-rdepends = "\ + uboot-utils" + +task-base-redboot-rdepends = "\ + fis" + task-distro-ppp-rdepends = "\ ppp \ ppp-dialin" @@ -293,6 +305,8 @@ task-distro-nfs-rrecommends = "\ kernel-module-lockd \ kernel-module-sunrpc" +task-distro-raid-rdepends = "\ + " # Tosort # kernel-module-ipv6 diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index ece303d62a..7f8b03ce33 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r32" +PR = "r33" PACKAGES = "\ task-openmoko-linux \ @@ -145,11 +145,8 @@ RDEPENDS_task-openmoko-demo = "\ matchbox-stroke \ matchbox-config-gtk \ matchbox-panel-2-applets \ - matchbox-panel-hacks \ matchbox-themes-extra \ matchbox-themes-gtk \ - matchbox-applet-inputmanager \ - matchbox-applet-startup-monitor \ openmoko-panel-battery \ openmoko-panel-clock \ openmoko-panel-demo \ diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb index 616968ea36..c4f493b80d 100644 --- a/packages/tasks/task-opie.bb +++ b/packages/tasks/task-opie.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" LICENSE = "MIT" PROVIDES = "task-opie-everything" -PR = "r5" +PR = "r6" PACKAGES = "task-opie-applets task-opie-apps task-opie-base \ task-opie-base-applets task-opie-base-apps \ @@ -27,7 +27,7 @@ PACKAGES += "task-opie-everything" # # Dependencies to get the launcher up and running # -RDEPENDS_task-opie-base = "opie-alarm opie-qcop opie-quicklauncher opie-taskbar \ +RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-quicklauncher opie-taskbar \ opie-pics opie-sounds opie-freetype ttf-dejavu-sans \ ttf-dejavu-sans-mono" |