6 p.m.
Repo: git://git.baserock.org/baserock/baserock/morph.git
Branch: baserock/pedroalvarez/cross-built-error
Sha1: a1f9da71ca175f16bbd9deeecbb29b8f29376832
Is to fix the RT#155, now morph will stop it the user is trying to do
a cross building, which is not supported.
Probably is not the best way of check the architecture, but I just
started to understand the morph code yesterday.
Pedro Alvarez (1):
RT#155 Do not allow cross building.
morphlib/buildcommand.py | 14 ++++++++++++++
1 file changed, 14 insertions(+)
--
1.7.10.4
6 p.m.
New subject: [PATCH] RT#155 Do not allow cross building.
---
morphlib/buildcommand.py | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py
index d700723..e33e274 100644
--- a/morphlib/buildcommand.py
+++ b/morphlib/buildcommand.py
@@ -49,6 +49,7 @@ class BuildCommand(object):
repo_name=repo_name, ref=ref, filename=filename)
self.app.status(msg='Figuring out the right build order')
srcpool = self.create_source_pool(repo_name, ref, filename)
+ self._validate_architecture(srcpool)
root_artifact = self.resolve_artifacts(srcpool)
self.build_in_order(root_artifact)
@@ -88,6 +89,19 @@ class BuildCommand(object):
return srcpool
+ def _validate_architecture(self, srcpool):
+
+ ar = morphlib.artifactresolver.ArtifactResolver()
+ artifacts = ar.resolve_artifacts(srcpool)
+ root_artifact = self._find_root_artifact(artifacts)
+
+ root_arch = root_artifact.source.morphology['arch']
+ host_arch = morphlib.util.get_host_architecture()
+ if root_arch != host_arch:
+ raise morphlib.Error(
+ 'Cross building is not supported, building %s in %s'
+ % (root_arch, host_arch))
+
def resolve_artifacts(self, srcpool):
'''Resolve the artifacts that will be built for a set of
sources'''
--
1.7.10.4
6:25 p.m.
New subject: [PATCH] RT#155 Do not allow cross building.
On Wed, Sep 25, 2013 at 03:00:12PM +0100, Pedro Alvarez wrote:
+ def _validate_architecture(self, srcpool):
+
+ ar = morphlib.artifactresolver.ArtifactResolver()
+ artifacts = ar.resolve_artifacts(srcpool)
+ root_artifact = self._find_root_artifact(artifacts)
+
+ root_arch = root_artifact.source.morphology['arch']
+ host_arch = morphlib.util.get_host_architecture()
+ if root_arch != host_arch:
+ raise morphlib.Error(
+ 'Cross building is not supported, building %s in %s'
+ % (root_arch, host_arch))
+
How long does it take to call ar.resolve_artifacts(srcpool)? Your code makes
morph do that a second time. The point of doing this architecture validation
check is to do it as early as possible, so the user does not need to wait a
long time to get an error message.
Is there a way to check the artifact before building srcpool, or while
doing that? That might be even faster.
If the error message mentions cross-building, it should probably have
a hyphen in the word ("Cross-building", not "Cross building"). Are
there ways to make the error message better? Maybe something like "You
must build natively: system architecture is %s but host architecture
is %s". Opinions?
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
3:57 p.m.
New subject: [PATCH] RT#155 Do not allow cross building.
On 25/09/13 15:25, Lars Wirzenius wrote:
How long does it take to call ar.resolve_artifacts(srcpool)? Your
code makes
morph do that a second time. The point of doing this architecture validation
check is to do it as early as possible, so the user does not need to wait a
long time to get an error message.
Printing the times at the beginning of my code and at the end I get;
Startime: 11:38:44.288995
Endtime: 11:38:44.293877
I think is fast, but:
Is there a way to check the artifact before building srcpool, or
while
doing that? That might be even faster.
I agree with you, I think it doesn't have to start doing anything (like
update the git repos). I'm trying to understand the morph code to do it
better.
If the error message mentions cross-building, it should probably
have
a hyphen in the word ("Cross-building", not "Cross building"). Are
there ways to make the error message better? Maybe something like "You
must build natively: system architecture is %s but host architecture
is %s". Opinions?
The error message is not a problem, could be whatever :)
P.
4:51 p.m.
New subject: [PATCH] RT#155 Do not allow cross building.
On Fri, Sep 27, 2013 at 12:57:40PM +0100, Pedro Alvarez wrote:
On 25/09/13 15:25, Lars Wirzenius wrote:
> How long does it take to call ar.resolve_artifacts(srcpool)? Your code makes
> morph do that a second time. The point of doing this architecture validation
> check is to do it as early as possible, so the user does not need to wait a
> long time to get an error message.
Printing the times at the beginning of my code and at the end I get;
Startime: 11:38:44.288995
Endtime: 11:38:44.293877
I think is fast, but:
That's fast enough to not be a worry right now.
> Is there a way to check the artifact before building srcpool, or
while
> doing that? That might be even faster.
I agree with you, I think it doesn't have to start doing anything (like
update the git repos). I'm trying to understand the morph code to do it
better.
I think, due to the upcoming release, we can live with the code
executing twice, if we add a comment "# FIXME: This is executed twice,
fix later.".
> If the error message mentions cross-building, it should probably
have
> a hyphen in the word ("Cross-building", not "Cross building").
Are
> there ways to make the error message better? Maybe something like "You
> must build natively: system architecture is %s but host architecture
> is %s". Opinions?
The error message is not a problem, could be whatever :)
Anyone have suggestions on the error message?
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
5:07 p.m.
New subject: [PATCH] RT#155 Do not allow cross building.
On 27/09/2013 13:51, Lars Wirzenius wrote:
>> If the error message mentions cross-building, it should
probably have
>> a hyphen in the word ("Cross-building", not "Cross
building"). Are
>> there ways to make the error message better? Maybe something like "You
>> must build natively: system architecture is %s but host architecture
>> is %s". Opinions?
>
> The error message is not a problem, could be whatever :)
Anyone have suggestions on the error message?
"Are you trying to cross-build? Host architecture is %s but target is
%s"
6:34 p.m.
New subject: [PATCHv2] RT#155 Do not allow cross building.
Repo: git://git.baserock.org/baserock/baserock/morph.git
Branch: baserock/pedroalvarez/cross-built-error
Sha1: 6b5de55d10b0cf06185c45506d0fe14482ca2d49
Is not the best way, but it works and is fast.
Added to the last patch:
- FIXME
- Docstring
Pedro Alvarez (1):
RT#155 Do not allow cross building.
morphlib/buildcommand.py | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
--
1.7.10.4
6:34 p.m.
New subject: [PATCH] RT#155 Do not allow cross building.
---
morphlib/buildcommand.py | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py
index d700723..c6731b4 100644
--- a/morphlib/buildcommand.py
+++ b/morphlib/buildcommand.py
@@ -49,6 +49,7 @@ class BuildCommand(object):
repo_name=repo_name, ref=ref, filename=filename)
self.app.status(msg='Figuring out the right build order')
srcpool = self.create_source_pool(repo_name, ref, filename)
+ self._validate_architecture(srcpool)
root_artifact = self.resolve_artifacts(srcpool)
self.build_in_order(root_artifact)
@@ -88,6 +89,22 @@ class BuildCommand(object):
return srcpool
+ def _validate_architecture(self, srcpool):
+ '''Perform the validation between root and target
architectures.'''
+
+ # FIXME: This is executed twice, fix later.
+ ar = morphlib.artifactresolver.ArtifactResolver()
+ artifacts = ar.resolve_artifacts(srcpool)
+ root_artifact = self._find_root_artifact(artifacts)
+
+ root_arch = root_artifact.source.morphology['arch']
+ host_arch = morphlib.util.get_host_architecture()
+ if root_arch != host_arch:
+ raise morphlib.Error(
+ 'Are you trying to cross-build? '
+ 'Host architecture is %s but target is %s'
+ % (host_arch, root_arch))
+
def resolve_artifacts(self, srcpool):
'''Resolve the artifacts that will be built for a set of
sources'''
--
1.7.10.4
6:27 p.m.
New subject: [PATCHv2] RT#155 Do not allow cross building.
On Fri, Sep 27, 2013 at 03:34:12PM +0100, Pedro Alvarez wrote:
Repo: git://git.baserock.org/baserock/baserock/morph.git
Branch: baserock/pedroalvarez/cross-built-error
Sha1: 6b5de55d10b0cf06185c45506d0fe14482ca2d49
Is not the best way, but it works and is fast.
Added to the last patch:
- FIXME
- Docstring
Pedro Alvarez (1):
RT#155 Do not allow cross building.
This version of the patch is OK, I think, but it now strikes me that
it's missing a test case. We really should be writing test cases
whenever we change how Morph behaves. In this case, I would like to
have a test case using yarn that is something like this:
SCENARIO building a system for a different architecture
GIVEN a system foo that is not for our architecture
WHEN attempting to build the foo system
THEN morph failed
AND error message includes the string "wrong architecture"
To implement this, we'll need to construct a system morphology for
another architecture. This can be as simple as:
if our architecture is x86-64:
use armv7b
else:
use x86-64
Given the lack of a test case, and that this won't make it into
Baserock 11 anyway, I'm going to say -1, but it's not because the code
is bad.
I'm happy to help you construct the yarn test.
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
3470
days inactive
3475
days old
9 comments
3 participants
participants (3)
-
Lars Wirzenius -
Paul Sherwood -
Pedro Alvarez