From b7f5ca5c67c6210b2c65cb2073b759d385f065ad Mon Sep 17 00:00:00 2001
From: Hannes Mehnert <hannes@mehnert.org>
Date: Thu, 24 Oct 2024 14:32:34 +0200
Subject: [PATCH] minor, move into a single package

---
 README.md             |  4 ++--
 lib/fail_safe/dune    |  2 +-
 oneffs-fail-safe.opam | 32 --------------------------------
 oneffs.opam           |  3 +++
 4 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 oneffs-fail-safe.opam

diff --git a/README.md b/README.md
index 4b154b7..91ffea1 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ CRC32 checksums are used to ensure integrity of both the header and the data.
 Another one-file filesystem where instead recovery and integrity is prioritized.
 This is useful for storing application state and configuration.
 If a write fails or is interrupted the old data is recoverable.
-The superblock (filesystem header) is duplicated at the beginning and end of the block device and is checked with a cryptographic hash.
-The data is as well checked with a cryptographic hash.
+The superblock (filesystem header) is duplicated at the beginning and end of the block device and is checked with the cryptographic hash SHA-256.
+The data is as well checked with the cryptographic hash SHA-256.
 
 With [mirage-block-partition](https://github.com/reynir/mirage-block-partition/) you can store multiple files with static allocation.
diff --git a/lib/fail_safe/dune b/lib/fail_safe/dune
index e51130d..928d8bc 100644
--- a/lib/fail_safe/dune
+++ b/lib/fail_safe/dune
@@ -1,4 +1,4 @@
 (library
-  (public_name oneffs-fail-safe)
+  (public_name oneffs.fail-safe)
   (name oneFFS_Fail_safe)
   (libraries mirage-block cstruct lwt mirage-clock ptime digestif logs))
diff --git a/oneffs-fail-safe.opam b/oneffs-fail-safe.opam
deleted file mode 100644
index c13c899..0000000
--- a/oneffs-fail-safe.opam
+++ /dev/null
@@ -1,32 +0,0 @@
-opam-version: "2.0"
-maintainer: [ "Reynir Björnsson <reynir@reynir.dk>" ]
-authors: [ "Hannes Mehnert <hannes@mehnert.org" ]
-homepage: "https://github.com/robur-coop/oneffs"
-bug-reports: "https://github.com/robur-coop/oneffs/issues"
-dev-repo: "git+https://github.com/robur-coop/oneffs.git"
-license: "ISC"
-synopsis: "One-file filesystem fail-safe is a filesystem for storing a single unnamed file in a fail-safe manner"
-description: """
-One-file filesystem is a filesystem for storing a single unnamed file. It is
-suitable for storing data that require safe-guards against interrupted writes.
-For example, it is useful for storing state that needs to be updated and where
-recovering older data is preferable over total data loss. Cryptographic SHA256
-checksums are used to ensure integrity of both the data and the superblock.
-"""
-
-build: [
-  [ "dune" "subst" ] { dev }
-  [ "dune" "build" "-p" name "-j" jobs ]
-  [ "dune" "runtest" "-p" name "-j" jobs ] { with-test }
-]
-depends: [
-  "dune" {>= "3.4"}
-  "ocaml" {>= "4.08.0"}
-  "mirage-block" {>= "3.0.0"}
-  "mirage-clock"
-  "lwt" {>= "2.6.0"}
-  "cstruct" {>= "6.0.0"}
-  "ptime"
-  "digestif"
-  "logs"
-]
diff --git a/oneffs.opam b/oneffs.opam
index 219b9f1..a1c836b 100644
--- a/oneffs.opam
+++ b/oneffs.opam
@@ -27,4 +27,7 @@ depends: [
   "lwt" {>= "2.6.0"}
   "cstruct" {>= "6.0.0"}
   "checkseum"
+  "ptime"
+  "digestif"
+  "logs"
 ]