Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Hi,
As per pre-approval, I have added the -o compat=1.0 option to
openstack-debian-images when building with a Qemu version greter than 1.0.
This allows to build OpenStack Debian images which are compatible with older
Qemu, which is often what public cloud providers are still using.
Debdiff attached.
Please unblock openstack-debian-images/1.1.
Cheers,
Thomas Goirand (zigo)
diff -Nru openstack-debian-images-1.0/build-openstack-debian-image openstack-debian-images-1.1/build-openstack-debian-image
--- openstack-debian-images-1.0/build-openstack-debian-image 2014-10-25 07:53:14.000000000 +0000
+++ openstack-debian-images-1.1/build-openstack-debian-image 2014-11-25 13:47:17.000000000 +0000
@@ -417,11 +417,11 @@
install-mbr ${AMI_NAME}
fi
-#QEMU_VERSION=`qemu-img --help | head -n 1 | cut -d" " -f3 | cut -d"," -f1`
-#if dpkg --compare-versions ${QEMU_VERSION} gt 1.0 ; then
-# OTHER_QEMU_IMG_OPTIONS=" -O compat=0.10"
-#else
+QEMU_VERSION=`qemu-img --help | head -n 1 | cut -d" " -f3 | cut -d"," -f1`
+if dpkg --compare-versions ${QEMU_VERSION} gt 1.0 ; then
+ OTHER_QEMU_IMG_OPTIONS=" -o compat=0.10"
+else
OTHER_QEMU_IMG_OPTIONS=""
-#fi
+fi
qemu-img convert -c -f raw ${AMI_NAME}${OTHER_QEMU_IMG_OPTIONS} -O qcow2 ${QCOW2_NAME}
diff -Nru openstack-debian-images-1.0/debian/changelog openstack-debian-images-1.1/debian/changelog
--- openstack-debian-images-1.0/debian/changelog 2014-10-25 07:53:14.000000000 +0000
+++ openstack-debian-images-1.1/debian/changelog 2014-11-25 13:47:17.000000000 +0000
@@ -1,3 +1,9 @@
+openstack-debian-images (1.1) unstable; urgency=medium
+
+ * Fixed compat option for newer qemu (Closes: #770943).
+
+ -- Thomas Goirand <z...@debian.org> Fri, 21 Nov 2014 13:48:26 +0800
+
openstack-debian-images (1.0) unstable; urgency=medium
* Fixed the sudoers file to support the --login option. (Closes: #766234)
