Merge pull request #5 from dm-vdo/6.1.0.61

Updated to version 6.1.0.61

Makefile

@@ -16,21 +16,25 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA. 
 #
-# $Id: //eng/vdo-releases/magnesium/src/packaging/src-dist/user/Makefile#1 $
-
-SUBDIRS = examples utils vdo-manager
+# $Id: //eng/vdo-releases/magnesium/src/packaging/src-dist/user/Makefile#2 $
 
+INSTALL = install
+INSTALLOWNER ?= -o root -g root
+defaultdocdir ?= /usr/share/doc
+name ?= vdo
 INSTALLDIR=$(DESTDIR)/$(defaultdocdir)/$(name)
 
+SUBDIRS = examples utils vdo-manager
+
 .PHONY: all clean install
 all clean:
 	for d in $(SUBDIRS); do         \
 	  $(MAKE) -C $$d $@ || exit 1; \
 	done
 
 install:
-	install -d $(INSTALLDIR)
-	install COPYING $(INSTALLDIR)
+	$(INSTALL) $(INSTALLOWNER) -d $(INSTALLDIR)
+	$(INSTALL) $(INSTALLOWNER) -m 644 COPYING $(INSTALLDIR)
 	for d in $(SUBDIRS); do         \
 	  $(MAKE) -C $$d $@ || exit 1; \
 	done

README.md

@@ -1,6 +1,6 @@
 # vdo
 
-A set of userspace tools for managing pools deduplicated and/or compressed
+A set of userspace tools for managing pools of deduplicated and/or compressed
 block storage.
 
 ## Background
@@ -76,12 +76,33 @@ project allows interested parties to begin using VDO immediately. The
 technology itself is thoroughly tested, mature, and in production use since
 2014 in its previous proprietary form.
 
+## Building
+
+In order to build the user-level programs, invoke the following command
+from the top directory of this tree:
+
+        make
+
+After building the user-level programs, they may be installed in the
+standard locations by invoking the following command from the top directory
+of this tree, as the root user:
+
+        make install
+
 ## Communication channels
 
 Community feedback, participation and patches are welcome to the
 vdo-devel@redhat.com mailing list -- subscribe
 [here](https://www.redhat.com/mailman/listinfo/vdo-devel).
 
+## Contributing
+
+This project is currently a stepping stone towards integration with the Linux
+kernel. As such, contributions are welcome via a process similar to that for
+Linux kernel development. Patches should be submitted to the
+vdo-devel@redhat.com mailing list, where they will be considered for
+inclusion. This project does not accept pull requests.
+
 ## Licensing
 
 [GPL v2.0 or later](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html).

examples/ansible/Makefile

@@ -16,14 +16,19 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA. 
 #
-# $Id: //eng/vdo-releases/magnesium/src/packaging/src-dist/user/examples/ansible/Makefile#1 $
+# $Id: //eng/vdo-releases/magnesium/src/packaging/src-dist/user/examples/ansible/Makefile#2 $
 
 INSTALLFILES=README.txt			\
 	test_vdocreate.yml		\
 	test_vdocreate_alloptions.yml	\
 	test_vdoremove.yml		\
 	vdo.py
 
+INSTALL = install
+INSTALLOWNER ?= -o root -g root
+defaultdocdir ?= /usr/share/doc
+name ?= vdo
+
 INSTALLDIR=$(DESTDIR)/$(defaultdocdir)/$(name)/examples/ansible
 
 .PHONY: all clean install
@@ -32,7 +37,7 @@ all:;
 clean:;
 
 install:
-	install -d $(INSTALLDIR)
+	$(INSTALL) $(INSTALLOWNER) -d $(INSTALLDIR)
 	for i in $(INSTALLFILES); do \
-	  install $$i $(INSTALLDIR); \
+	  $(INSTALL) $(INSTALLOWNER) -m 644 $$i $(INSTALLDIR); \
 	done

examples/ansible/test_vdocreate.yml

@@ -9,6 +9,5 @@
     vdo:
       name: vdo1
       state: present
-      volumegroup: VDO
-      physicalsize: 260G
+      device: /dev/blockdevice
       logicalsize: 1T

examples/ansible/test_vdocreate_alloptions.yml

@@ -11,8 +11,7 @@
       state: present
       compression: enabled
       deduplication: enabled
-      volumegroup: VDO
-      physicalsize: 260G
+      device: /dev/blockdevice
       logicalsize: 1T
       blockmapcachesize: 21G
       readcache: enabled