summaryrefslogtreecommitdiff
path: root/tests.as-root/setup
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-02-14 10:22:46 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-02-14 10:22:46 +0000
commit8f8fc96b884e7f175d4a01bc2d91452d7149bf33 (patch)
treed0d19252c154fb030f7dfa1c4784ef60e45bc40e /tests.as-root/setup
parent2decdcdd27567e99e3bc53347d34064ab34f7932 (diff)
parentfbf70e2e5595d0cc7edaf7240a732cc5d2632c34 (diff)
downloadmorph-8f8fc96b884e7f175d4a01bc2d91452d7149bf33.tar.gz
Merge branch 'baserock/richardmaw/S10310/invalid-repo-ref-v2'
Reviewed-by: Sam Thursfield
Diffstat (limited to 'tests.as-root/setup')
-rwxr-xr-xtests.as-root/setup14
1 files changed, 1 insertions, 13 deletions
diff --git a/tests.as-root/setup b/tests.as-root/setup
index 2ab1cd94..b865f42d 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/setup
@@ -10,7 +10,7 @@
# The stratum repository contains a single branch, "master", with a
# stratum and a system morphology that include the chunk above.
#
-# Copyright (C) 2011, 2012, 2013 Codethink Limited
+# Copyright (C) 2011, 2012, 2013, 2014 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -120,8 +120,6 @@ name: tools-stratum
kind: stratum
build-depends:
- morph: linux-stratum
- repo: test:morphs
- ref: master
chunks:
- name: tools
repo: test:tools-repo
@@ -137,8 +135,6 @@ kind: system
arch: `uname -m`
strata:
- morph: hello-stratum
- repo: test:morphs
- ref: master
EOF
git add hello-system.morph
@@ -147,8 +143,6 @@ name: linux-stratum
kind: stratum
build-depends:
- morph: hello-stratum
- repo: test:morphs
- ref: master
chunks:
- name: linux
repo: test:kernel-repo
@@ -164,14 +158,8 @@ kind: system
arch: `uname -m`
strata:
- morph: hello-stratum
- repo: test:morphs
- ref: master
- morph: linux-stratum
- repo: test:morphs
- ref: master
- morph: tools-stratum
- repo: test:morphs
- ref: master
EOF
git add linux-system.morph