Patchwork [-,Denzil,1/2] build-appliance-image: rename from self-hosted-image

login
register
mail settings
Submitter Saul Wold
Date Aug. 23, 2012, 6:16 p.m.
Message ID <1345745765-22194-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/35233/
State New
Headers show

Comments

Saul Wold - Aug. 23, 2012, 6:16 p.m.
From: Valentin Popa <valentin.popa@intel.com>

(-) renamed self-hosted-image to build-appliance-image
(-) replaced build-appliance-image description

[YOCTO #2636]

(From OE-Core rev: 04096f31778886479dac479132bded57e717653e)

Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/multilib.conf                           |    2 +-
 meta/recipes-core/images/build-appliance-image.bb |   70 +++++++++++++++++++++
 meta/recipes-core/images/self-hosted-image.bb     |   70 ---------------------
 3 files changed, 71 insertions(+), 71 deletions(-)
 create mode 100644 meta/recipes-core/images/build-appliance-image.bb
 delete mode 100644 meta/recipes-core/images/self-hosted-image.bb
Scott Garman - Aug. 24, 2012, 7:43 a.m.
On 08/23/2012 11:16 AM, Saul Wold wrote:
> From: Valentin Popa <valentin.popa@intel.com>
>
> (-) renamed self-hosted-image to build-appliance-image
> (-) replaced build-appliance-image description
>
> [YOCTO #2636]
>
> (From OE-Core rev: 04096f31778886479dac479132bded57e717653e)
>
> Signed-off-by: Valentin Popa <valentin.popa@intel.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hi Saul,

Would you mind pushing these commits to a contrib branch so I can 
cherry-pick them?

Thanks,

Scott

> ---
>   meta/conf/multilib.conf                           |    2 +-
>   meta/recipes-core/images/build-appliance-image.bb |   70 +++++++++++++++++++++
>   meta/recipes-core/images/self-hosted-image.bb     |   70 ---------------------
>   3 files changed, 71 insertions(+), 71 deletions(-)
>   create mode 100644 meta/recipes-core/images/build-appliance-image.bb
>   delete mode 100644 meta/recipes-core/images/self-hosted-image.bb
>
> diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
> index 3b47c48..950f7cb 100644
> --- a/meta/conf/multilib.conf
> +++ b/meta/conf/multilib.conf
> @@ -581,7 +581,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/build-appliance-image.bb b/meta/recipes-core/images/build-appliance-image.bb
> new file mode 100644
> index 0000000..2b7906f
> --- /dev/null
> +++ b/meta/recipes-core/images/build-appliance-image.bb
> @@ -0,0 +1,70 @@
> +DESCRIPTION = "An image you can boot and run using either the VMware Player or VMware Workstation.  For more information, see the<a href='http://www.yoctoproject.org/documentation/build-appliance'>Build Appliance page</a>."
> +IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"
> +
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
> +                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> +
> +PR = "r15"
> +
> +IMAGE_FEATURES += "x11-mini package-management"
> +
> +# Ensure there's enough space to do a core-image-sato build, with rm_work enabled
> +IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
> +
> +# Do a quiet boot with limited console messages
> +APPEND += "quiet"
> +
> +IMAGE_FSTYPES = "vmdk"
> +
> +inherit core-image
> +
> +SRCREV = "3ab5d73f0c49df9fefa2a46031d33436bbd7d7d8"
> +SRC_URI = "git://git.yoctoproject.org/poky;protocol=git"
> +
> +IMAGE_CMD_ext3_append () {
> +	# We don't need to reserve much space for root, 0.5% is more than enough
> +	tune2fs -m 0.5 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
> +}
> +
> +fakeroot do_populate_poky_src () {
> +	# Because fetch2's git's unpack uses -s cloneflag, the unpacked git repo
> +	# will become invalid in the target.
> +	rm -rf ${WORKDIR}/git/.git
> +	rm -f ${WORKDIR}/git/.gitignore
> +
> +	cp -Rp ${WORKDIR}/git ${IMAGE_ROOTFS}/home/builder/poky
> +
> +	mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/conf
> +	mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/downloads
> +	cp -RpL ${DL_DIR}/* ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/
> +
> +	# Remove the git2_* tarballs -- this is ok since we still have the git2/.
> +	rm -rf ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/git2_*
> +
> +	echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone
> +	echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
> +	mkdir -p ${IMAGE_ROOTFS}/home/builder/pseudo
> +	echo "export PSEUDO_PREFIX=/usr" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
> +	echo "export PSEUDO_LOCALSTATEDIR=/home/builder/pseudo" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
> +	echo "export PSEUDO_LIBDIR=/usr/lib/pseudo/lib64" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
> +
> +	chown builder.builder ${IMAGE_ROOTFS}/home/builder/pseudo
> +
> +	chown -R builder.builder  ${IMAGE_ROOTFS}/home/builder/poky
> +
> +	# Allow builder to use sudo to setup tap/tun
> +	echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers
> +
> +	# Use Clearlooks GTK+ theme
> +	mkdir -p ${IMAGE_ROOTFS}/etc/gtk-2.0
> +	echo 'gtk-theme-name = "Clearlooks"' > ${IMAGE_ROOTFS}/etc/gtk-2.0/gtkrc
> +}
> +
> +IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; "
> +
> +python do_get_poky_src () {
> +    bb.build.exec_func('base_do_fetch', d)
> +    bb.build.exec_func('base_do_unpack', d)
> +}
> +addtask do_get_poky_src before do_rootfs
> diff --git a/meta/recipes-core/images/self-hosted-image.bb b/meta/recipes-core/images/self-hosted-image.bb
> deleted file mode 100644
> index aef1507..0000000
> --- a/meta/recipes-core/images/self-hosted-image.bb
> +++ /dev/null
> @@ -1,70 +0,0 @@
> -DESCRIPTION = "Version 1.0-r6 of the self-hosted image."
> -IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"
> -
> -LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
> -                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> -
> -PR = "r15"
> -
> -IMAGE_FEATURES += "x11-mini package-management"
> -
> -# Ensure there's enough space to do a core-image-sato build, with rm_work enabled
> -IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
> -
> -# Do a quiet boot with limited console messages
> -APPEND += "quiet"
> -
> -IMAGE_FSTYPES = "vmdk"
> -
> -inherit core-image
> -
> -SRCREV = "3ab5d73f0c49df9fefa2a46031d33436bbd7d7d8"
> -SRC_URI = "git://git.yoctoproject.org/poky;protocol=git"
> -
> -IMAGE_CMD_ext3_append () {
> -	# We don't need to reserve much space for root, 0.5% is more than enough
> -	tune2fs -m 0.5 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
> -}
> -
> -fakeroot do_populate_poky_src () {
> -	# Because fetch2's git's unpack uses -s cloneflag, the unpacked git repo
> -	# will become invalid in the target.
> -	rm -rf ${WORKDIR}/git/.git
> -	rm -f ${WORKDIR}/git/.gitignore
> -
> -	cp -Rp ${WORKDIR}/git ${IMAGE_ROOTFS}/home/builder/poky
> -
> -	mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/conf
> -	mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/downloads
> -	cp -RpL ${DL_DIR}/* ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/
> -
> -	# Remove the git2_* tarballs -- this is ok since we still have the git2/.
> -	rm -rf ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/git2_*
> -
> -	echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone
> -	echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
> -	mkdir -p ${IMAGE_ROOTFS}/home/builder/pseudo
> -	echo "export PSEUDO_PREFIX=/usr" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
> -	echo "export PSEUDO_LOCALSTATEDIR=/home/builder/pseudo" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
> -	echo "export PSEUDO_LIBDIR=/usr/lib/pseudo/lib64" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
> -
> -	chown builder.builder ${IMAGE_ROOTFS}/home/builder/pseudo
> -
> -	chown -R builder.builder  ${IMAGE_ROOTFS}/home/builder/poky
> -
> -	# Allow builder to use sudo to setup tap/tun
> -	echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers
> -
> -	# Use Clearlooks GTK+ theme
> -	mkdir -p ${IMAGE_ROOTFS}/etc/gtk-2.0
> -	echo 'gtk-theme-name = "Clearlooks"' > ${IMAGE_ROOTFS}/etc/gtk-2.0/gtkrc
> -}
> -
> -IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; "
> -
> -python do_get_poky_src () {
> -    bb.build.exec_func('base_do_fetch', d)
> -    bb.build.exec_func('base_do_unpack', d)
> -}
> -addtask do_get_poky_src before do_rootfs
>
Saul Wold - Aug. 24, 2012, 4:50 p.m.
On 08/24/2012 12:43 AM, Scott Garman wrote:
> On 08/23/2012 11:16 AM, Saul Wold wrote:
>> From: Valentin Popa <valentin.popa@intel.com>
>>
>> (-) renamed self-hosted-image to build-appliance-image
>> (-) replaced build-appliance-image description
>>
>> [YOCTO #2636]
>>
>> (From OE-Core rev: 04096f31778886479dac479132bded57e717653e)
>>
>> Signed-off-by: Valentin Popa <valentin.popa@intel.com>
>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> Hi Saul,
>
> Would you mind pushing these commits to a contrib branch so I can
> cherry-pick them?
>
Check out sgw/denzil

Sau!

> Thanks,
>
> Scott
>
>> ---
>>   meta/conf/multilib.conf                           |    2 +-
>>   meta/recipes-core/images/build-appliance-image.bb |   70
>> +++++++++++++++++++++
>>   meta/recipes-core/images/self-hosted-image.bb     |   70
>> ---------------------
>>   3 files changed, 71 insertions(+), 71 deletions(-)
>>   create mode 100644 meta/recipes-core/images/build-appliance-image.bb
>>   delete mode 100644 meta/recipes-core/images/self-hosted-image.bb
>>
>> diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
>> index 3b47c48..950f7cb 100644
>> --- a/meta/conf/multilib.conf
>> +++ b/meta/conf/multilib.conf
>> @@ -581,7 +581,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/build-appliance-image.bb
>> b/meta/recipes-core/images/build-appliance-image.bb
>> new file mode 100644
>> index 0000000..2b7906f
>> --- /dev/null
>> +++ b/meta/recipes-core/images/build-appliance-image.bb
>> @@ -0,0 +1,70 @@
>> +DESCRIPTION = "An image you can boot and run using either the VMware
>> Player or VMware Workstation.  For more information, see the<a
>> href='http://www.yoctoproject.org/documentation/build-appliance'>Build
>> Appliance page</a>."
>> +IMAGE_INSTALL = "task-core-boot task-core-apps-console
>> task-core-ssh-openssh task-self-hosted"
>> +
>> +LICENSE = "MIT"
>> +LIC_FILES_CHKSUM =
>> "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
>> +
>> file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
>> +
>> +PR = "r15"
>> +
>> +IMAGE_FEATURES += "x11-mini package-management"
>> +
>> +# Ensure there's enough space to do a core-image-sato build, with
>> rm_work enabled
>> +IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
>> +
>> +# Do a quiet boot with limited console messages
>> +APPEND += "quiet"
>> +
>> +IMAGE_FSTYPES = "vmdk"
>> +
>> +inherit core-image
>> +
>> +SRCREV = "3ab5d73f0c49df9fefa2a46031d33436bbd7d7d8"
>> +SRC_URI = "git://git.yoctoproject.org/poky;protocol=git"
>> +
>> +IMAGE_CMD_ext3_append () {
>> +    # We don't need to reserve much space for root, 0.5% is more than
>> enough
>> +    tune2fs -m 0.5 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
>> +}
>> +
>> +fakeroot do_populate_poky_src () {
>> +    # Because fetch2's git's unpack uses -s cloneflag, the unpacked
>> git repo
>> +    # will become invalid in the target.
>> +    rm -rf ${WORKDIR}/git/.git
>> +    rm -f ${WORKDIR}/git/.gitignore
>> +
>> +    cp -Rp ${WORKDIR}/git ${IMAGE_ROOTFS}/home/builder/poky
>> +
>> +    mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/conf
>> +    mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/downloads
>> +    cp -RpL ${DL_DIR}/*
>> ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/
>> +
>> +    # Remove the git2_* tarballs -- this is ok since we still have
>> the git2/.
>> +    rm -rf ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/git2_*
>> +
>> +    echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone
>> +    echo "INHERIT += \"rm_work\"" >>
>> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
>> +    mkdir -p ${IMAGE_ROOTFS}/home/builder/pseudo
>> +    echo "export PSEUDO_PREFIX=/usr" >>
>> ${IMAGE_ROOTFS}/home/builder/.bashrc
>> +    echo "export PSEUDO_LOCALSTATEDIR=/home/builder/pseudo" >>
>> ${IMAGE_ROOTFS}/home/builder/.bashrc
>> +    echo "export PSEUDO_LIBDIR=/usr/lib/pseudo/lib64" >>
>> ${IMAGE_ROOTFS}/home/builder/.bashrc
>> +
>> +    chown builder.builder ${IMAGE_ROOTFS}/home/builder/pseudo
>> +
>> +    chown -R builder.builder  ${IMAGE_ROOTFS}/home/builder/poky
>> +
>> +    # Allow builder to use sudo to setup tap/tun
>> +    echo "builder ALL=(ALL) NOPASSWD: ALL" >>
>> ${IMAGE_ROOTFS}/etc/sudoers
>> +
>> +    # Use Clearlooks GTK+ theme
>> +    mkdir -p ${IMAGE_ROOTFS}/etc/gtk-2.0
>> +    echo 'gtk-theme-name = "Clearlooks"' >
>> ${IMAGE_ROOTFS}/etc/gtk-2.0/gtkrc
>> +}
>> +
>> +IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; "
>> +
>> +python do_get_poky_src () {
>> +    bb.build.exec_func('base_do_fetch', d)
>> +    bb.build.exec_func('base_do_unpack', d)
>> +}
>> +addtask do_get_poky_src before do_rootfs
>> diff --git a/meta/recipes-core/images/self-hosted-image.bb
>> b/meta/recipes-core/images/self-hosted-image.bb
>> deleted file mode 100644
>> index aef1507..0000000
>> --- a/meta/recipes-core/images/self-hosted-image.bb
>> +++ /dev/null
>> @@ -1,70 +0,0 @@
>> -DESCRIPTION = "Version 1.0-r6 of the self-hosted image."
>> -IMAGE_INSTALL = "task-core-boot task-core-apps-console
>> task-core-ssh-openssh task-self-hosted"
>> -
>> -LICENSE = "MIT"
>> -LIC_FILES_CHKSUM =
>> "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
>> -
>> file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
>> -
>> -PR = "r15"
>> -
>> -IMAGE_FEATURES += "x11-mini package-management"
>> -
>> -# Ensure there's enough space to do a core-image-sato build, with
>> rm_work enabled
>> -IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
>> -
>> -# Do a quiet boot with limited console messages
>> -APPEND += "quiet"
>> -
>> -IMAGE_FSTYPES = "vmdk"
>> -
>> -inherit core-image
>> -
>> -SRCREV = "3ab5d73f0c49df9fefa2a46031d33436bbd7d7d8"
>> -SRC_URI = "git://git.yoctoproject.org/poky;protocol=git"
>> -
>> -IMAGE_CMD_ext3_append () {
>> -    # We don't need to reserve much space for root, 0.5% is more than
>> enough
>> -    tune2fs -m 0.5 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
>> -}
>> -
>> -fakeroot do_populate_poky_src () {
>> -    # Because fetch2's git's unpack uses -s cloneflag, the unpacked
>> git repo
>> -    # will become invalid in the target.
>> -    rm -rf ${WORKDIR}/git/.git
>> -    rm -f ${WORKDIR}/git/.gitignore
>> -
>> -    cp -Rp ${WORKDIR}/git ${IMAGE_ROOTFS}/home/builder/poky
>> -
>> -    mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/conf
>> -    mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/downloads
>> -    cp -RpL ${DL_DIR}/*
>> ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/
>> -
>> -    # Remove the git2_* tarballs -- this is ok since we still have
>> the git2/.
>> -    rm -rf ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/git2_*
>> -
>> -    echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone
>> -    echo "INHERIT += \"rm_work\"" >>
>> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
>> -    mkdir -p ${IMAGE_ROOTFS}/home/builder/pseudo
>> -    echo "export PSEUDO_PREFIX=/usr" >>
>> ${IMAGE_ROOTFS}/home/builder/.bashrc
>> -    echo "export PSEUDO_LOCALSTATEDIR=/home/builder/pseudo" >>
>> ${IMAGE_ROOTFS}/home/builder/.bashrc
>> -    echo "export PSEUDO_LIBDIR=/usr/lib/pseudo/lib64" >>
>> ${IMAGE_ROOTFS}/home/builder/.bashrc
>> -
>> -    chown builder.builder ${IMAGE_ROOTFS}/home/builder/pseudo
>> -
>> -    chown -R builder.builder  ${IMAGE_ROOTFS}/home/builder/poky
>> -
>> -    # Allow builder to use sudo to setup tap/tun
>> -    echo "builder ALL=(ALL) NOPASSWD: ALL" >>
>> ${IMAGE_ROOTFS}/etc/sudoers
>> -
>> -    # Use Clearlooks GTK+ theme
>> -    mkdir -p ${IMAGE_ROOTFS}/etc/gtk-2.0
>> -    echo 'gtk-theme-name = "Clearlooks"' >
>> ${IMAGE_ROOTFS}/etc/gtk-2.0/gtkrc
>> -}
>> -
>> -IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; "
>> -
>> -python do_get_poky_src () {
>> -    bb.build.exec_func('base_do_fetch', d)
>> -    bb.build.exec_func('base_do_unpack', d)
>> -}
>> -addtask do_get_poky_src before do_rootfs
>>
>
>

Patch

diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 3b47c48..950f7cb 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -581,7 +581,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/build-appliance-image.bb b/meta/recipes-core/images/build-appliance-image.bb
new file mode 100644
index 0000000..2b7906f
--- /dev/null
+++ b/meta/recipes-core/images/build-appliance-image.bb
@@ -0,0 +1,70 @@ 
+DESCRIPTION = "An image you can boot and run using either the VMware Player or VMware Workstation.  For more information, see the<a href='http://www.yoctoproject.org/documentation/build-appliance'>Build Appliance page</a>."
+IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+PR = "r15"
+
+IMAGE_FEATURES += "x11-mini package-management"
+
+# Ensure there's enough space to do a core-image-sato build, with rm_work enabled
+IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
+
+# Do a quiet boot with limited console messages
+APPEND += "quiet"
+
+IMAGE_FSTYPES = "vmdk"
+
+inherit core-image
+
+SRCREV = "3ab5d73f0c49df9fefa2a46031d33436bbd7d7d8"
+SRC_URI = "git://git.yoctoproject.org/poky;protocol=git"
+
+IMAGE_CMD_ext3_append () {
+	# We don't need to reserve much space for root, 0.5% is more than enough
+	tune2fs -m 0.5 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
+}
+
+fakeroot do_populate_poky_src () {
+	# Because fetch2's git's unpack uses -s cloneflag, the unpacked git repo
+	# will become invalid in the target.
+	rm -rf ${WORKDIR}/git/.git
+	rm -f ${WORKDIR}/git/.gitignore
+
+	cp -Rp ${WORKDIR}/git ${IMAGE_ROOTFS}/home/builder/poky
+
+	mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/conf
+	mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/downloads
+	cp -RpL ${DL_DIR}/* ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/
+
+	# Remove the git2_* tarballs -- this is ok since we still have the git2/.
+	rm -rf ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/git2_*
+
+	echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone
+	echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
+	mkdir -p ${IMAGE_ROOTFS}/home/builder/pseudo
+	echo "export PSEUDO_PREFIX=/usr" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
+	echo "export PSEUDO_LOCALSTATEDIR=/home/builder/pseudo" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
+	echo "export PSEUDO_LIBDIR=/usr/lib/pseudo/lib64" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
+
+	chown builder.builder ${IMAGE_ROOTFS}/home/builder/pseudo
+
+	chown -R builder.builder  ${IMAGE_ROOTFS}/home/builder/poky
+
+	# Allow builder to use sudo to setup tap/tun
+	echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers
+
+	# Use Clearlooks GTK+ theme
+	mkdir -p ${IMAGE_ROOTFS}/etc/gtk-2.0
+	echo 'gtk-theme-name = "Clearlooks"' > ${IMAGE_ROOTFS}/etc/gtk-2.0/gtkrc
+}
+
+IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; "
+
+python do_get_poky_src () {
+    bb.build.exec_func('base_do_fetch', d)
+    bb.build.exec_func('base_do_unpack', d)
+}
+addtask do_get_poky_src before do_rootfs
diff --git a/meta/recipes-core/images/self-hosted-image.bb b/meta/recipes-core/images/self-hosted-image.bb
deleted file mode 100644
index aef1507..0000000
--- a/meta/recipes-core/images/self-hosted-image.bb
+++ /dev/null
@@ -1,70 +0,0 @@ 
-DESCRIPTION = "Version 1.0-r6 of the self-hosted image."
-IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-PR = "r15"
-
-IMAGE_FEATURES += "x11-mini package-management"
-
-# Ensure there's enough space to do a core-image-sato build, with rm_work enabled
-IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
-
-# Do a quiet boot with limited console messages
-APPEND += "quiet"
-
-IMAGE_FSTYPES = "vmdk"
-
-inherit core-image
-
-SRCREV = "3ab5d73f0c49df9fefa2a46031d33436bbd7d7d8"
-SRC_URI = "git://git.yoctoproject.org/poky;protocol=git"
-
-IMAGE_CMD_ext3_append () {
-	# We don't need to reserve much space for root, 0.5% is more than enough
-	tune2fs -m 0.5 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
-}
-
-fakeroot do_populate_poky_src () {
-	# Because fetch2's git's unpack uses -s cloneflag, the unpacked git repo
-	# will become invalid in the target.
-	rm -rf ${WORKDIR}/git/.git
-	rm -f ${WORKDIR}/git/.gitignore
-
-	cp -Rp ${WORKDIR}/git ${IMAGE_ROOTFS}/home/builder/poky
-
-	mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/conf
-	mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/downloads
-	cp -RpL ${DL_DIR}/* ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/
-
-	# Remove the git2_* tarballs -- this is ok since we still have the git2/.
-	rm -rf ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/git2_*
-
-	echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone
-	echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
-	mkdir -p ${IMAGE_ROOTFS}/home/builder/pseudo
-	echo "export PSEUDO_PREFIX=/usr" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
-	echo "export PSEUDO_LOCALSTATEDIR=/home/builder/pseudo" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
-	echo "export PSEUDO_LIBDIR=/usr/lib/pseudo/lib64" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
-
-	chown builder.builder ${IMAGE_ROOTFS}/home/builder/pseudo
-
-	chown -R builder.builder  ${IMAGE_ROOTFS}/home/builder/poky
-
-	# Allow builder to use sudo to setup tap/tun
-	echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers
-
-	# Use Clearlooks GTK+ theme
-	mkdir -p ${IMAGE_ROOTFS}/etc/gtk-2.0
-	echo 'gtk-theme-name = "Clearlooks"' > ${IMAGE_ROOTFS}/etc/gtk-2.0/gtkrc
-}
-
-IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; "
-
-python do_get_poky_src () {
-    bb.build.exec_func('base_do_fetch', d)
-    bb.build.exec_func('base_do_unpack', d)
-}
-addtask do_get_poky_src before do_rootfs