[yocto] [AB PATCH 18/22] PublishArtifacts.py: Exclude genericx86-64 pre-1.5

Elizabeth Flanagan elizabeth.flanagan at intel.com
Wed Mar 19 13:51:16 PDT 2014


From: Beth Flanagan <elizabeth.flanagan at intel.com>

We don't build it so we shouldn't publish it.

Signed-off-by: Beth Flanagan <elizabeth.flanagan at intel.com>
---
 .../autobuilder/buildsteps/PublishArtifacts.py            | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
index e23ecbf..ef9ad81 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
@@ -169,11 +169,16 @@ 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 + \
-                                     "/*"+artifact+"* " + DEST + "/" + MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
+                    self.layerversion_yoctobsp = self.getProperty("layerversion_yoctobsp")
+                    if self.layerversion_yoctobsp is not None and \
+                       int(self.layerversion_yoctobsp) < 2 and \
+                       "genericx86-64" in artifacts:
+                        command = command+"echo 'Skipping copy of genericx86-64.'; "
+                    else:
+                        command=command+"mkdir -p " + DEST + "/"+ MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
+                        command=command+"cp -R --no-dereference --preserve=links " + \
+                                         deploy_image_dir + \
+                                         "/*"+artifact+"* " + DEST + "/" + MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
 
 
             self.command = command
-- 
1.8.1.2




More information about the yocto mailing list