summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2011-08-09 07:16:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-10 13:33:07 +0100
commit94faa71d5c1b25510219ee04c831daa9f242b883 (patch)
tree8f9665a55fdfc2d15e2074ab6fac991de2e15ec4
parenta86252db8b3d60e20d509aae106f2f089fea9adc (diff)
downloadpoky-94faa71d5c1b25510219ee04c831daa9f242b883.tar.gz
core-image: adjust to use the new IMAGE_FEATURES support
(From OE-Core rev: fa7fbc9695829f7fa981b16d9559e9e984494e09) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/classes/core-image.bbclass77
1 files changed, 17 insertions, 60 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index c8c6a57426..507d6a60e6 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -26,73 +26,30 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
26# - nfs-server - NFS server (exports / over NFS to everybody) 26# - nfs-server - NFS server (exports / over NFS to everybody)
27# - ssh-server-dropbear - SSH server (dropbear) 27# - ssh-server-dropbear - SSH server (dropbear)
28# - ssh-server-openssh - SSH server (openssh) 28# - ssh-server-openssh - SSH server (openssh)
29# - dev-pkgs - development packages
30# - dbg-pkgs - debug packages
31# 29#
30PACKAGE_GROUP_apps-console-core = "task-core-apps-console"
31PACKAGE_GROUP_x11-base = "task-core-x11-base"
32PACKAGE_GROUP_x11-sato = "task-core-x11-sato"
33PACKAGE_GROUP_x11-netbook = "task-core-x11-netbook"
34PACKAGE_GROUP_apps-x11-core = "task-core-apps-x11-core"
35PACKAGE_GROUP_apps-x11-games = "task-core-apps-x11-games"
36PACKAGE_GROUP_apps-x11-pimlico = "task-core-apps-x11-pimlico"
37PACKAGE_GROUP_tools-debug = "task-core-tools-debug"
38PACKAGE_GROUP_tools-profile = "task-core-tools-profile"
39PACKAGE_GROUP_tools-testapps = "task-core-tools-testapps"
40PACKAGE_GROUP_tools-sdk = "task-core-sdk task-core-standalone-sdk-target"
41PACKAGE_GROUP_nfs-server = "task-core-nfs-server"
42PACKAGE_GROUP_ssh-server-dropbear = "task-core-ssh-dropbear"
43PACKAGE_GROUP_ssh-server-openssh = "task-core-ssh-openssh"
44PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
45PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos"
32 46
33POKY_BASE_INSTALL = '\ 47POKY_BASE_INSTALL = '\
34 task-core-boot \ 48 task-core-boot \
35 task-base-extended \ 49 task-base-extended \
36 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-core-boot-dbg task-base-dbg", "",d)} \
37 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-core-boot-dev task-base-dev", "",d)} \
38 \ 50 \
39 ${@base_contains("IMAGE_FEATURES", "apps-console-core", "task-core-apps-console", "",d)} \ 51 ${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
40 ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"], "task-core-apps-console-dbg", "",d)} \
41 ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dev-pkgs"], "task-core-apps-console-dev", "",d)} \
42 \ 52 \
43 ${@base_contains("IMAGE_FEATURES", "x11-base", "task-core-x11-base", "",d)} \
44 ${@base_contains("IMAGE_FEATURES", ["x11-base", "dbg-pkgs"], "task-core-x11-base-dbg", "",d)} \
45 ${@base_contains("IMAGE_FEATURES", ["x11-base", "dev-pkgs"], "task-core-x11-base-dev", "",d)} \
46 \
47 ${@base_contains("IMAGE_FEATURES", "x11-sato", "task-core-x11-sato", "",d)} \
48 ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-core-x11-sato-dbg", "",d)} \
49 ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-core-x11-sato-dev", "",d)} \
50 \
51 ${@base_contains("IMAGE_FEATURES", "x11-netbook", "task-core-x11-netbook", "", d)} \
52 ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dbg-pkgs"], "task-core-x11-netbook-dbg", "", d)} \
53 ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dev-pkgs"], "task-core-x11-netbook-dev", "", d)} \
54 ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-core-apps-x11-core", "",d)} \
55 ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-core-apps-x11-core-dbg", "",d)} \
56 ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-core-apps-x11-core-dev", "",d)} \
57 \
58 ${@base_contains("IMAGE_FEATURES", "apps-x11-games", "task-core-apps-x11-games", "",d)} \
59 ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dbg-pkgs"], "task-core-apps-x11-games-dbg", "",d)} \
60 ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dev-pkgs"], "task-core-apps-x11-games-dev", "",d)} \
61 \
62 ${@base_contains("IMAGE_FEATURES", "apps-x11-pimlico", "task-core-apps-x11-pimlico", "",d)} \
63 ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"], "task-core-apps-x11-pimlico-dbg", "",d)} \
64 ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"], "task-core-apps-x11-pimlico-dev", "",d)} \
65 \
66 ${@base_contains("IMAGE_FEATURES", "tools-debug", "task-core-tools-debug", "",d)} \
67 ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dbg-pkgs"], "task-core-tools-debug-dbg", "",d)} \
68 ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dev-pkgs"], "task-core-tools-debug-dev", "",d)} \
69 \
70 ${@base_contains("IMAGE_FEATURES", "tools-profile", "task-core-tools-profile", "",d)} \
71 ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dbg-pkgs"], "task-core-tools-profile-dbg", "",d)} \
72 ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dev-pkgs"], "task-core-tools-profile-dev", "",d)} \
73 \
74 ${@base_contains("IMAGE_FEATURES", "tools-testapps", "task-core-tools-testapps", "",d)} \
75 ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dbg-pkgs"], "task-core-tools-testapps-dbg", "",d)} \
76 ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dev-pkgs"], "task-core-tools-testapps-dev", "",d)} \
77 \
78 ${@base_contains("IMAGE_FEATURES", "tools-sdk", "task-core-sdk task-core-standalone-sdk-target", "",d)} \
79 ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dbg-pkgs"], "task-core-sdk-dbg", "",d)} \
80 ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dev-pkgs"], "task-core-sdk-dev", "",d)} \
81 \
82 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-core-nfs-server", "",d)} \
83 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-core-nfs-server-dbg", "",d)} \
84 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-core-nfs-server-dev", "",d)} \
85 \
86 ${@base_contains("IMAGE_FEATURES", "ssh-server-dropbear", "task-core-ssh-dropbear", "",d)} \
87 ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dbg-pkgs"], "task-core-ssh-dropbear-dbg", "",d)} \
88 ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dev-pkgs"], "task-core-ssh-dropbear-dev", "",d)} \
89 \
90 ${@base_contains("IMAGE_FEATURES", "ssh-server-openssh", "task-core-ssh-openssh", "",d)} \
91 ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dbg-pkgs"], "task-core-ssh-openssh-dbg", "",d)} \
92 ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dev-pkgs"], "task-core-ssh-openssh-dev", "",d)} \
93 \
94 ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
95 ${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-core-qt-demos", "",d)} \
96 ${POKY_EXTRA_INSTALL} \ 53 ${POKY_EXTRA_INSTALL} \
97 ' 54 '
98 55
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 03:58:36 +0000