diff options
Diffstat (limited to 'meta/recipes-core/packagegroups')
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-base.bb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 100cc88be3..799e12a7ac 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb | |||
@@ -28,6 +28,7 @@ PACKAGES = ' \ | |||
28 | ${@base_contains("DISTRO_FEATURES", "bluetooth", "packagegroup-base-bluetooth", "", d)} \ | 28 | ${@base_contains("DISTRO_FEATURES", "bluetooth", "packagegroup-base-bluetooth", "", d)} \ |
29 | ${@base_contains("DISTRO_FEATURES", "wifi", "packagegroup-base-wifi", "", d)} \ | 29 | ${@base_contains("DISTRO_FEATURES", "wifi", "packagegroup-base-wifi", "", d)} \ |
30 | ${@base_contains("DISTRO_FEATURES", "3g", "packagegroup-base-3g", "", d)} \ | 30 | ${@base_contains("DISTRO_FEATURES", "3g", "packagegroup-base-3g", "", d)} \ |
31 | ${@base_contains("DISTRO_FEATURES", "nfc", "packagegroup-base-nfc", "", d)} \ | ||
31 | ${@base_contains("DISTRO_FEATURES", "cramfs", "packagegroup-base-cramfs", "", d)} \ | 32 | ${@base_contains("DISTRO_FEATURES", "cramfs", "packagegroup-base-cramfs", "", d)} \ |
32 | ${@base_contains("DISTRO_FEATURES", "ipsec", "packagegroup-base-ipsec", "", d)} \ | 33 | ${@base_contains("DISTRO_FEATURES", "ipsec", "packagegroup-base-ipsec", "", d)} \ |
33 | ${@base_contains("DISTRO_FEATURES", "ipv6", "packagegroup-base-ipv6", "", d)} \ | 34 | ${@base_contains("DISTRO_FEATURES", "ipv6", "packagegroup-base-ipv6", "", d)} \ |
@@ -71,6 +72,7 @@ RDEPENDS_packagegroup-base = "\ | |||
71 | ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \ | 72 | ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \ |
72 | ${@base_contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \ | 73 | ${@base_contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \ |
73 | ${@base_contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \ | 74 | ${@base_contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \ |
75 | ${@base_contains('COMBINED_FEATURES', 'nfc', 'packagegroup-base-nfc', '',d)} \ | ||
74 | \ | 76 | \ |
75 | ${@base_contains('DISTRO_FEATURES', 'nfs', 'packagegroup-base-nfs', '',d)} \ | 77 | ${@base_contains('DISTRO_FEATURES', 'nfs', 'packagegroup-base-nfs', '',d)} \ |
76 | ${@base_contains('DISTRO_FEATURES', 'cramfs', 'packagegroup-base-cramfs', '',d)} \ | 78 | ${@base_contains('DISTRO_FEATURES', 'cramfs', 'packagegroup-base-cramfs', '',d)} \ |
@@ -96,11 +98,13 @@ RDEPENDS_packagegroup-base-extended = "\ | |||
96 | ${ADD_WIFI} \ | 98 | ${ADD_WIFI} \ |
97 | ${ADD_BT} \ | 99 | ${ADD_BT} \ |
98 | ${ADD_3G} \ | 100 | ${ADD_3G} \ |
101 | ${ADD_NFC} \ | ||
99 | " | 102 | " |
100 | 103 | ||
101 | ADD_WIFI = "" | 104 | ADD_WIFI = "" |
102 | ADD_BT = "" | 105 | ADD_BT = "" |
103 | ADD_3G = "" | 106 | ADD_3G = "" |
107 | ADD_NFC = "" | ||
104 | 108 | ||
105 | python __anonymous () { | 109 | python __anonymous () { |
106 | # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) | 110 | # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) |
@@ -118,6 +122,9 @@ python __anonymous () { | |||
118 | 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): | 122 | 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): |
119 | d.setVar("ADD_3G", "packagegroup-base-3g") | 123 | d.setVar("ADD_3G", "packagegroup-base-3g") |
120 | 124 | ||
125 | if "nfc" in distro_features and not "nfc" in machine_features and ("usbhost" in machine_features): | ||
126 | d.setVar("ADD_NFC", "packagegroup-base-nfc") | ||
127 | |||
121 | # For backwards compatibility after rename | 128 | # For backwards compatibility after rename |
122 | packages = d.getVar("PACKAGES", True).split() | 129 | packages = d.getVar("PACKAGES", True).split() |
123 | for pkg in packages: | 130 | for pkg in packages: |
@@ -309,6 +316,13 @@ RRECOMMENDS_packagegroup-base-wifi = "\ | |||
309 | kernel-module-aes-generic \ | 316 | kernel-module-aes-generic \ |
310 | kernel-module-aes" | 317 | kernel-module-aes" |
311 | 318 | ||
319 | SUMMARY_packagegroup-base-nfc = "Near Field Communication support" | ||
320 | RDEPENDS_packagegroup-base-nfc = "\ | ||
321 | neard" | ||
322 | |||
323 | RRECOMMENDS_packagegroup-base-nfc = "\ | ||
324 | kernel-module-nfc" | ||
325 | |||
312 | SUMMARY_packagegroup-base-3g = "Cellular data support" | 326 | SUMMARY_packagegroup-base-3g = "Cellular data support" |
313 | RDEPENDS_packagegroup-base-3g = "\ | 327 | RDEPENDS_packagegroup-base-3g = "\ |
314 | ofono" | 328 | ofono" |