summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-13 15:48:12 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-13 15:48:12 +0000
commit7ccf8e8be16457c6a6d74500cdb8518913878544 (patch)
tree73b9051f0833175881d43f732c13034bdc959f48
parentda942ae3de5fb22bf51036b8fc92cfae3f0ad0b2 (diff)
parentf4273e3a238ead95669e8a28e4c65fbaf00db9f5 (diff)
downloaddefinitions-7ccf8e8be16457c6a6d74500cdb8518913878544.tar.gz
Merge branch 'sam/syslinux-ref'
Reviewed-By: Javier Jardón <javier.jardon@codethink.co.uk> Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk>
-rw-r--r--strata/bsp-x86_both-tools.morph4
1 files changed, 2 insertions, 2 deletions
diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph
index 008ddf3f..b5bee9cb 100644
--- a/strata/bsp-x86_both-tools.morph
+++ b/strata/bsp-x86_both-tools.morph
@@ -14,7 +14,7 @@ chunks:
- name: syslinux
morph: strata/bsp-x86_both-tools/syslinux.morph
repo: upstream:syslinux
- ref: baserock/morph
- unpetrify-ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
+ ref: d715b39c0801ecea5e52f9029cea7c76320f93cf
+ unpetrify-ref: baserock/morph
build-depends:
- nasm