summaryrefslogtreecommitdiff
path: root/strata
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2016-04-11 17:57:57 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2016-04-15 18:58:27 +0100
commit25041b86249fe763fd4171e2ab1aca535b3eb14f (patch)
treeacaa7a5268ff1aa796d1ca1a519cc0ddc4ac3d5c /strata
parent467bb8299ddc051855acb2093fd371e3423a0515 (diff)
downloaddefinitions-sam/easy-templating.tar.gz
Add a simple templating system to Baserock definitionssam/easy-templating
This is currently independent of the actual definitions format. The 'configure' tool generates actual .morph files from .morph.in files, and build tools then operate on these generated .morph files.t This is largely untested and no doubt broken!
Diffstat (limited to 'strata')
-rw-r--r--strata/syslinux-group.morph (renamed from strata/bsp-x86_both-tools.morph)10
-rw-r--r--strata/syslinux-group/nasm.morph (renamed from strata/bsp-x86_both-tools/nasm.morph)0
-rw-r--r--strata/syslinux-group/syslinux.morph (renamed from strata/bsp-x86_both-tools/syslinux.morph)0
-rw-r--r--strata/virtualbox-guest-x86_64.morph.in (renamed from strata/virtualbox-guest-x86_64.morph)10
-rw-r--r--strata/virtualbox-guest/vboxguest.morph (renamed from strata/virtualbox-guest-x86_64/vboxguest.morph)0
-rw-r--r--strata/virtualbox-guest/yasm.morph (renamed from strata/virtualbox-guest-x86_64/yasm.morph)0
6 files changed, 10 insertions, 10 deletions
diff --git a/strata/bsp-x86_both-tools.morph b/strata/syslinux-group.morph
index 0d159ce6..a7f5afca 100644
--- a/strata/bsp-x86_both-tools.morph
+++ b/strata/syslinux-group.morph
@@ -1,19 +1,19 @@
-name: bsp-x86_both-tools
+name: syslinux-group
kind: stratum
-description: The set of platform specific components required for configuring a bootable
- x86 based system.
+description:
+ The SYSLINUX bootloader.
build-depends:
# nasm wants asciidoc and xmlto for generating its docs
# so include docutils here
- morph: strata/docutils.morph
chunks:
- name: nasm
- morph: strata/bsp-x86_both-tools/nasm.morph
+ morph: strata/syslinux-group/nasm.morph
repo: upstream:nasm
ref: 8fa0fe16408afc76ce1ae4387e1a9d46893cfda6
unpetrify-ref: nasm-2.11.08
- name: syslinux
- morph: strata/bsp-x86_both-tools/syslinux.morph
+ morph: strata/syslinux-group/syslinux.morph
repo: upstream:syslinux
ref: d715b39c0801ecea5e52f9029cea7c76320f93cf
unpetrify-ref: baserock/morph
diff --git a/strata/bsp-x86_both-tools/nasm.morph b/strata/syslinux-group/nasm.morph
index 0ab1a629..0ab1a629 100644
--- a/strata/bsp-x86_both-tools/nasm.morph
+++ b/strata/syslinux-group/nasm.morph
diff --git a/strata/bsp-x86_both-tools/syslinux.morph b/strata/syslinux-group/syslinux.morph
index 4570865b..4570865b 100644
--- a/strata/bsp-x86_both-tools/syslinux.morph
+++ b/strata/syslinux-group/syslinux.morph
diff --git a/strata/virtualbox-guest-x86_64.morph b/strata/virtualbox-guest-x86_64.morph.in
index fadcec92..610c795a 100644
--- a/strata/virtualbox-guest-x86_64.morph
+++ b/strata/virtualbox-guest-x86_64.morph.in
@@ -1,20 +1,20 @@
-name: virtualbox-guest-x86_64
+name: virtualbox-guest
kind: stratum
description: |
- VirtualBox Guest Additions for x86_64
+ VirtualBox Guest Additions
build-depends:
- morph: strata/tools.morph
-- morph: strata/bsp-x86_64-generic.morph
+- morph: strata/bsp-{{BSP}}.morph
- morph: strata/x-common.morph
- morph: strata/x-generic.morph
chunks:
- name: yasm
- morph: strata/virtualbox-guest-x86_64/yasm.morph
+ morph: strata/virtualbox-guest/yasm.morph
repo: upstream:yasm
ref: fefefe262eb29081f0bcb4d48f2d476ce5730562
unpetrify-ref: baserock/morph
- name: vboxguest
- morph: strata/virtualbox-guest-x86_64/vboxguest.morph
+ morph: strata/virtualbox-guest/vboxguest.morph
repo: upstream:VirtualBox
ref: 617aeb5a3c13f4a46423e8c2fb560449403ad56d
unpetrify-ref: baserock/morph
diff --git a/strata/virtualbox-guest-x86_64/vboxguest.morph b/strata/virtualbox-guest/vboxguest.morph
index f31c9944..f31c9944 100644
--- a/strata/virtualbox-guest-x86_64/vboxguest.morph
+++ b/strata/virtualbox-guest/vboxguest.morph
diff --git a/strata/virtualbox-guest-x86_64/yasm.morph b/strata/virtualbox-guest/yasm.morph
index 437ae97d..437ae97d 100644
--- a/strata/virtualbox-guest-x86_64/yasm.morph
+++ b/strata/virtualbox-guest/yasm.morph