From db164cc085ae6857e82230ee648715ab3ea5552a Mon Sep 17 00:00:00 2001
From: Mark Elvers <mark.elvers@tunbury.org>
Date: Tue, 22 Aug 2023 17:18:03 +0000
Subject: [PATCH] Updated Fetcher

---
 obuilder                    |  2 +-
 worker/dune                 | 10 ++--------
 worker/fetcher.freebsd.ml   |  1 -
 worker/fetcher.macos.ml     |  1 -
 worker/fetcher.zfs_clone.ml |  1 +
 5 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 worker/fetcher.freebsd.ml
 delete mode 100644 worker/fetcher.macos.ml
 create mode 100644 worker/fetcher.zfs_clone.ml

diff --git a/obuilder b/obuilder
index cf5d8ec1..4b52927c 160000
--- a/obuilder
+++ b/obuilder
@@ -1 +1 @@
-Subproject commit cf5d8ec1c8d5b6d95c57685bceb5f64cd07eaff4
+Subproject commit 4b52927cfe77b51de3fc03e80cb0e6c9bd55a583
diff --git a/worker/dune b/worker/dune
index 1c720099..7edb9d59 100644
--- a/worker/dune
+++ b/worker/dune
@@ -1,13 +1,7 @@
 (rule
- (deps fetcher.macos.ml)
+ (deps fetcher.zfs_clone.ml)
  (target fetcher.ml)
- (enabled_if (= %{system} macosx))
- (action (copy %{deps} %{target})))
-
-(rule
- (deps fetcher.freebsd.ml)
- (target fetcher.ml)
- (enabled_if (= %{system} freebsd))
+ (enabled_if (or (= %{system} macosx) (= %{system} freebsd)))
  (action (copy %{deps} %{target})))
 
 (rule
diff --git a/worker/fetcher.freebsd.ml b/worker/fetcher.freebsd.ml
deleted file mode 100644
index 4b02b455..00000000
--- a/worker/fetcher.freebsd.ml
+++ /dev/null
@@ -1 +0,0 @@
-include Obuilder.Archive_extract
\ No newline at end of file
diff --git a/worker/fetcher.macos.ml b/worker/fetcher.macos.ml
deleted file mode 100644
index be5f94ae..00000000
--- a/worker/fetcher.macos.ml
+++ /dev/null
@@ -1 +0,0 @@
-include Obuilder.User_temp
diff --git a/worker/fetcher.zfs_clone.ml b/worker/fetcher.zfs_clone.ml
new file mode 100644
index 00000000..4ae06814
--- /dev/null
+++ b/worker/fetcher.zfs_clone.ml
@@ -0,0 +1 @@
+include Obuilder.Zfs_clone