Skip to contentSkip to conversation

Rename references to POKY_*_INSTALL to OE..

PATCH In review Mark Hatle 3 participants 5 messages Dec 8, 2011

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover Rename references to POKY_*_INSTALL to OE..

The following changes since commit 60f0b866b4b7c4aa337a2ff764455741a73665da:

package.bbclass: Adding license collection (2011-12-08 15:23:58 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/poky-rename
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/poky-rename

Mark Hatle (1):
Rename leftover POKY references to OE in image variables

 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.3.4
author
#1 lore raw

PATCH 1/1 Rename leftover POKY references to OE in image variables

The names POKY_BASE_INSTALL and POKY_EXTRA_INSTALL have been renamed to OE_BASE_INSTALL and OE_EXTRA_INSTALL.

Signed-off-by Mark Hatle <[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 8e83d4a..fd8d5d2 100644
@@ -45,18 +45,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 = '\
+OE_BASE_INSTALL = '\
     task-core-boot \
     task-base-extended \
     \
     ${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
     \
-    ${POKY_EXTRA_INSTALL} \
+    ${OE_EXTRA_INSTALL} \
     '
 
-POKY_EXTRA_INSTALL ?= ""
+OE_EXTRA_INSTALL ?= ""
 
-IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}"
+IMAGE_INSTALL ?= "${OE_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..4837cd4 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} ${OE_EXTRA_INSTALL}"
 
 IMAGE_LINGUAS = " "
meta/recipes-core/images/self-hosted-image.bb +1 -1
index 53bd989..255928f 100644
@@ -1,6 +1,6 @@
 IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"
 
-POKY_EXTRA_INSTALL = "\
+OE_EXTRA_INSTALL = "\
     task-self-hosted \
     "
meta/recipes-extended/images/core-image-basic.bb +1 -1
index ba71cd0..5543fe9 100644
@@ -5,6 +5,6 @@ IMAGE_INSTALL = "\
     task-core-basic \
     "
 
-#    ${POKY_BASE_INSTALL} 
+#    ${OE_BASE_INSTALL} 
 
 inherit core-image
meta/recipes-extended/images/core-image-lsb-dev.bb +1 -1
index 9ef85ff..98ec5ae 100644
@@ -1,7 +1,7 @@
 IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
 
 IMAGE_INSTALL = "\
-    ${POKY_BASE_INSTALL} \
+    ${OE_BASE_INSTALL} \
     task-core-basic \
     task-core-lsb \
     "
meta/recipes-extended/images/core-image-lsb-sdk.bb +1 -1
index 5e0e7ae..94ab995 100644
@@ -3,7 +3,7 @@ EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
 
 
 IMAGE_INSTALL = "\
-    ${POKY_BASE_INSTALL} \
+    ${OE_BASE_INSTALL} \
     task-core-basic \
     task-core-lsb \
     "
meta/recipes-extended/images/core-image-lsb.bb +1 -1
index 22eb7f4..7369c89 100644
@@ -1,7 +1,7 @@
 IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
 
 IMAGE_INSTALL = "\
-    ${POKY_BASE_INSTALL} \
+    ${OE_BASE_INSTALL} \
     task-core-basic \
     task-core-lsb \
     "
meta/recipes-graphics/images/core-image-clutter.bb +1 -1
index 7d50405..a4adc54 100644
@@ -3,7 +3,7 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
 LICENSE = "MIT"
 
 IMAGE_INSTALL = "\
-    ${POKY_BASE_INSTALL} \
+    ${OE_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..5d0a992 100644
@@ -11,7 +11,7 @@ RDEPENDS_${PN} += " \
 	"
 
 IMAGE_INSTALL += "\
-	${POKY_BASE_INSTALL} \
+	${OE_BASE_INSTALL} \
 	module-init-tools \
 	task-qt4e-base \
 "
Signature · 1 line
1.7.3.4
#2 lore raw

Re: [PATCH 1/1] Rename leftover POKY references to OE in image variables

Quoted 3 lines · Mark Hatle

The names POKY_BASE_INSTALL and POKY_EXTRA_INSTALL have been renamed to OE_BASE_INSTALL and OE_EXTRA_INSTALL.

How about calling it IMAGE_* instead ?

Quoted 150 lines
Signed-off-by Mark Hatle <[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 +0 -0
index 8e83d4a..fd8d5d2 100644
@@ -45,18 +45,18 @@ PACKAGE_GROUP_ssh-server-openssh = "task-core-ssh-openssh"

 PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}" PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos"

meta/classes/core-image.bbclass +1 -1
-POKY_BASE_INSTALL = '\
+OE_BASE_INSTALL = '\

    task-core-boot \
    task-base-extended \
    \
    ${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
    \
-    ${POKY_EXTRA_INSTALL} \
+    ${OE_EXTRA_INSTALL} \
    '

meta/classes/core-image.bbclass +2 -2
-POKY_EXTRA_INSTALL ?= ""
+OE_EXTRA_INSTALL ?= ""
 
-IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}"
+IMAGE_INSTALL ?= "${OE_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..4837cd4 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} ${OE_EXTRA_INSTALL}"

 IMAGE_LINGUAS = " "

meta/recipes-core/images/self-hosted-image.bb +0 -0
index 53bd989..255928f 100644
@@ -1,6 +1,6 @@

 IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"

meta/recipes-core/images/self-hosted-image.bb +1 -1
-POKY_EXTRA_INSTALL = "\
+OE_EXTRA_INSTALL = "\

    task-self-hosted \
    "

meta/recipes-extended/images/core-image-basic.bb +0 -0
index ba71cd0..5543fe9 100644
@@ -5,6 +5,6 @@ IMAGE_INSTALL = "\
     task-core-basic \

    "

meta/recipes-extended/images/core-image-basic.bb +1 -1
-#    ${POKY_BASE_INSTALL}
+#    ${OE_BASE_INSTALL}

 inherit core-image

meta/recipes-extended/images/core-image-lsb-dev.bb +0 -0
index 9ef85ff..98ec5ae 100644
@@ -1,7 +1,7 @@

 IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"

 IMAGE_INSTALL = "\
-    ${POKY_BASE_INSTALL} \
+    ${OE_BASE_INSTALL} \
    task-core-basic \
    task-core-lsb \
    "

meta/recipes-extended/images/core-image-lsb-sdk.bb +1 -1
index 5e0e7ae..94ab995 100644
@@ -3,7 +3,7 @@ EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
 
 
  IMAGE_INSTALL = "\
-    ${POKY_BASE_INSTALL} \
+    ${OE_BASE_INSTALL} \
     task-core-basic \
     task-core-lsb \

    "

meta/recipes-extended/images/core-image-lsb.bb +0 -0
index 22eb7f4..7369c89 100644
@@ -1,7 +1,7 @@

 IMAGE_FEATURES += "apps-console-core ssh-server-openssh"

 IMAGE_INSTALL = "\
-    ${POKY_BASE_INSTALL} \
+    ${OE_BASE_INSTALL} \
    task-core-basic \
    task-core-lsb \
    "

meta/recipes-graphics/images/core-image-clutter.bb +0 -0
index 7d50405..a4adc54 100644
@@ -3,7 +3,7 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"

 LICENSE = "MIT"

 IMAGE_INSTALL = "\
-    ${POKY_BASE_INSTALL} \
+    ${OE_BASE_INSTALL} \
    task-core-clutter-core \
    task-core-clutter-tests \
    task-core-clutter-apps"

meta/recipes-qt/images/qt4e-demo-image.bb +0 -0
index 6523379..5d0a992 100644
@@ -11,7 +11,7 @@ RDEPENDS_${PN} += " \

       "

 IMAGE_INSTALL += "\
-       ${POKY_BASE_INSTALL} \
+       ${OE_BASE_INSTALL} \
       module-init-tools \
       task-qt4e-base \
 "
--
1.7.3.4

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

author
#3 lore raw

Re: [PATCH 1/1] Rename leftover POKY references to OE in image variables

Quoted 6 lines · Khem Raj
Quoted 3 lines · Mark Hatle

The names POKY_BASE_INSTALL and POKY_EXTRA_INSTALL have been renamed to OE_BASE_INSTALL and OE_EXTRA_INSTALL.

How about calling it IMAGE_* instead ?

I don't have any objections to that. (All I did was rename POKY to OE, as I believe that was originally intended...)

Richard, anyone else, have any comments before I make that change?

--Mark

Quoted 155 lines
Quoted 146 lines
Signed-off-by Mark Hatle<[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 8e83d4a..fd8d5d2 100644
@@ -45,18 +45,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 = '\
+OE_BASE_INSTALL = '\
     task-core-boot \
     task-base-extended \
     \
     ${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
     \
-    ${POKY_EXTRA_INSTALL} \
+    ${OE_EXTRA_INSTALL} \
     '
 
-POKY_EXTRA_INSTALL ?= ""
+OE_EXTRA_INSTALL ?= ""
 
-IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}"
+IMAGE_INSTALL ?= "${OE_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..4837cd4 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} ${OE_EXTRA_INSTALL}"
 
  IMAGE_LINGUAS = " "
meta/recipes-core/images/self-hosted-image.bb +1 -1
index 53bd989..255928f 100644
@@ -1,6 +1,6 @@
  IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"
 
-POKY_EXTRA_INSTALL = "\
+OE_EXTRA_INSTALL = "\
     task-self-hosted \
     "
meta/recipes-extended/images/core-image-basic.bb +1 -1
index ba71cd0..5543fe9 100644
@@ -5,6 +5,6 @@ IMAGE_INSTALL = "\
     task-core-basic \
     "
 
-#    ${POKY_BASE_INSTALL}
+#    ${OE_BASE_INSTALL}
 
  inherit core-image
meta/recipes-extended/images/core-image-lsb-dev.bb +1 -1
index 9ef85ff..98ec5ae 100644
@@ -1,7 +1,7 @@
  IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
 
  IMAGE_INSTALL = "\
-    ${POKY_BASE_INSTALL} \
+    ${OE_BASE_INSTALL} \
     task-core-basic \
     task-core-lsb \
     "
meta/recipes-extended/images/core-image-lsb-sdk.bb +1 -1
index 5e0e7ae..94ab995 100644
@@ -3,7 +3,7 @@ EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
 
 
  IMAGE_INSTALL = "\
-    ${POKY_BASE_INSTALL} \
+    ${OE_BASE_INSTALL} \
     task-core-basic \
     task-core-lsb \
     "
meta/recipes-extended/images/core-image-lsb.bb +1 -1
index 22eb7f4..7369c89 100644
@@ -1,7 +1,7 @@
  IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
 
  IMAGE_INSTALL = "\
-    ${POKY_BASE_INSTALL} \
+    ${OE_BASE_INSTALL} \
     task-core-basic \
     task-core-lsb \
     "
meta/recipes-graphics/images/core-image-clutter.bb +1 -1
index 7d50405..a4adc54 100644
@@ -3,7 +3,7 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
  LICENSE = "MIT"
 
  IMAGE_INSTALL = "\
-    ${POKY_BASE_INSTALL} \
+    ${OE_BASE_INSTALL} \
     task-core-clutter-core \
     task-core-clutter-tests \
     task-core-clutter-apps"
meta/recipes-qt/images/qt4e-demo-image.bb +1 -2
index 6523379..5d0a992 100644
@@ -11,7 +11,7 @@ RDEPENDS_${PN} += " \
        "
 
  IMAGE_INSTALL += "\
-       ${POKY_BASE_INSTALL} \
+       ${OE_BASE_INSTALL} \
        module-init-tools \
        task-qt4e-base \
  "
--

1.7.3.4

Quoted 4 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#4 lore raw

Re: [PATCH 1/1] Rename leftover POKY references to OE in image variables

Quoted 6 lines · Mark Hatle
Quoted 5 lines · Khem Raj
Quoted 3 lines · Mark Hatle

The names POKY_BASE_INSTALL and POKY_EXTRA_INSTALL have been renamed to OE_BASE_INSTALL and OE_EXTRA_INSTALL.

Quoted 6 lines
Quoted 1 line

How about calling it IMAGE_* instead ?

I don't have any objections to that. (All I did was rename POKY to OE, as I believe that was originally intended...)

Richard, anyone else, have any comments before I make that change?

I'd suggest COREIMAGE since that is what it actually influences. The reason being this is used by core-image.bbclass (which used to be poky-image.bbclass).

Cheers,

Richard