summaryrefslogtreecommitdiff
path: root/morphlib/plugins/tarball-systembuilder_plugin.py
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-07-26 11:24:14 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-07-26 12:03:26 +0100
commite20f9de6e4235d7ab2087031d405827253faeccb (patch)
tree0558522bd61bee55c8f20412f11334cd8564df36 /morphlib/plugins/tarball-systembuilder_plugin.py
parent653fb367044695139be9a2e358fc8a8a6e617cc5 (diff)
downloadmorph-e20f9de6e4235d7ab2087031d405827253faeccb.tar.gz
Fix rootfs-tarball to create kernel image on all arches
Previously, it was only being created on ARM.
Diffstat (limited to 'morphlib/plugins/tarball-systembuilder_plugin.py')
-rw-r--r--morphlib/plugins/tarball-systembuilder_plugin.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/morphlib/plugins/tarball-systembuilder_plugin.py b/morphlib/plugins/tarball-systembuilder_plugin.py
index ec81a91c..fecf30a6 100644
--- a/morphlib/plugins/tarball-systembuilder_plugin.py
+++ b/morphlib/plugins/tarball-systembuilder_plugin.py
@@ -51,14 +51,13 @@ class RootfsTarballBuilder(SystemKindBuilder): # pragma: no cover
factory_path = mount_point
self.unpack_strata(factory_path)
self.create_fstab(factory_path)
- if arch in ('arm',):
- a = self.new_artifact(
- self.artifact.source.morphology['name']+'-kernel')
- with self.local_artifact_cache.put(a) as dest:
- with open(os.path.join(factory_path,
- 'boot',
- 'zImage')) as kernel:
- shutil.copyfileobj(kernel, dest)
+ a = self.new_artifact(
+ self.artifact.source.morphology['name']+'-kernel')
+ with self.local_artifact_cache.put(a) as dest:
+ with open(os.path.join(factory_path,
+ 'boot',
+ 'zImage')) as kernel:
+ shutil.copyfileobj(kernel, dest)
except BaseException, e:
logging.error(traceback.format_exc())
self.app.status(msg='Error while building system',