sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Dongxiao Xu 2011-06-28 15:59:06 +08:00 committed by Richard Purdie
parent 69aac1a91f
commit 1dd8237d2e
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/conf/distro/include/default-distrovars.inc
View File

@ -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 ?= ""

16
meta/recipes-core/tasks/task-base.bb
View File

@ -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"