[yocto] [PATCH][yocto-autobuilder] PublishArtifacts.py: do not rename qemux86-64 rootfs directory

[Flanagan, Elizabeth]

I'm going to nack this one as it breaks backwards compatibility. We'll need
to bump LAYERVERSION_yocto first and then do a check on it to determine if
we do the rename or not.

-b


On Fri, Sep 13, 2013 at 4:23 AM, Laurentiu Palcu
<laurentiu.palcu at intel.com>wrote:

> With the latest changes to adt-installer, the rootfs directory name in
> the repo should match the MACHINE. Hence, qemux86-64 should not be
> renamed to qemux86_64.
>
> Also, one of my vim plugins, automatically eliminated some EOL
> whitespaces in the process. So, I thought, it wouldn't hurt to commit
> those too.
>
> [YOCTO #5181]
>
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>
> ---
>  .../autobuilder/buildsteps/PublishArtifacts.py     |   19
> +++++++++----------
>  1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git
> a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
> b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
> index 10eb7af..e2b5b49 100644
> ---
> a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
> +++
> b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
> @@ -12,14 +12,14 @@ __email__ = "elizabeth.flanagan at intel.com"
>
>  from buildbot.steps.shell import ShellCommand
>  from twisted.python import log
> -import os, datetime
> +import os, datetime
>  from autobuilder.config import *
>
>  class PublishArtifacts(ShellCommand):
>
> -    haltOnFailure = False
> -    flunkOnFailure = True
> -    name = "Publishing Artifacts"
> +    haltOnFailure = False
> +    flunkOnFailure = True
> +    name = "Publishing Artifacts"
>      def __init__(self, factory, argdict=None, **kwargs):
>          self.factory = factory
>          self.description = "Publishing Artifacts"
> @@ -43,7 +43,7 @@ class PublishArtifacts(ShellCommand):
>          self.layerversion_core = self.getProperty("layerversion_core")
>          log.msg(layerversion_yoctobsp)
>          self.basedir=os.path.join(os.path.join(
> -                                    self.slavedir, buildername),
> +                                    self.slavedir, buildername),
>                                      "build/build/")
>          command=""
>          DATESTAMP=datetime.datetime.now().strftime("%Y%m%d")
> @@ -70,19 +70,18 @@ class PublishArtifacts(ShellCommand):
>                      command=command+"mkdir -p " + adt_dev_dest +
> "/adt-ipk;"
>                      command=command+"cp -R " + os.path.join(self.basedir,
> "tmp/deploy/ipk/*") + " " + adt_dev_dest + "/adt-ipk;"
>                      command=command+"rsync -av " +
> os.path.join(self.basedir, "tmp/deploy/ipk/") + " " + DEST + "/ipk;"
> -                    command=command+"mkdir -p " + adt_dev_dest +
> "/rootfs;"
> +                    command=command+"mkdir -p " + adt_dev_dest +
> "/rootfs;"
>                      command=command+"for x in `ls " + DEST +
> "/machines/qemu/|grep -v tiny`; do ln -s " + DEST + "/machines/qemu/$x " +
> adt_dev_dest + "/rootfs/$x; done;"
> -                    command=command+"mv " + adt_dev_dest +
> "/rootfs/qemux86-64 " + adt_dev_dest + "/rootfs/qemux86_64;"
>                  elif artifact == "eclipse-plugin-juno":
>                      command=command+"mkdir -p " + DEST +
> "/eclipse-plugin/juno;"
>                      command=command+"cp -R --no-dereference
> --preserve=links " + \
> -
> os.path.join(os.path.join(self.slavedir, buildername),
> +
> os.path.join(os.path.join(self.slavedir, buildername),
>
> "build/eclipse-poky-juno/scripts/org.*.zip") + \
>                                       " " + DEST + "/eclipse-plugin/juno;"
>                  elif artifact == "eclipse-plugin-kepler":
>                      command=command+"mkdir -p " + DEST +
> "/eclipse-plugin/kepler;"
>                      command=command+"cp -R --no-dereference
> --preserve=links " + \
> -
> os.path.join(os.path.join(self.slavedir, buildername),
> +
> os.path.join(os.path.join(self.slavedir, buildername),
>
> "build/eclipse-poky-kepler/scripts/org.*.zip") + \
>                                       " " + DEST +
> "/eclipse-plugin/kepler;"
>                  elif artifact == "build-appliance":
> @@ -159,7 +158,7 @@ class PublishArtifacts(ShellCommand):
>                      command=command+"echo 'Skipping copy of " + artifact
> + ".'"
>                  else:
>                      artifact_name, deploy_image_dir =
> self.getDeployNames(artifact, buildername)
> -
> +
>                      command=command+"mkdir -p " + DEST + "/"+
> MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
>                      command=command+"cp -R --no-dereference
> --preserve=links " + \
>                                       deploy_image_dir + \
> --
> 1.7.9.5
>
>


-- 
Elizabeth Flanagan
Yocto Project
Build and Release
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20130913/828e9a8d/attachment.html>