From patchwork Tue Jun 26 11:05:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Fix for BUG 2636 Date: Tue, 26 Jun 2012 11:05:52 -0000 From: Valentin Popa X-Patchwork-Id: 30653 Message-Id: <1340708752-6365-1-git-send-email-valentin.popa@intel.com> To: openembedded-core@lists.openembedded.org (-) renamed self-hosted-image to build-appliance-image (-) replaced build-appliance-image description (-) replaced qt4e-demo-image description (-) changed self-hosted-image ref in manual/doc and maintainers.inc Signed-off-by: Valentin Popa --- documentation/poky-ref-manual/ref-images.xml | 2 +- meta-yocto/conf/distro/include/maintainers.inc | 2 +- meta/conf/multilib.conf | 2 +- ...lf-hosted-image.bb => build-appliance-image.bb} | 2 +- meta/recipes-qt/images/qt4e-demo-image.bb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-core/images/{self-hosted-image.bb => build-appliance-image.bb} (91%) diff --git a/documentation/poky-ref-manual/ref-images.xml b/documentation/poky-ref-manual/ref-images.xml index eb30942..a027334 100644 --- a/documentation/poky-ref-manual/ref-images.xml +++ b/documentation/poky-ref-manual/ref-images.xml @@ -108,7 +108,7 @@ instead of X11. In order to build, this image requires specific distro configuration that enables gtk over directfb. - self-hosted-image: + build-appliance-image: An image you can run using the Yocto Project Build Appliance. The image is suitable to load and boot from either VMware Player diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc index b88fe2e..d60ee93 100644 --- a/meta-yocto/conf/distro/include/maintainers.inc +++ b/meta-yocto/conf/distro/include/maintainers.inc @@ -577,7 +577,7 @@ RECIPE_MAINTAINER_pn-screen = "Valentin Popa " RECIPE_MAINTAINER_pn-screenshot = "Valentin Popa " RECIPE_MAINTAINER_pn-scrnsaverproto = "Laurentiu Palcu " RECIPE_MAINTAINER_pn-sed = "Valentin Popa " -RECIPE_MAINTAINER_pn-self-hosted-image = "Saul Wold " +RECIPE_MAINTAINER_pn-build-appliance-image = "Saul Wold " RECIPE_MAINTAINER_pn-setserial = "Valentin Popa " RECIPE_MAINTAINER_pn-settings-daemon = "Valentin Popa " RECIPE_MAINTAINER_pn-sgml-common = "Scott Garman " diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index cea8694..92a7813 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -583,7 +583,7 @@ BBCLASSEXTEND_append_pn-sat-solver = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-screen = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-scrnsaverproto = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-sed = " ${MULTILIBS}" -BBCLASSEXTEND_append_pn-self-hosted-image = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-build-appliance-image = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-service = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-setserial = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-settings-daemon = " ${MULTILIBS}" diff --git a/meta/recipes-core/images/self-hosted-image.bb b/meta/recipes-core/images/build-appliance-image.bb similarity index 91% rename from meta/recipes-core/images/self-hosted-image.bb rename to meta/recipes-core/images/build-appliance-image.bb index aef1507..6eb88f3 100644 --- a/meta/recipes-core/images/self-hosted-image.bb +++ b/meta/recipes-core/images/build-appliance-image.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Version 1.0-r6 of the self-hosted image." +DESCRIPTION = "An image you can boot and run using either the VMware Player or VMware Workstation. For more information, see the Build Appliance page." IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted" LICENSE = "MIT" diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb index 794dac5..8f9478d 100644 --- a/meta/recipes-qt/images/qt4e-demo-image.bb +++ b/meta/recipes-qt/images/qt4e-demo-image.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Version 1.0-r1 of the qtr3-demo-image." +DESCRIPTION = "An image that will launch into the demo application for the embedded (not based on X11) version of Qt." LICENSE = "MIT" PR="r2"