diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-07-25 13:24:54 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-07-25 13:24:54 +0000 |
| commit | 3d31fe6b117341e61552480aa45af75fffe9d937 (patch) | |
| tree | 47b1f4aa2041d5badb0d86082df4754205dfe5bb /gitlab-ci-runner.morph | |
| parent | 56308755c59d8cde87526016bbdec885627e2169 (diff) | |
| parent | 4c5e2ceda0622069d683da84a071a3150c8f180f (diff) | |
| download | definitions-3d31fe6b117341e61552480aa45af75fffe9d937.tar.gz | |
Merge branch 'baserock/liw/x-consolidation'
This merges changes from Emmet Hikory and Michael Drake to
consolidate X strata so they're easier to work with.
Diffstat (limited to 'gitlab-ci-runner.morph')
| -rw-r--r-- | gitlab-ci-runner.morph | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gitlab-ci-runner.morph b/gitlab-ci-runner.morph index 9845dcce..5399307a 100644 --- a/gitlab-ci-runner.morph +++ b/gitlab-ci-runner.morph @@ -18,10 +18,10 @@ strata: - morph: connectivity - morph: audio-bluetooth - morph: x-common -- morph: x-x86_64-generic +- morph: x-generic - morph: multimedia - morph: genivi -- morph: genivi-x-x86_64-generic +- morph: genivi-x-generic - morph: tools - morph: virtualization - morph: openstack-clients |