summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-08-01 14:03:50 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-08-19 15:11:18 +0100
commit1da1a78501b568e02a91efeb52554a82e2fa4043 (patch)
tree86c89c3eb03d15448b200ac336441e224f21284e
parent7aec8c2eb0f8ce0dae70559d11db8e84115f8ba6 (diff)
downloadmorph-1da1a78501b568e02a91efeb52554a82e2fa4043.tar.gz
Add optional 'gem-url' field in chunk morphologies
This could just as easily be a generic 'extra-build-data' field, which could be used to download arbitrary files into the build chroot. Making it easier to include random data from the internet in builds is not really a step forward for a tool that tries to encourage reproducability from source, however.
-rw-r--r--morphlib/morphloader.py2
-rw-r--r--morphlib/morphloader_tests.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py
index bc7ab6ef..dc7a4a29 100644
--- a/morphlib/morphloader.py
+++ b/morphlib/morphloader.py
@@ -243,6 +243,7 @@ class MorphologyDumper(yaml.SafeDumper):
'products',
'chunks',
'build-system',
+ 'gem-url',
'pre-configure-commands',
'configure-commands',
'post-configure-commands',
@@ -358,6 +359,7 @@ class MorphologyLoader(object):
'build-mode': 'staging',
'prefix': '/usr',
'system-integration': [],
+ 'gem-url': None,
},
'stratum': {
'chunks': [],
diff --git a/morphlib/morphloader_tests.py b/morphlib/morphloader_tests.py
index e783bfdb..dd32efe9 100644
--- a/morphlib/morphloader_tests.py
+++ b/morphlib/morphloader_tests.py
@@ -592,6 +592,7 @@ build-system: dummy
'devices': [],
'max-jobs': None,
'prefix': '/usr',
+ 'gem-url': None,
})
def test_unsets_defaults_for_chunks(self):