diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-02-03 15:49:39 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-08 00:50:29 +0000 |
commit | d6b885b1b5299d2c0c539f552bafc53569bbc2d3 (patch) | |
tree | 70436dc95247ecf7b435eea58a5dc78ad81eafd4 | |
parent | 41936cd5bcfddfbf3374174c1e3cdea951d2d10f (diff) | |
download | poky-d6b885b1b5299d2c0c539f552bafc53569bbc2d3.tar.gz |
classes,recipes: Replace POKY_* with CORE_IMAGE_*
(From OE-Core rev: b14a92f4450bb08b9f11d3fd7a99155315527cdd)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/core-image.bbclass | 8 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/images/self-hosted-image.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/images/core-image-basic.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/images/core-image-lsb-dev.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/images/core-image-lsb-sdk.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/images/core-image-lsb.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/images/core-image-clutter.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/images/core-image-gtk-directfb.bb | 2 | ||||
-rw-r--r-- | meta/recipes-qt/images/qt4e-demo-image.bb | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index c08895ff2d..668297bd40 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass | |||
@@ -47,18 +47,18 @@ 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 | POKY_BASE_INSTALL = '\ | 50 | CORE_IMAGE_BASE_INSTALL = '\ |
51 | task-core-boot \ | 51 | task-core-boot \ |
52 | task-base-extended \ | 52 | task-base-extended \ |
53 | \ | 53 | \ |
54 | ${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \ | 54 | ${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \ |
55 | \ | 55 | \ |
56 | ${POKY_EXTRA_INSTALL} \ | 56 | ${CORE_IMAGE_EXTRA_INSTALL} \ |
57 | ' | 57 | ' |
58 | 58 | ||
59 | POKY_EXTRA_INSTALL ?= "" | 59 | CORE_IMAGE_EXTRA_INSTALL ?= "" |
60 | 60 | ||
61 | IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}" | 61 | IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}" |
62 | 62 | ||
63 | X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" | 63 | X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" |
64 | ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management" | 64 | ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management" |
diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb index 687f72a4cc..7953b805a6 100644 --- a/meta/recipes-core/images/core-image-minimal.bb +++ b/meta/recipes-core/images/core-image-minimal.bb | |||
@@ -3,7 +3,7 @@ | |||
3 | # | 3 | # |
4 | DESCRIPTION = "A small image just capable of allowing a device to boot." | 4 | DESCRIPTION = "A small image just capable of allowing a device to boot." |
5 | 5 | ||
6 | IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${POKY_EXTRA_INSTALL}" | 6 | IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" |
7 | 7 | ||
8 | IMAGE_LINGUAS = " " | 8 | IMAGE_LINGUAS = " " |
9 | 9 | ||
diff --git a/meta/recipes-core/images/self-hosted-image.bb b/meta/recipes-core/images/self-hosted-image.bb index 5029ac2fbb..a0a7592091 100644 --- a/meta/recipes-core/images/self-hosted-image.bb +++ b/meta/recipes-core/images/self-hosted-image.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted" | 1 | IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted" |
2 | 2 | ||
3 | POKY_EXTRA_INSTALL = "\ | 3 | CORE_IMAGE_EXTRA_INSTALL = "\ |
4 | task-self-hosted \ | 4 | task-self-hosted \ |
5 | " | 5 | " |
6 | 6 | ||
diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb index 5e58e60100..f801346376 100644 --- a/meta/recipes-extended/images/core-image-basic.bb +++ b/meta/recipes-extended/images/core-image-basic.bb | |||
@@ -8,6 +8,6 @@ IMAGE_INSTALL = "\ | |||
8 | task-core-basic \ | 8 | task-core-basic \ |
9 | " | 9 | " |
10 | 10 | ||
11 | # ${POKY_BASE_INSTALL} | 11 | # ${CORE_IMAGE_BASE_INSTALL} |
12 | 12 | ||
13 | inherit core-image | 13 | inherit core-image |
diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb index 2d6f6744a8..e6d7bc9d47 100644 --- a/meta/recipes-extended/images/core-image-lsb-dev.bb +++ b/meta/recipes-extended/images/core-image-lsb-dev.bb | |||
@@ -5,7 +5,7 @@ standalone SDK." | |||
5 | IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh" | 5 | IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh" |
6 | 6 | ||
7 | IMAGE_INSTALL = "\ | 7 | IMAGE_INSTALL = "\ |
8 | ${POKY_BASE_INSTALL} \ | 8 | ${CORE_IMAGE_BASE_INSTALL} \ |
9 | task-core-basic \ | 9 | task-core-basic \ |
10 | task-core-lsb \ | 10 | task-core-lsb \ |
11 | " | 11 | " |
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb index 105c8db8a8..08928913f0 100644 --- a/meta/recipes-extended/images/core-image-lsb-sdk.bb +++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb | |||
@@ -7,7 +7,7 @@ EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks" | |||
7 | 7 | ||
8 | 8 | ||
9 | IMAGE_INSTALL = "\ | 9 | IMAGE_INSTALL = "\ |
10 | ${POKY_BASE_INSTALL} \ | 10 | ${CORE_IMAGE_BASE_INSTALL} \ |
11 | task-core-basic \ | 11 | task-core-basic \ |
12 | task-core-lsb \ | 12 | task-core-lsb \ |
13 | " | 13 | " |
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb index f6696183e6..b0a3a4dfa0 100644 --- a/meta/recipes-extended/images/core-image-lsb.bb +++ b/meta/recipes-extended/images/core-image-lsb.bb | |||
@@ -4,7 +4,7 @@ conform to Linux Standard Base (LSB)." | |||
4 | IMAGE_FEATURES += "apps-console-core ssh-server-openssh" | 4 | IMAGE_FEATURES += "apps-console-core ssh-server-openssh" |
5 | 5 | ||
6 | IMAGE_INSTALL = "\ | 6 | IMAGE_INSTALL = "\ |
7 | ${POKY_BASE_INSTALL} \ | 7 | ${CORE_IMAGE_BASE_INSTALL} \ |
8 | task-core-basic \ | 8 | task-core-basic \ |
9 | task-core-lsb \ | 9 | task-core-lsb \ |
10 | " | 10 | " |
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb index 636238a6d1..6c49a02625 100644 --- a/meta/recipes-graphics/images/core-image-clutter.bb +++ b/meta/recipes-graphics/images/core-image-clutter.bb | |||
@@ -6,7 +6,7 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | 7 | ||
8 | IMAGE_INSTALL = "\ | 8 | IMAGE_INSTALL = "\ |
9 | ${POKY_BASE_INSTALL} \ | 9 | ${CORE_IMAGE_BASE_INSTALL} \ |
10 | task-core-clutter-core \ | 10 | task-core-clutter-core \ |
11 | task-core-clutter-tests \ | 11 | task-core-clutter-tests \ |
12 | task-core-clutter-apps" | 12 | task-core-clutter-apps" |
diff --git a/meta/recipes-graphics/images/core-image-gtk-directfb.bb b/meta/recipes-graphics/images/core-image-gtk-directfb.bb index 87b3a86de7..a5fba17f89 100644 --- a/meta/recipes-graphics/images/core-image-gtk-directfb.bb +++ b/meta/recipes-graphics/images/core-image-gtk-directfb.bb | |||
@@ -15,7 +15,7 @@ RDEPENDS_${PN} += " \ | |||
15 | inherit core-image | 15 | inherit core-image |
16 | 16 | ||
17 | IMAGE_INSTALL += "\ | 17 | IMAGE_INSTALL += "\ |
18 | ${POKY_BASE_INSTALL} \ | 18 | ${CORE_IMAGE_BASE_INSTALL} \ |
19 | task-core-basic \ | 19 | task-core-basic \ |
20 | module-init-tools \ | 20 | module-init-tools \ |
21 | task-core-gtk-directfb-base \ | 21 | task-core-gtk-directfb-base \ |
diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb index 652337926b..2e50bf6029 100644 --- a/meta/recipes-qt/images/qt4e-demo-image.bb +++ b/meta/recipes-qt/images/qt4e-demo-image.bb | |||
@@ -11,7 +11,7 @@ RDEPENDS_${PN} += " \ | |||
11 | " | 11 | " |
12 | 12 | ||
13 | IMAGE_INSTALL += "\ | 13 | IMAGE_INSTALL += "\ |
14 | ${POKY_BASE_INSTALL} \ | 14 | ${CORE_IMAGE_BASE_INSTALL} \ |
15 | module-init-tools \ | 15 | module-init-tools \ |
16 | task-qt4e-base \ | 16 | task-qt4e-base \ |
17 | " | 17 | " |