From 490f87c9ccc4046caeb3ab41a067a9a5ad3ad95c Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Thu, 2 Jul 2015 09:50:57 +0000 Subject: Upgrade perl to v5.22 Change-Id: I309f2ee3d9ff0569907c51ee9984b365b31cdbf5 --- strata/bsp-x86_64-generic.morph | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'strata/bsp-x86_64-generic.morph') diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph index 799af9d2..31d8374c 100644 --- a/strata/bsp-x86_64-generic.morph +++ b/strata/bsp-x86_64-generic.morph @@ -3,7 +3,9 @@ kind: stratum description: The set of platform specific components required for booting a 64-bit x86 based system. build-depends: -- morph: strata/core.morph +# nasm wants asciidoc and xmlto for generating its docs +# so include docutils here +- morph: strata/docutils.morph chunks: - name: linux-x86-64-generic morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph @@ -13,8 +15,8 @@ chunks: - name: nasm morph: strata/bsp-x86_64-generic/nasm.morph repo: upstream:nasm - ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 - unpetrify-ref: baserock/morph + ref: 8fa0fe16408afc76ce1ae4387e1a9d46893cfda6 + unpetrify-ref: nasm-2.11.08 - name: syslinux morph: strata/bsp-x86_64-generic/syslinux.morph repo: upstream:syslinux -- cgit v1.2.1