summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-06-28 15:59:06 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-29 14:46:55 +0100
commit1dd8237d2ede012fd31cf4806369f7f001b9dd22 (patch)
treee16c371e19f7b756b3121131be7f311c4aa6522c
parent69aac1a91f8694fb403a8331d69ea350044693fa (diff)
downloadpoky-1dd8237d2ede012fd31cf4806369f7f001b9dd22.tar.gz
task-base: add 3G into DISTRO_FEATURE
(From OE-Core rev: ff014d9634638457622f6019b163e75bafcefada) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/default-distrovars.inc2
-rw-r--r--meta/recipes-core/tasks/task-base.bb16
2 files changed, 16 insertions, 2 deletions
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 2cde46cd7b..2f36f59a1a 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -17,7 +17,7 @@ DISTRO_FEATURES_LIBC ?= "ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-t
17 libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \ 17 libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
18 libc-posix-wchar-io" 18 libc-posix-wchar-io"
19 19
20DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci ${DISTRO_FEATURES_LIBC}" 20DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci 3g ${DISTRO_FEATURES_LIBC}"
21 21
22IMAGE_FEATURES ?= "" 22IMAGE_FEATURES ?= ""
23 23
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index a2a8925225..3ff57ff794 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/p
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
4 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 4 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
5PR = "r70" 5PR = "r71"
6 6
7inherit task 7inherit task
8 8
@@ -35,6 +35,7 @@ PACKAGES = ' \
35 \ 35 \
36 ${@base_contains("DISTRO_FEATURES", "bluetooth", "task-base-bluetooth", "", d)} \ 36 ${@base_contains("DISTRO_FEATURES", "bluetooth", "task-base-bluetooth", "", d)} \
37 ${@base_contains("DISTRO_FEATURES", "wifi", "task-base-wifi", "", d)} \ 37 ${@base_contains("DISTRO_FEATURES", "wifi", "task-base-wifi", "", d)} \
38 ${@base_contains("DISTRO_FEATURES", "3g", "task-base-3g", "", d)} \
38 ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs", "", d)} \ 39 ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs", "", d)} \
39 ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec", "", d)} \ 40 ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec", "", d)} \
40 ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6", "", d)} \ 41 ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6", "", d)} \
@@ -95,6 +96,7 @@ RDEPENDS_task-base = "\
95 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \ 96 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \
96 ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \ 97 ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \
97 ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \ 98 ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \
99 ${@base_contains('COMBINED_FEATURES', '3g', 'task-base-3g', '',d)} \
98 ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \ 100 ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \
99 ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \ 101 ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \
100 ${@base_contains('COMBINED_FEATURES', 'apex', 'task-base-apex', '',d)} \ 102 ${@base_contains('COMBINED_FEATURES', 'apex', 'task-base-apex', '',d)} \
@@ -114,10 +116,12 @@ RDEPENDS_task-base-extended = "\
114 task-base \ 116 task-base \
115 ${ADD_WIFI} \ 117 ${ADD_WIFI} \
116 ${ADD_BT} \ 118 ${ADD_BT} \
119 ${ADD_3G} \
117 " 120 "
118 121
119ADD_WIFI = "" 122ADD_WIFI = ""
120ADD_BT = "" 123ADD_BT = ""
124ADD_3G = ""
121 125
122python __anonymous () { 126python __anonymous () {
123 # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) 127 # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them)
@@ -133,6 +137,9 @@ python __anonymous () {
133 137
134 if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): 138 if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
135 bb.data.setVar("ADD_WIFI", "task-base-wifi", d) 139 bb.data.setVar("ADD_WIFI", "task-base-wifi", d)
140
141 if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
142 bb.data.setVar("ADD_3G", "task-base-3g", d)
136} 143}
137 144
138# 145#
@@ -339,6 +346,13 @@ RRECOMMENDS_task-base-wifi = "\
339 kernel-module-aes-generic \ 346 kernel-module-aes-generic \
340 kernel-module-aes" 347 kernel-module-aes"
341 348
349RDEPENDS_task-base-3g = "\
350 ofono"
351
352RRECOMMENDS_task-base-3g = "\
353 kernel-module-cdc-acm \
354 kernel-module-cdc-wdm"
355
342RRECOMMENDS_task-base-smbfs = "\ 356RRECOMMENDS_task-base-smbfs = "\
343 kernel-module-cifs \ 357 kernel-module-cifs \
344 kernel-module-smbfs" 358 kernel-module-smbfs"