* [PATCH 0/1] Change POKY_*_INSTALL to COREIMAGE_*_INSTALL
@ 2012-01-03 16:40 Saul Wold
2012-01-03 16:40 ` [PATCH 1/1] Rename references from " Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Saul Wold @ 2012-01-03 16:40 UTC (permalink / raw)
To: openembedded-core
This will require a coordinated change with meta-qt3 and will cause
issues with the Autobuilder for 1.1.1 builds since we will need to
the AB tagging working.
Sau!
The following changes since commit de679a3036ebef1c7d7b8ee23f05590c95e498d9:
pseudo: ensure libs are included in package (2012-01-03 12:10:59 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
Saul Wold (1):
Rename references from POKY_*_INSTALL to COREIMAGE_*_INSTALL
meta/classes/core-image.bbclass | 8 ++++----
meta/recipes-core/images/core-image-minimal.bb | 2 +-
meta/recipes-core/images/self-hosted-image.bb | 2 +-
meta/recipes-extended/images/core-image-basic.bb | 2 +-
meta/recipes-extended/images/core-image-lsb-dev.bb | 2 +-
meta/recipes-extended/images/core-image-lsb-sdk.bb | 2 +-
meta/recipes-extended/images/core-image-lsb.bb | 2 +-
meta/recipes-graphics/images/core-image-clutter.bb | 2 +-
meta/recipes-qt/images/qt4e-demo-image.bb | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
--
1.7.6.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] Rename references from POKY_*_INSTALL to COREIMAGE_*_INSTALL
2012-01-03 16:40 [PATCH 0/1] Change POKY_*_INSTALL to COREIMAGE_*_INSTALL Saul Wold
@ 2012-01-03 16:40 ` Saul Wold
2012-01-03 16:47 ` Phil Blundell
0 siblings, 1 reply; 3+ messages in thread
From: Saul Wold @ 2012-01-03 16:40 UTC (permalink / raw)
To: openembedded-core
The names POKY_BASE_INSTALL and POKY_EXTRA_INSTALL have been renamed to
COREIMAGE_BASE_INSTALL and COREIMAGE_EXTRA_INSTALL
Based on Mark Hatle's original work.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/core-image.bbclass | 8 ++++----
meta/recipes-core/images/core-image-minimal.bb | 2 +-
meta/recipes-core/images/self-hosted-image.bb | 2 +-
meta/recipes-extended/images/core-image-basic.bb | 2 +-
meta/recipes-extended/images/core-image-lsb-dev.bb | 2 +-
meta/recipes-extended/images/core-image-lsb-sdk.bb | 2 +-
meta/recipes-extended/images/core-image-lsb.bb | 2 +-
meta/recipes-graphics/images/core-image-clutter.bb | 2 +-
meta/recipes-qt/images/qt4e-demo-image.bb | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index c08895f..0216aaa 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"
PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos"
-POKY_BASE_INSTALL = '\
+COERIMAGE_BASE_INSTALL = '\
task-core-boot \
task-base-extended \
\
${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
\
- ${POKY_EXTRA_INSTALL} \
+ ${COERIMAGE_EXTRA_INSTALL} \
'
-POKY_EXTRA_INSTALL ?= ""
+COERIMAGE_EXTRA_INSTALL ?= ""
-IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}"
+IMAGE_INSTALL ?= "${COERIMAGE_BASE_INSTALL}"
X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management"
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 56fc20c..9ec3c18 100644
--- a/meta/recipes-core/images/core-image-minimal.bb
+++ b/meta/recipes-core/images/core-image-minimal.bb
@@ -1,7 +1,7 @@
#
# Copyright (C) 2007 OpenedHand Ltd.
#
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${POKY_EXTRA_INSTALL}"
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${COERIMAGE_EXTRA_INSTALL}"
IMAGE_LINGUAS = " "
diff --git a/meta/recipes-core/images/self-hosted-image.bb b/meta/recipes-core/images/self-hosted-image.bb
index 111c057..278b79e 100644
--- a/meta/recipes-core/images/self-hosted-image.bb
+++ b/meta/recipes-core/images/self-hosted-image.bb
@@ -1,6 +1,6 @@
IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"
-POKY_EXTRA_INSTALL = "\
+COERIMAGE_EXTRA_INSTALL = "\
task-self-hosted \
"
diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index ba71cd0..ef27e06 100644
--- a/meta/recipes-extended/images/core-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -5,6 +5,6 @@ IMAGE_INSTALL = "\
task-core-basic \
"
-# ${POKY_BASE_INSTALL}
+# ${COREIMAGE_BASE_INSTALL}
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 9ef85ff..40787bb 100644
--- a/meta/recipes-extended/images/core-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/core-image-lsb-dev.bb
@@ -1,7 +1,7 @@
IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
IMAGE_INSTALL = "\
- ${POKY_BASE_INSTALL} \
+ ${COREIMAGE_BASE_INSTALL} \
task-core-basic \
task-core-lsb \
"
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb
index 5e0e7ae..6a17de5 100644
--- a/meta/recipes-extended/images/core-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb
@@ -3,7 +3,7 @@ EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
IMAGE_INSTALL = "\
- ${POKY_BASE_INSTALL} \
+ ${COREIMAGE_BASE_INSTALL} \
task-core-basic \
task-core-lsb \
"
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index 22eb7f4..d80954b 100644
--- a/meta/recipes-extended/images/core-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -1,7 +1,7 @@
IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
IMAGE_INSTALL = "\
- ${POKY_BASE_INSTALL} \
+ ${COREIMAGE_BASE_INSTALL} \
task-core-basic \
task-core-lsb \
"
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index 7d50405..194748a 100644
--- a/meta/recipes-graphics/images/core-image-clutter.bb
+++ b/meta/recipes-graphics/images/core-image-clutter.bb
@@ -3,7 +3,7 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
LICENSE = "MIT"
IMAGE_INSTALL = "\
- ${POKY_BASE_INSTALL} \
+ ${COREIMAGE_BASE_INSTALL} \
task-core-clutter-core \
task-core-clutter-tests \
task-core-clutter-apps"
diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb
index 6523379..01c7921 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} += " \
"
IMAGE_INSTALL += "\
- ${POKY_BASE_INSTALL} \
+ ${COREIMAGE_BASE_INSTALL} \
module-init-tools \
task-qt4e-base \
"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] Rename references from POKY_*_INSTALL to COREIMAGE_*_INSTALL
2012-01-03 16:40 ` [PATCH 1/1] Rename references from " Saul Wold
@ 2012-01-03 16:47 ` Phil Blundell
0 siblings, 0 replies; 3+ messages in thread
From: Phil Blundell @ 2012-01-03 16:47 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2012-01-03 at 08:40 -0800, Saul Wold wrote:
> The names POKY_BASE_INSTALL and POKY_EXTRA_INSTALL have been renamed to
> COREIMAGE_BASE_INSTALL and COREIMAGE_EXTRA_INSTALL
Actually, it seems that they haven't quite...
> -POKY_BASE_INSTALL = '\
> +COERIMAGE_BASE_INSTALL = '\
> task-core-boot \
> task-base-extended \
> \
> ${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
> \
> - ${POKY_EXTRA_INSTALL} \
> + ${COERIMAGE_EXTRA_INSTALL} \
[...]
But:
> IMAGE_INSTALL = "\
>- ${POKY_BASE_INSTALL} \
>+ ${COREIMAGE_BASE_INSTALL} \
> task-core-basic \
Does that patch actually work for you?
p.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-01-03 16:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-03 16:40 [PATCH 0/1] Change POKY_*_INSTALL to COREIMAGE_*_INSTALL Saul Wold
2012-01-03 16:40 ` [PATCH 1/1] Rename references from " Saul Wold
2012-01-03 16:47 ` Phil Blundell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox