diff options
| -rw-r--r-- | packages/tasks/task-base.bb | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 049a283c4b..1a66f0ace1 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" MAINTAINER = "Richard Purdie <richard@openedhand.com>" -PR = "r1" +PR = "r2" PACKAGES = "task-base \ task-base-minimal \ @@ -16,8 +16,10 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" # kernel24 # kernel26 # apm +# keyboard +# touchscreen -# Valid only in DISTO_FEATURES: +# Valid only in DISTRO_FEATURES: # # nfs # smbfs @@ -72,6 +74,7 @@ RDEPENDS_task-base = "\ ${@base_contains("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-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", "wifi", "${task-distro-wifi-rdepends}", "",d)} \ @@ -132,9 +135,7 @@ RDEPENDS_task-base-core-default = '\ RRECOMMENDS_task-base-core-default = '\ - dropbear \ - portmap' - + dropbear ' task-base-kernel26-rdepends = "\ @@ -181,8 +182,8 @@ task-base-pcmcia-rrecommends = "\ kernel-module-airo-cs \ kernel-module-pcnet-cs \ kernel-module-serial-cs \ - kernel-module-hostap-cs \ kernel-module-ide-cs \ + ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-hostap-cs", "",d)} \ ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-orinoco-cs", "",d)} \ ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-spectrum-cs", "",d)}" @@ -195,6 +196,7 @@ task-base-bluetooth-rrecommends = "\ kernel-module-hidp \ kernel-module-hci-uart \ kernel-module-sco \ + ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-hci-usb", "",d)} \ ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetooth3c-cs", "",d)} \ ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluecard-cs", "",d)} \ ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetoothuart-cs", "",d)} \ @@ -212,7 +214,7 @@ task-base-irda-rrecommends = "\ kernel-module-irnet \ kernel-module-irport \ kernel-module-irtty \ - kernel-module-ir-usb" + ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-ir-usb", "",d)} " task-base-usbgadget-rrecommends = "\ kernel-module-gadgetfs \ @@ -229,10 +231,8 @@ task-base-usbhost-rrecommends = "\ kernel-module-scsi-mod \ kernel-module-usbmouse \ kernel-module-mousedev \ - kernel-module-hci-usb \ kernel-module-usbserial \ - kernel-module-usb-storage \ - kernel-module-ir-usb" + kernel-module-usb-storage " task-distro-ppp-rdepends = "\ ppp \ @@ -255,11 +255,15 @@ task-distro-wifi-rdepends = "\ wpa-supplicant-nossl" task-distro-smbfs-rrecommends = "\ + kernel-module-cifs \ kernel-module-smbfs" task-distro-cramfs-rrecommends = "\ kernel-module-cramfs" +task-distro-nfs-rdepends = "\ + portmap" + task-distro-nfs-rrecommends = "\ kernel-module-nfs \ kernel-module-lockd \ @@ -268,7 +272,6 @@ task-distro-nfs-rrecommends = "\ # Tosort # kernel-module-ipv6 -# kernel-module-ipsec # kernel-module-nvrd # kernel-module-mip6-mn # kernel-module-tun @@ -277,7 +280,6 @@ task-distro-nfs-rrecommends = "\ # kernel-module-loop # kernel-module-vfat # kernel-module-ext2 -# kernel-module-nfs # kernel-module-sco # kernel-module-af_packet # kernel-module-ip-gre |