summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-11 11:37:31 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-11 11:37:31 +0000
commit0bf8b3533fe2e708c51e599701bd0564aaa77b67 (patch)
tree6383321699e27fadfe61fe4821b2ed6c5bc23a13
parent6e2051516e5b60324138090c93abdea434e30839 (diff)
parent978777c296917ef575d2582372883b816aba5726 (diff)
downloaddefinitions-0bf8b3533fe2e708c51e599701bd0564aaa77b67.tar.gz
Merge branch 'baserock/sam/rsync-to-foundation'
Reviewed-By: Javier Jardón <javier.jardon@codethink.co.uk> Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-rw-r--r--strata/foundation.morph5
-rw-r--r--strata/foundation/rsync.morph (renamed from strata/tools/rsync.morph)0
-rw-r--r--strata/tools.morph5
3 files changed, 5 insertions, 5 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 775444c9..bbee209f 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -160,3 +160,8 @@ chunks:
build-depends:
- dbus
- glib
+- name: rsync
+ morph: strata/tools/rsync.morph
+ repo: upstream:rsync
+ ref: 7cb0de6326c915a72253fd103dae93308031ec3f
+ unpetrify-ref: v3.1.1
diff --git a/strata/tools/rsync.morph b/strata/foundation/rsync.morph
index fb10f94e..fb10f94e 100644
--- a/strata/tools/rsync.morph
+++ b/strata/foundation/rsync.morph
diff --git a/strata/tools.morph b/strata/tools.morph
index bdc7e8e7..2bbf7bfa 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -27,11 +27,6 @@ chunks:
repo: upstream:lsof
ref: fffb8558208586338587027c265fd0eca44466be
unpetrify-ref: baserock/morph
-- name: rsync
- morph: strata/tools/rsync.morph
- repo: upstream:rsync
- ref: 7cb0de6326c915a72253fd103dae93308031ec3f
- unpetrify-ref: v3.1.1
- name: strace
repo: upstream:strace
ref: 6d8c0637e8dd0f65c667af33c612230552419db1