diff options
Diffstat (limited to 'meta/classes/core-image.bbclass')
-rw-r--r-- | meta/classes/core-image.bbclass | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 25f5c5a8dc..6b207d7cfa 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass | |||
@@ -47,6 +47,14 @@ PACKAGE_GROUP_ssh-server-openssh = "task-core-ssh-openssh" | |||
47 | PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}" | 47 | PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}" |
48 | PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos" | 48 | PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos" |
49 | 49 | ||
50 | |||
51 | # IMAGE_FEAETURES_REPLACES_foo = 'bar1 bar2' | ||
52 | # Including image feature foo would replace the image features bar1 and bar2 | ||
53 | IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear" | ||
54 | |||
55 | # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' | ||
56 | # An error exception would be raised if both image features foo and bar1(or bar2) are included | ||
57 | |||
50 | CORE_IMAGE_BASE_INSTALL = '\ | 58 | CORE_IMAGE_BASE_INSTALL = '\ |
51 | task-core-boot \ | 59 | task-core-boot \ |
52 | task-base-extended \ | 60 | task-base-extended \ |
@@ -60,7 +68,8 @@ IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}" | |||
60 | 68 | ||
61 | X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" | 69 | X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" |
62 | ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management" | 70 | ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management" |
63 | SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear" | 71 | SSHSERVER_IMAGE_FEATURES ??= "ssh-server-dropbear" |
72 | SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ${SSHSERVER_IMAGE_FEATURES}" | ||
64 | 73 | ||
65 | inherit image | 74 | inherit image |
66 | 75 | ||