summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-08-29 13:04:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 12:52:55 +0100
commitca8f7ecca7c19933ffcf1a9f080a39a84318ebb4 (patch)
tree465510853c02bb03a5d70d3147b0ea73208fed42 /meta
parent272cb74d70686cb7f72005dc25e02f38b46ecd57 (diff)
downloadpoky-ca8f7ecca7c19933ffcf1a9f080a39a84318ebb4.tar.gz
packagegroup-base: remove some useless items
* Bootloader selection (u-boot, redboot, etc.) is not handled using feature selection anymore, so remove these packages * Realistically there are no packages we can always know that need to be installed for a screen/touchscreen these days, so remove these * Similarly, all RAID configurations can't be supported just using one package or list of packages, so remove the raid package. * Remove default settings of MACHINE_ESSENTIAL_*, these variables aren't referred to in this recipe. * Remove some outdated comments * Fix indenting (From OE-Core rev: 2abf70dc1f43a245d56ef85950be17db1ff32c06) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-base.bb39
1 files changed, 3 insertions, 36 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index ea894b2e2b..85acd1fe72 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -23,16 +23,10 @@ PACKAGES = ' \
23 ${@base_contains("MACHINE_FEATURES", "pci", "packagegroup-base-pci", "",d)} \ 23 ${@base_contains("MACHINE_FEATURES", "pci", "packagegroup-base-pci", "",d)} \
24 ${@base_contains("MACHINE_FEATURES", "pcmcia", "packagegroup-base-pcmcia", "", d)} \ 24 ${@base_contains("MACHINE_FEATURES", "pcmcia", "packagegroup-base-pcmcia", "", d)} \
25 ${@base_contains("MACHINE_FEATURES", "phone", "packagegroup-base-phone", "", d)} \ 25 ${@base_contains("MACHINE_FEATURES", "phone", "packagegroup-base-phone", "", d)} \
26 ${@base_contains("MACHINE_FEATURES", "screen", "packagegroup-base-screen", "", d)} \
27 ${@base_contains("MACHINE_FEATURES", "serial", "packagegroup-base-serial", "", d)} \ 26 ${@base_contains("MACHINE_FEATURES", "serial", "packagegroup-base-serial", "", d)} \
28 ${@base_contains("MACHINE_FEATURES", "touchscreen", "packagegroup-base-touchscreen", "", d)} \
29 ${@base_contains("MACHINE_FEATURES", "usbgadget", "packagegroup-base-usbgadget", "", d)} \ 27 ${@base_contains("MACHINE_FEATURES", "usbgadget", "packagegroup-base-usbgadget", "", d)} \
30 ${@base_contains("MACHINE_FEATURES", "usbhost", "packagegroup-base-usbhost", "", d)} \ 28 ${@base_contains("MACHINE_FEATURES", "usbhost", "packagegroup-base-usbhost", "", d)} \
31 \ 29 \
32 ${@base_contains("MACHINE_FEATURES", "uboot", "packagegroup-base-uboot", "",d)} \
33 ${@base_contains("MACHINE_FEATURES", "redboot", "packagegroup-base-redboot", "",d)} \
34 ${@base_contains("MACHINE_FEATURES", "apex", "packagegroup-base-apex", "",d)} \
35 \
36 ${@base_contains("DISTRO_FEATURES", "bluetooth", "packagegroup-base-bluetooth", "", d)} \ 30 ${@base_contains("DISTRO_FEATURES", "bluetooth", "packagegroup-base-bluetooth", "", d)} \
37 ${@base_contains("DISTRO_FEATURES", "wifi", "packagegroup-base-wifi", "", d)} \ 31 ${@base_contains("DISTRO_FEATURES", "wifi", "packagegroup-base-wifi", "", d)} \
38 ${@base_contains("DISTRO_FEATURES", "3g", "packagegroup-base-3g", "", d)} \ 32 ${@base_contains("DISTRO_FEATURES", "3g", "packagegroup-base-3g", "", d)} \
@@ -42,7 +36,6 @@ PACKAGES = ' \
42 ${@base_contains("DISTRO_FEATURES", "nfs", "packagegroup-base-nfs", "", d)} \ 36 ${@base_contains("DISTRO_FEATURES", "nfs", "packagegroup-base-nfs", "", d)} \
43 ${@base_contains("DISTRO_FEATURES", "ppp", "packagegroup-base-ppp", "", d)} \ 37 ${@base_contains("DISTRO_FEATURES", "ppp", "packagegroup-base-ppp", "", d)} \
44 ${@base_contains("DISTRO_FEATURES", "smbfs", "packagegroup-base-smbfs", "", d)} \ 38 ${@base_contains("DISTRO_FEATURES", "smbfs", "packagegroup-base-smbfs", "", d)} \
45 ${@base_contains("DISTRO_FEATURES", "raid", "packagegroup-base-raid", "",d)} \
46 ${@base_contains("DISTRO_FEATURES", "zeroconf", "packagegroup-base-zeroconf", "", d)} \ 39 ${@base_contains("DISTRO_FEATURES", "zeroconf", "packagegroup-base-zeroconf", "", d)} \
47 \ 40 \
48 ' 41 '
@@ -55,12 +48,6 @@ ALLOW_EMPTY = "1"
55PACKAGE_ARCH = "${MACHINE_ARCH}" 48PACKAGE_ARCH = "${MACHINE_ARCH}"
56 49
57# 50#
58# those ones can be set in machine config to supply packages needed to get machine booting
59#
60MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
61MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
62
63#
64# packagegroup-base contain stuff needed for base system (machine related) 51# packagegroup-base contain stuff needed for base system (machine related)
65# 52#
66RDEPENDS_packagegroup-base = "\ 53RDEPENDS_packagegroup-base = "\
@@ -85,9 +72,6 @@ RDEPENDS_packagegroup-base = "\
85 ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \ 72 ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \
86 ${@base_contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \ 73 ${@base_contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \
87 ${@base_contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \ 74 ${@base_contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \
88 ${@base_contains('COMBINED_FEATURES', 'uboot', 'packagegroup-base-uboot', '',d)} \
89 ${@base_contains('COMBINED_FEATURES', 'redboot', 'packagegroup-base-redboot', '',d)} \
90 ${@base_contains('COMBINED_FEATURES', 'apex', 'packagegroup-base-apex', '',d)} \
91 \ 75 \
92 ${@base_contains('DISTRO_FEATURES', 'nfs', 'packagegroup-base-nfs', '',d)} \ 76 ${@base_contains('DISTRO_FEATURES', 'nfs', 'packagegroup-base-nfs', '',d)} \
93 ${@base_contains('DISTRO_FEATURES', 'cramfs', 'packagegroup-base-cramfs', '',d)} \ 77 ${@base_contains('DISTRO_FEATURES', 'cramfs', 'packagegroup-base-cramfs', '',d)} \
@@ -95,7 +79,6 @@ RDEPENDS_packagegroup-base = "\
95 ${@base_contains('DISTRO_FEATURES', 'ipv6', 'packagegroup-base-ipv6', '',d)} \ 79 ${@base_contains('DISTRO_FEATURES', 'ipv6', 'packagegroup-base-ipv6', '',d)} \
96 ${@base_contains('DISTRO_FEATURES', 'ipsec', 'packagegroup-base-ipsec', '',d)} \ 80 ${@base_contains('DISTRO_FEATURES', 'ipsec', 'packagegroup-base-ipsec', '',d)} \
97 ${@base_contains('DISTRO_FEATURES', 'ppp', 'packagegroup-base-ppp', '',d)} \ 81 ${@base_contains('DISTRO_FEATURES', 'ppp', 'packagegroup-base-ppp', '',d)} \
98 ${@base_contains('DISTRO_FEATURES', 'raid', 'packagegroup-base-raid', '',d)} \
99 ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '',d)} \ 82 ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '',d)} \
100 " 83 "
101 84
@@ -128,13 +111,13 @@ python __anonymous () {
128 machine_features= set(d.getVar("MACHINE_FEATURES", True).split()) 111 machine_features= set(d.getVar("MACHINE_FEATURES", True).split())
129 112
130 if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): 113 if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
131 d.setVar("ADD_BT", "packagegroup-base-bluetooth") 114 d.setVar("ADD_BT", "packagegroup-base-bluetooth")
132 115
133 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): 116 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):
134 d.setVar("ADD_WIFI", "packagegroup-base-wifi") 117 d.setVar("ADD_WIFI", "packagegroup-base-wifi")
135 118
136 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 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):
137 d.setVar("ADD_3G", "packagegroup-base-3g") 120 d.setVar("ADD_3G", "packagegroup-base-3g")
138} 121}
139 122
140# 123#
@@ -188,8 +171,6 @@ RRECOMMENDS_packagegroup-base-alsa = "\
188RDEPENDS_packagegroup-base-pcmcia = "\ 171RDEPENDS_packagegroup-base-pcmcia = "\
189 pcmciautils \ 172 pcmciautils \
190 " 173 "
191#${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)}
192#${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)}
193 174
194 175
195RRECOMMENDS_packagegroup-base-pcmcia = "\ 176RRECOMMENDS_packagegroup-base-pcmcia = "\
@@ -203,8 +184,6 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\
203 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ 184 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
204 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" 185 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
205 186
206# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware!
207
208RDEPENDS_packagegroup-base-bluetooth = "\ 187RDEPENDS_packagegroup-base-bluetooth = "\
209 bluez4 \ 188 bluez4 \
210 ${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \ 189 ${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \
@@ -333,18 +312,6 @@ RRECOMMENDS_packagegroup-base-nfs = "\
333RDEPENDS_packagegroup-base-zeroconf = "\ 312RDEPENDS_packagegroup-base-zeroconf = "\
334 avahi-daemon" 313 avahi-daemon"
335 314
336RDEPENDS_packagegroup-base-raid = "\
337 "
338
339RDEPENDS_packagegroup-base-screen = "\
340 "
341
342#
343# GPE/OPIE/OpenMoko provide own touchscreen calibration utils
344#
345RDEPENDS_packagegroup-base-touchscreen = "\
346 "
347
348RDEPENDS_packagegroup-base-ipv6 = "\ 315RDEPENDS_packagegroup-base-ipv6 = "\
349 " 316 "
350 317