diff options
Diffstat (limited to 'meta/classes/poky-image.bbclass')
-rw-r--r-- | meta/classes/poky-image.bbclass | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass index e72d17ead1..fe04d54a6e 100644 --- a/meta/classes/poky-image.bbclass +++ b/meta/classes/poky-image.bbclass | |||
@@ -12,6 +12,7 @@ | |||
12 | # - apps-console-core | 12 | # - apps-console-core |
13 | # - x11-base - X11 server + minimal desktop | 13 | # - x11-base - X11 server + minimal desktop |
14 | # - x11-sato - OpenedHand Sato environment | 14 | # - x11-sato - OpenedHand Sato environment |
15 | # - x11-netbook - Metacity based environment for netbooks | ||
15 | # - apps-x11-core - X Terminal, file manager, file editor | 16 | # - apps-x11-core - X Terminal, file manager, file editor |
16 | # - apps-x11-games | 17 | # - apps-x11-games |
17 | # - apps-x11-pimlico - OpenedHand Pimlico apps | 18 | # - apps-x11-pimlico - OpenedHand Pimlico apps |
@@ -42,6 +43,9 @@ POKY_BASE_INSTALL = '\ | |||
42 | ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-poky-x11-sato-dbg", "",d)} \ | 43 | ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-poky-x11-sato-dbg", "",d)} \ |
43 | ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-poky-x11-sato-dev", "",d)} \ | 44 | ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-poky-x11-sato-dev", "",d)} \ |
44 | \ | 45 | \ |
46 | ${@base_contains("IMAGE_FEATURES", "x11-netbook", "task-poky-x11-netbook", "", d)} \ | ||
47 | ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dbg-pkgs"], "task-poky-x11-netbook-dbg", "", d)} \ | ||
48 | ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dev-pkgs"], "task-poky-x11-netbook-dev", "", d)} \ | ||
45 | ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-poky-apps-x11-core", "",d)} \ | 49 | ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-poky-apps-x11-core", "",d)} \ |
46 | ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-poky-apps-x11-core-dbg", "",d)} \ | 50 | ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-poky-apps-x11-core-dbg", "",d)} \ |
47 | ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-poky-apps-x11-core-dev", "",d)} \ | 51 | ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-poky-apps-x11-core-dev", "",d)} \ |
@@ -72,6 +76,7 @@ POKY_BASE_INSTALL = '\ | |||
72 | \ | 76 | \ |
73 | ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \ | 77 | ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \ |
74 | ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \ | 78 | ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \ |
79 | |||
75 | ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \ | 80 | ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \ |
76 | \ | 81 | \ |
77 | ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "",d)} \ | 82 | ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "",d)} \ |
@@ -83,7 +88,9 @@ POKY_EXTRA_INSTALL ?= "" | |||
83 | IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}" | 88 | IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}" |
84 | 89 | ||
85 | X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" | 90 | X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" |
86 | SATO_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-sato apps-x11-games apps-x11-pimlico package-management" | 91 | ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management" |
92 | SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} apps-x11-sato" | ||
93 | NETBOOK_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} apps-x11-netbook" | ||
87 | 94 | ||
88 | inherit image | 95 | inherit image |
89 | 96 | ||