summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-12-21 16:23:08 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-12-21 17:36:43 (GMT)
commit6f4849a91e62a4ec083a82f443c2b34a2f2b7e71 (patch)
treeb0da7ba8fbe48dced187ebb0fbbb06a93bae1c3a /scripts
parentce1aa5d57c45b70771aa24155a564bfe8207f304 (diff)
downloaddefinitions-6f4849a91e62a4ec083a82f443c2b34a2f2b7e71.tar.gz
scripts/release-build: Update for changes in Morph
There's no 'distbuild-morphology' command any more, but this script expects to run from a definitions clone anyway, so we can use the 'distbuild' command. Also, the 'search_for_workspace' parameter is gone, because workspaces are going/gone. Change-Id: Ib087992a14a8a14f0a994febafd15d43124aead7
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/release-build9
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/release-build b/scripts/release-build
index a9810ff..d199b4a 100755
--- a/scripts/release-build
+++ b/scripts/release-build
@@ -37,9 +37,8 @@ class Build(object):
controller_args.append(
'--controller-initiator-port=%s' % controller_netloc[1])
- self.command = [
- 'morph', 'distbuild-morphology'] + controller_args + [
- 'baserock:baserock/definitions', app.ref, self.system_name]
+ self.command = ['morph', 'distbuild', '--local-changes=ignore']
+ self.command += controller_args + [self.system_name]
def start(self):
self.process = subprocess.Popen(self.command)
@@ -88,10 +87,8 @@ class ReleaseApp(cliapp.Application):
arch, controller = item.split(':', 1)
self.controllers[arch] = controller
- self.ref = cliapp.runcmd(['git', 'rev-parse', 'HEAD']).strip()
-
defs_repo = morphlib.definitions_repo.open(
- '.', search_for_root=True, search_workspace=True)
+ '.', search_for_root=True)
self.loader = morphlib.morphloader.MorphologyLoader()
self.finder = morphlib.morphologyfinder.MorphologyFinder(defs_repo)