Signed-off-by: Dongxiao Xu <[email protected]>
---
meta/conf/distro/include/default-distrovars.inc | 2 +-
meta/recipes-core/tasks/task-base.bb | 16 +++++++++++++++-
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 2cde46c..2f36f59 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
libc-utmp libc-utmpx libc-wordexp
libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
libc-posix-wchar-io"
-DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs
zeroconf pci ${DISTRO_FEATURES_LIBC}"
+DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs
zeroconf pci 3g ${DISTRO_FEATURES_LIBC}"
IMAGE_FEATURES ?= ""
diff --git a/meta/recipes-core/tasks/task-base.bb
b/meta/recipes-core/tasks/task-base.bb
index a2a8925..3ff57ff 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
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r70"
+PR = "r71"
inherit task
@@ -35,6 +35,7 @@ PACKAGES = ' \
\
${@base_contains("DISTRO_FEATURES", "bluetooth",
"task-base-bluetooth", "", d)} \
${@base_contains("DISTRO_FEATURES", "wifi", "task-base-wifi", "",
d)} \
+ ${@base_contains("DISTRO_FEATURES", "3g", "task-base-3g", "", d)} \
${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs",
"", d)} \
${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec",
"", d)} \
${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6", "",
d)} \
@@ -95,6 +96,7 @@ RDEPENDS_task-base = "\
${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost',
'',d)} \
${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth',
'',d)} \
${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', '3g', 'task-base-3g', '',d)} \
${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \
${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot',
'',d)} \
${@base_contains('COMBINED_FEATURES', 'apex', 'task-base-apex', '',d)} \
@@ -114,10 +116,12 @@ RDEPENDS_task-base-extended = "\
task-base \
${ADD_WIFI} \
${ADD_BT} \
+ ${ADD_3G} \
"
ADD_WIFI = ""
ADD_BT = ""
+ADD_3G = ""
python __anonymous () {
# If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of
them)
@@ -133,6 +137,9 @@ python __anonymous () {
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):
bb.data.setVar("ADD_WIFI", "task-base-wifi", d)
+
+ 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):
+ bb.data.setVar("ADD_3G", "task-base-3g", d)
}
#
@@ -339,6 +346,13 @@ RRECOMMENDS_task-base-wifi = "\
kernel-module-aes-generic \
kernel-module-aes"
+RDEPENDS_task-base-3g = "\
+ ofono"
+
+RRECOMMENDS_task-base-3g = "\
+ kernel-module-cdc-acm \
+ kernel-module-cdc-wdm"
+
RRECOMMENDS_task-base-smbfs = "\
kernel-module-cifs \
kernel-module-smbfs"
--
1.7.1
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
