Skip to contentSkip to conversation

Change POKY_*_INSTALL to COREIMAGE_*_INSTALL

PATCH In review Saul Wold 2 participants 3 messages Jan 3, 2012

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover Change POKY_*_INSTALL to COREIMAGE_*_INSTALL

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(-)
Signature · 1 line
1.7.6.4
author
#1 lore raw

PATCH 1/1 Rename references from POKY_*_INSTALL to COREIMAGE_*_INSTALL

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 <[email protected]>
---
 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(-)
meta/classes/core-image.bbclass +4 -4
index c08895f..0216aaa 100644
@@ -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"
meta/recipes-core/images/core-image-minimal.bb +1 -1
index 56fc20c..9ec3c18 100644
@@ -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 = " "
meta/recipes-core/images/self-hosted-image.bb +1 -1
index 111c057..278b79e 100644
@@ -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 \
     "
meta/recipes-extended/images/core-image-basic.bb +1 -1
index ba71cd0..ef27e06 100644
@@ -5,6 +5,6 @@ IMAGE_INSTALL = "\
     task-core-basic \
     "
 
-#    ${POKY_BASE_INSTALL} 
+#    ${COREIMAGE_BASE_INSTALL} 
 
 inherit core-image
meta/recipes-extended/images/core-image-lsb-dev.bb +1 -1
index 9ef85ff..40787bb 100644
@@ -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 \
     "
meta/recipes-extended/images/core-image-lsb-sdk.bb +1 -1
index 5e0e7ae..6a17de5 100644
@@ -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 \
     "
meta/recipes-extended/images/core-image-lsb.bb +1 -1
index 22eb7f4..d80954b 100644
@@ -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 \
     "
meta/recipes-graphics/images/core-image-clutter.bb +1 -1
index 7d50405..194748a 100644
@@ -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"
meta/recipes-qt/images/qt4e-demo-image.bb +1 -1
index 6523379..01c7921 100644
@@ -11,7 +11,7 @@ RDEPENDS_${PN} += " \
 	"
 
 IMAGE_INSTALL += "\
-	${POKY_BASE_INSTALL} \
+	${COREIMAGE_BASE_INSTALL} \
 	module-init-tools \
 	task-qt4e-base \
 "
Signature · 1 line
1.7.6.4
#2 lore raw

Re: [PATCH 1/1] Rename references from POKY_*_INSTALL to COREIMAGE_*_INSTALL

Quoted 2 lines · Saul Wold

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...

meta/classes/core-image.bbclass PACKAGE_GROUP_ssh-server-openssh = "task-core-ssh-openssh" · line 56

Quoted 9 lines
meta/classes/core-image.bbclass +2 -2
-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:

meta/recipes-extended/images/core-image-lsb-dev.bb line 5

Quoted 4 lines

IMAGE_INSTALL = "\

meta/recipes-extended/images/core-image-lsb-dev.bb +1 -1
-    ${POKY_BASE_INSTALL} \
+    ${COREIMAGE_BASE_INSTALL} \
    task-core-basic \

Does that patch actually work for you?

p.