From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com ([192.55.52.89] helo=fmsmga101.fm.intel.com) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1T4ojo-0002Al-DM for openembedded-core@lists.openembedded.org; Fri, 24 Aug 2012 09:55:28 +0200 Received: from mail-pb0-f52.google.com ([209.85.160.52]) by mga01.intel.com with ESMTP/TLS/RC4-SHA; 24 Aug 2012 00:43:19 -0700 Received: by pbcxa7 with SMTP id xa7so2898686pbc.25 for ; Fri, 24 Aug 2012 00:43:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=CJjyFNsvB/8r5T4mD1FlhxUw6tWwJqQTxt7iq2d2Yk4=; b=OrYFiMdq5KOgKyjKfbt7CDpJTUkMEsSmKVIDH5sSTkjYVES+3L506ZIPBNl6xUvsLE iCGrMjClC7i2yWY2dO9+2YMJTNHSAjKGxNGloPWeXbcuNnztpUNcBeHiyvCaCfvFdm6Y D1iT1MMdoQBJ4612l4m3GDAOHVBZZBhbTUHJHziTE+oxP1OJ93f7PWDuzvETunbdcUFe KIpG2IYdZFFvq8Nrx+idCVH3IWdAhcUjrAkq0ch4NvnZTxgU5amPQ0Mm2P4UCJ7Imk8y ryv0Bs7row6avCLus8ptDTUFObjShqBCMvtT5wLFo89i2p6SmC1ny9c2pv7TGHIqBskm 1K4g== Received: by 10.66.82.97 with SMTP id h1mr8834647pay.45.1345794199408; Fri, 24 Aug 2012 00:43:19 -0700 (PDT) Received: from [192.168.1.12] (c-76-105-137-48.hsd1.or.comcast.net. [76.105.137.48]) by mx.google.com with ESMTPS id pg9sm7786709pbb.26.2012.08.24.00.43.17 (version=SSLv3 cipher=OTHER); Fri, 24 Aug 2012 00:43:18 -0700 (PDT) Message-ID: <503730A6.4020708@intel.com> Date: Fri, 24 Aug 2012 00:43:34 -0700 From: Scott Garman User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: openembedded-core@lists.openembedded.org References: <1345745765-22194-1-git-send-email-sgw@linux.intel.com> In-Reply-To: <1345745765-22194-1-git-send-email-sgw@linux.intel.com> X-Gm-Message-State: ALoCoQkFBrx/SiiiSWzzRjoOheUu8d6gVEiz2qBZWn2zPNsdY6gJEq1zv7xL/XFi6W799TBOt6qG Subject: Re: [PATCH - Denzil 1/2] build-appliance-image: rename from self-hosted-image X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Aug 2012 07:55:29 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 08/23/2012 11:16 AM, Saul Wold wrote: > From: Valentin Popa > > (-) 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 > Signed-off-by: Richard Purdie 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 theBuild Appliance page." > +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 > -- Scott Garman Embedded Linux Engineer - Yocto Project Intel Open Source Technology Center