[OE-core] [PATCH 1/1] Rename leftover POKY references to OE in image variables

Mark Hatle mark.hatle at windriver.com
Thu Dec 8 20:57:12 UTC 2011 

On 12/8/11 2:27 PM, Khem Raj wrote:
> On Thu, Dec 8, 2011 at 8:03 AM, Mark Hatle<mark.hatle at windriver.com>  wrote:
>> 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

>> Signed-off-by: Mark Hatle<mark.hatle at windriver.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 8e83d4a..fd8d5d2 100644
>> --- a/meta/classes/core-image.bbclass
>> +++ b/meta/classes/core-image.bbclass
>> @@ -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"
>> diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb
>> index 56fc20c..4837cd4 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} ${OE_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 53bd989..255928f 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 = "\
>> +OE_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..5543fe9 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}
>> +#    ${OE_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..98ec5ae 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} \
>> +    ${OE_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..94ab995 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} \
>> +    ${OE_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..7369c89 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} \
>> +    ${OE_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..a4adc54 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} \
>> +    ${OE_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..5d0a992 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} \
>> +       ${OE_BASE_INSTALL} \
>>         module-init-tools \
>>         task-qt4e-base \
>>   "
>> --
>> 1.7.3.4
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

More information about the Openembedded-core mailing list