Version 0.0.4 in releases

- libpve-storage-perl 5.0-18
- qemu-server 5.0-25

.gitignore

@@ -0,0 +1 @@
+# Created by .ignore support plugin (hsz.mobi)

Makefile

@@ -1,5 +1,5 @@
 PACKAGE=pve-iscsi-zfs-scst
-PKGVER=0.0.3
+PKGVER=0.0.4
 
 DEB=${PACKAGE}_${PKGVER}_all.deb
 
@@ -18,6 +18,7 @@ ${DEB}:
 	pwd
 	echo ${DEB}
 	lintian ${DEB}
+	mv ${DEB} releases/
 
 install: PVE
 	install -d ${PERL5DIR}/PVE/Storage/Custom
@@ -28,10 +29,6 @@ install: PVE
 	install -d ${PERL5DIR}/PVE/Storage/Custom/LunCmd
 	install -m 0644 PVE/Storage/Custom/LunCmd/SCST.pm ${PERL5DIR}/PVE/Storage/Custom/LunCmd/
 
-.PHONY: upload
-upload: ${DEB}
-	tar cf - ${DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch
-
 distclean: clean
 
 clean:

QemuServer.patch

@@ -1,47 +1,48 @@
-5936a5937,5976
-> 		#BEGIN addition
-> 		my $src_storage_plugin = PVE::Storage::Plugin->lookup($src_scfg->{type});
-> 		my $dst_storage_plugin = PVE::Storage::Plugin->lookup($dst_scfg->{type});
-> 
-> 		# in many cases the storage may have a better idea how to convert:
-> 		# if src and dst format is the same
-> 		# and src_storeid is dst_storeid
-> 		# and the storage has the feature
-> 		# and the feature is implemented as volume_copy / volume_snapshot_copy
-> 		# let the storage do the work as it quite sure is faster
-> 		if ( $src_format eq $dst_format ) {
-> 			if( $src_storeid eq $dst_storeid ) {
-> 				# this is the same storage
-> 				# and storage is capable of materializing snaps
-> 				if( $snapname ) {
-> 					my $canCopySnap = PVE::Storage::volume_has_feature($storecfg, 'copy', $src_volid, $snapname, undef) && $src_storage_plugin->can('volume_snapshot_copy');
-> 					if( $canCopySnap ) {
-> 						print "delegate to storage plugin volume_snapshot_copy (snap $snapname)\n";
-> 						$src_storage_plugin->volume_snapshot_copy($src_scfg, $src_volname, $snapname, $dst_volname);
-> 
-> 						$src_storage_plugin->deactivate_volume($src_storeid, $src_scfg, $src_volname, $snapname);
-> 
-> 						return 1;
-> 					}
-> 				}
-> 
-> 				my $canCopyVolume = PVE::Storage::volume_has_feature($storecfg, 'copy', $src_volid, undef, undef) && $src_storage_plugin->can('volume_copy');
-> 				if ( $canCopyVolume ) {
-> 					print "delegate to storage plugin: volume_copy (base)\n";
-> 					$src_storage_plugin->volume_copy($src_scfg, $src_volname, $dst_volname);
-> 
-> 					$src_storage_plugin->deactivate_volume($src_storeid, $src_scfg, $src_volname, $snapname);
-> 
-> 					return 1;
-> 				}
-> 			}
-> 			# @todo: two zfs-storages might be able to receive stream from each other
-> 		}
-> 		#END addition
-> 
-5960a6001,6005
-> 
-> 		# added: deactivate the src-volume, even on failure
-> 		# this can be safely called as qemu_img_convert is never called on a running volume (that is not a snap)
-> 		$src_storage_plugin->deactivate_volume($src_storeid, $src_scfg, $src_volname, $snapname);
+6147a6148,6188
+>     #BEGIN addition
+>     my $src_storage_plugin = PVE::Storage::Plugin->lookup($src_scfg->{type});
+>     my $dst_storage_plugin = PVE::Storage::Plugin->lookup($dst_scfg->{type});
+> 
+>     # in many cases the storage may have a better idea how to convert:
+>     # if src and dst format is the same
+>     # and src_storeid is dst_storeid
+>     # and the storage has the feature
+>     # and the feature is implemented as volume_copy / volume_snapshot_copy
+>     # let the storage do the work as it quite sure is faster
+>     if ( $src_format eq $dst_format ) {
+>         if( $src_storeid eq $dst_storeid ) {
+>             # this is the same storage
+>             # and storage is capable of materializing snaps
+>             if( $snapname ) {
+>                 my $canCopySnap = PVE::Storage::volume_has_feature($storecfg, 'copy', $src_volid, $snapname, undef) && $src_storage_plugin->can('volume_snapshot_copy');
+>                 if( $canCopySnap ) {
+>                     print "delegate to storage plugin volume_snapshot_copy (snap $snapname)\n";
+>                     $src_storage_plugin->volume_snapshot_copy($src_scfg, $src_volname, $snapname, $dst_volname);
+> 
+>                     $src_storage_plugin->deactivate_volume($src_storeid, $src_scfg, $src_volname, $snapname);
+> 
+>                     return 1;
+>                 }
+>             }
+> 
+>             my $canCopyVolume = PVE::Storage::volume_has_feature($storecfg, 'copy', $src_volid, undef, undef) && $src_storage_plugin->can('volume_copy');
+>             if ( $canCopyVolume ) {
+>                 print "delegate to storage plugin: volume_copy (base)\n";
+>                 $src_storage_plugin->volume_copy($src_scfg, $src_volname, $dst_volname);
+> 
+>                 $src_storage_plugin->deactivate_volume($src_storeid, $src_scfg, $src_volname, $snapname);
+> 
+>                 return 1;
+>             }
+>         }
+>         # @todo: two zfs-storages might be able to receive stream from each other
+>     }
+>     #END addition
+> 
+> 
+6173a6215,6219
+> 
+> 	# added: deactivate the src-volume, even on failure
+> 	# this can be safely called as qemu_img_convert is never called on a running volume (that is not a snap)
+> 	$src_storage_plugin->deactivate_volume($src_storeid, $src_scfg, $src_volname, $snapname);
 > 

debian/changelog

@@ -1,3 +1,10 @@
+pve-iscsi-zfs-scst (0.0.4) unstable; urgency=medium
+
+  * Upgrade to qemu-server 5.0-25
+  * Upgrade to libpve-storage-perl 5.0-18
+
+ -- Alexander Schmid <alex@modula-shop-systems.de>  Wed, 20 Dec 2017 13:46:00 +0200
+
 pve-iscsi-zfs-scst (0.0.3) unstable; urgency=medium
 
   * Upgrade to qemu-server 5.0-18

debian/control

@@ -7,7 +7,7 @@ Standards-Version: 0.0.3
 Homepage: https://git.modula-shop-systems.de/modula/pve-iscsi-zfs-scst/
 
 Architecture: all
-Depends: libpve-storage-perl (=5.0-17), qemu-server (=5.0-18), ${perl:Depends},
+Depends: libpve-storage-perl (=5.0-18), qemu-server (=5.0-25), ${perl:Depends},
 Package: pve-iscsi-zfs-scst
 Description: zfs over iscsi with scst target
  adds support for scst and ESOS target to the zfs over iscsi storage plugin

debian/copyright

@@ -1,4 +1,4 @@
-Copyright (C) 2017 Modula Shop Systems, Alexander Schmid
+Copyright (C) 2018 Modula Shop Systems, Alexander Schmid
 
 This software is written by Modula Shop Systems <alex@modula-shop-systems.de>