diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2012-07-03 10:52:44 +0100 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-07-03 10:52:44 +0100 |
commit | 418dd47a6c59d2e97f98ad0088357a34be91e659 (patch) | |
tree | 23cd7e04c2a0915a5f19ff10fea7c855b40c99e5 | |
parent | 11e4ae33fc5bc87dd970780f5ab089c53f67dcf0 (diff) | |
download | morphs-418dd47a6c59d2e97f98ad0088357a34be91e659.tar.gz |
strata: move nasm to x86 bsp
This will currently cause every system to have nasm installed.
However once chunk and stratum splitting is implemented the runtime
artifact can be made not to include nasm.
-rw-r--r-- | devel.morph | 9 | ||||
-rw-r--r-- | x86_64-generic-bsp.morph | 8 |
2 files changed, 7 insertions, 10 deletions
diff --git a/devel.morph b/devel.morph index 7468478..413408a 100644 --- a/devel.morph +++ b/devel.morph @@ -260,15 +260,6 @@ ] }, { - "name": "nasm", - "repo": "upstream:nasm", - "ref": "baserock/morph", - "build-depends": [ - "make", - "autoconf" - ] - }, - { "name": "python-setuptools", "repo": "upstream:python-setuptools", "ref": "baserock/morph", diff --git a/x86_64-generic-bsp.morph b/x86_64-generic-bsp.morph index b08ec4f..5063127 100644 --- a/x86_64-generic-bsp.morph +++ b/x86_64-generic-bsp.morph @@ -10,10 +10,16 @@ "build-depends": [] }, { + "name": "nasm", + "repo": "upstream:nasm", + "ref": "baserock/morph", + "build-depends": [] + }, + { "name": "syslinux", "repo": "upstream:syslinux", "ref": "baserock/morph", - "build-depends": [] + "build-depends": ["nasm"] } ] } |