summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-23 10:58:30 +0000
committerGerrit Code Review <gerrit@baserock.org>2015-03-23 10:58:30 +0000
commit7834a992014dd62cacbf7c46ecc259c48fd772dd (patch)
tree49770a58c8cca5f6f96090907fffc2136cf10c9c
parent80dd49089c9a43fd9106690455ab557e0ef62c68 (diff)
parent632c674222763a4f0d8ca066862a39d221866ad8 (diff)
downloaddefinitions-7834a992014dd62cacbf7c46ecc259c48fd772dd.tar.gz
Merge "Move 'tar' from webtools to coreutils-common stratum"
-rw-r--r--strata/coreutils-common.morph7
-rw-r--r--strata/coreutils-common/tar.morph (renamed from strata/webtools/tar.morph)0
-rw-r--r--strata/webtools.morph5
3 files changed, 7 insertions, 5 deletions
diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph
index f226f50b..430e3fe5 100644
--- a/strata/coreutils-common.morph
+++ b/strata/coreutils-common.morph
@@ -26,3 +26,10 @@ chunks:
unpetrify-ref: baserock/v3.3
build-depends:
- coreutils
+- name: tar
+ morph: strata/coreutils-common/tar.morph
+ repo: upstream:tar
+ ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37
+ unpetrify-ref: baserock/release_1_28
+ build-depends:
+ - coreutils
diff --git a/strata/webtools/tar.morph b/strata/coreutils-common/tar.morph
index 9219abeb..9219abeb 100644
--- a/strata/webtools/tar.morph
+++ b/strata/coreutils-common/tar.morph
diff --git a/strata/webtools.morph b/strata/webtools.morph
index 68ce80d5..17a1abda 100644
--- a/strata/webtools.morph
+++ b/strata/webtools.morph
@@ -14,11 +14,6 @@ chunks:
repo: upstream:libgit2
ref: 4b0a36e881506a02b43a4ae3c19c93c919b36eeb
unpetrify-ref: master
-- name: tar
- morph: strata/webtools/tar.morph
- repo: upstream:tar
- ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37
- unpetrify-ref: baserock/release_1_28
- name: nginx
morph: strata/webtools/nginx.morph
repo: upstream:nginx