From 978777c296917ef575d2582372883b816aba5726 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Wed, 11 Mar 2015 10:26:20 +0000
Subject: Move rsync to 'foundation' stratum

Our default upgrade process requires 'rsync'. So it needs to be in all
systems, not just those that happen to contain the 'tools' stratum.
---
 strata/foundation.morph       | 5 +++++
 strata/foundation/rsync.morph | 9 +++++++++
 strata/tools.morph            | 5 -----
 strata/tools/rsync.morph      | 9 ---------
 4 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 strata/foundation/rsync.morph
 delete mode 100644 strata/tools/rsync.morph

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/foundation/rsync.morph b/strata/foundation/rsync.morph
new file mode 100644
index 00000000..fb10f94e
--- /dev/null
+++ b/strata/foundation/rsync.morph
@@ -0,0 +1,9 @@
+name: rsync
+kind: chunk
+build-system: autotools
+build-commands:
+- make proto
+- make
+install-commands:
+- make install
+- install -D -m 755 packaging/systemd/rsync.service "$DESTDIR$PREFIX"/lib/systemd/system/rsync.service
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
diff --git a/strata/tools/rsync.morph b/strata/tools/rsync.morph
deleted file mode 100644
index fb10f94e..00000000
--- a/strata/tools/rsync.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: rsync
-kind: chunk
-build-system: autotools
-build-commands:
-- make proto
-- make
-install-commands:
-- make install
-- install -D -m 755 packaging/systemd/rsync.service "$DESTDIR$PREFIX"/lib/systemd/system/rsync.service
-- 
cgit v1.2.1