diff --git a/debian/control b/debian/control index ba8dab4d..8216e123 100644 --- a/debian/control +++ b/debian/control @@ -9,9 +9,47 @@ Rules-Requires-Root: no Package: vitastor Architecture: amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, fio (= ${dep:fio}), qemu (= ${dep:qemu}), nodejs (>= 10), node-sprintf-js, node-ws (>= 7), libjerasure2, lp-solve +Depends: vitastor-osd, vitastor-mon, vitastor-client, vitastor-client-dev, vitastor-fio, vitastor-qemu Description: Vitastor, a fast software-defined clustered block storage Vitastor is a small, simple and fast clustered block storage (storage for VM drives), architecturally similar to Ceph which means strong consistency, primary-replication, symmetric clustering and automatic data distribution over any number of drives of any size with configurable redundancy (replication or erasure codes/XOR). + +Package: vitastor-osd +Architecture: amd64 +Depends: ${shlibs:Depends}, ${misc:Depends}, vitastor-client (= ${binary:Version}) +Description: Vitastor, a fast software-defined clustered block storage - object storage daemon + Vitastor object storage daemon, i.e. server program that stores data. + +Package: vitastor-mon +Architecture: amd64 +Depends: ${misc:Depends}, nodejs (>= 10), node-sprintf-js, node-ws (>= 7), lp-solve +Description: Vitastor, a fast software-defined clustered block storage - monitor + Vitastor monitor, i.e. server program responsible for watching cluster state and + scheduling cluster-level operations. + +Package: vitastor-client +Architecture: amd64 +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Vitastor, a fast software-defined clustered block storage - client + Vitastor client library and command-line interface. + +Package: vitastor-client-dev +Section: devel +Architecture: amd64 +Depends: ${misc:Depends}, vitastor-client (= ${binary:Version}) +Description: Vitastor, a fast software-defined clustered block storage - development files + Vitastor library headers for development. + +Package: vitastor-fio +Architecture: amd64 +Depends: ${shlibs:Depends}, ${misc:Depends}, vitastor-client (= ${binary:Version}), fio (= ${dep:fio}) +Description: Vitastor, a fast software-defined clustered block storage - fio drivers + Vitastor fio drivers for benchmarking. + +Package: vitastor-qemu +Architecture: amd64 +Depends: ${shlibs:Depends}, ${misc:Depends}, vitastor-client (= ${binary:Version}), qemu (= ${dep:qemu}) +Description: Vitastor, a fast software-defined clustered block storage - QEMU driver + Vitastor QEMU block device driver. diff --git a/debian/install b/debian/install index 7efb7a0a..c12b40ac 100644 --- a/debian/install +++ b/debian/install @@ -1,3 +1,2 @@ VNPL-1.1.txt usr/share/doc/vitastor GPL-2.0.txt usr/share/doc/vitastor -mon usr/lib/vitastor diff --git a/debian/rules b/debian/rules index 22f54d68..9be6dadc 100755 --- a/debian/rules +++ b/debian/rules @@ -5,5 +5,6 @@ export DH_VERBOSE = 1 dh $@ override_dh_installdeb: - cat debian/substvars >> debian/vitastor.substvars + cat debian/fio_version >> debian/vitastor-fio.substvars + cat debian/qemu_version >> debian/vitastor-qemu.substvars dh_installdeb diff --git a/debian/substvars b/debian/substvars deleted file mode 100644 index 1b37a2c3..00000000 --- a/debian/substvars +++ /dev/null @@ -1,2 +0,0 @@ -dep:fio=3.16-1 -dep:qemu=1:5.1+dfsg-4+vitastor1 diff --git a/debian/vitastor-client-dev.install b/debian/vitastor-client-dev.install new file mode 100644 index 00000000..e43b95cb --- /dev/null +++ b/debian/vitastor-client-dev.install @@ -0,0 +1 @@ +usr/include diff --git a/debian/vitastor-client.install b/debian/vitastor-client.install new file mode 100644 index 00000000..33e31bd0 --- /dev/null +++ b/debian/vitastor-client.install @@ -0,0 +1,5 @@ +usr/bin/vita +usr/bin/vitastor-cli +usr/bin/vitastor-rm +usr/bin/vitastor-nbd +usr/lib/*/libvitastor*.so* diff --git a/debian/vitastor-fio.install b/debian/vitastor-fio.install new file mode 100644 index 00000000..b59167e7 --- /dev/null +++ b/debian/vitastor-fio.install @@ -0,0 +1 @@ +usr/lib/*/libfio*.so* diff --git a/debian/vitastor-mon.install b/debian/vitastor-mon.install new file mode 100644 index 00000000..d344f91f --- /dev/null +++ b/debian/vitastor-mon.install @@ -0,0 +1 @@ +mon usr/lib/vitastor diff --git a/debian/vitastor-osd.install b/debian/vitastor-osd.install new file mode 100644 index 00000000..dec07183 --- /dev/null +++ b/debian/vitastor-osd.install @@ -0,0 +1,3 @@ +usr/bin/vitastor-osd +usr/bin/vitastor-dump-journal +mon/make-osd.sh /usr/lib/vitastor diff --git a/debian/vitastor-qemu.install b/debian/vitastor-qemu.install new file mode 100644 index 00000000..f36972d6 --- /dev/null +++ b/debian/vitastor-qemu.install @@ -0,0 +1 @@ +usr/lib/*/qemu/* diff --git a/debian/vitastor.Dockerfile b/debian/vitastor.Dockerfile index 16e50112..467c4b09 100644 --- a/debian/vitastor.Dockerfile +++ b/debian/vitastor.Dockerfile @@ -58,8 +58,8 @@ RUN set -e -x; \ echo qemu-fio-headers.patch >> debian/patches/series; \ rm -rf a b; \ rm -rf /root/packages/qemu-$REL/qemu*/; \ - echo "dep:fio=$FIO" > debian/substvars; \ - echo "dep:qemu=$QEMU" >> debian/substvars; \ + echo "dep:fio=$FIO" > debian/fio_version; \ + echo "dep:qemu=$QEMU" > debian/qemu_version; \ cd /root/packages/vitastor-$REL; \ tar --sort=name --mtime='2020-01-01' --owner=0 --group=0 --exclude=debian -cJf vitastor_0.6.7.orig.tar.xz vitastor-0.6.7; \ cd vitastor-0.6.7; \