Merge lp:~paride/utah/packaging-fixes into lp:utah

[Paride Legovini]

* ISO static validation support for s390x
* Use the date in the provisional Debian version string

[lp:~paride/utah/packaging-fixes]

1137. By Joshua Powers on 2019-03-26

* ISO static validation support for s390x
* d/changelog provisional version string: date --utc '+%Y%m%d%H%M'

=== modified file 'debian/changelog'
--- debian/changelog	2019-03-25 14:48:50 +0000
+++ debian/changelog	2019-03-26 14:10:01 +0000
@@ -1,3 +1,9 @@
+utah (0.19~bzr201903261308) UNRELEASED; urgency=medium
+  * ISO static validation support for s390x
+  * d/changelog provisional version string: date --utc '+%Y%m%d%H%M'
+
+ -- Paride Legovini <[e-mail]>  Tue, 26 Mar 2019 14:09:09 +0100
+
 utah (0.19~bzr1143) UNRELEASED; urgency=medium
   * Look for the kernel in boot/kernel.ubuntu on s390x
   * Add an XML file for s390x

=== added file 'utah/isotest/data/file_list_di_s390x'
--- utah/isotest/data/file_list_di_s390x	1970-01-01 00:00:00 +0000
+++ utah/isotest/data/file_list_di_s390x	2019-03-26 14:10:01 +0000
@@ -0,0 +1,22 @@
+.disk
+README.diskdefines
+boot
+boot/initrd.off
+boot/initrd.siz
+boot/initrd.ubuntu
+boot/kernel.ubuntu
+boot/parmfile.ubuntu
+boot/ubuntu.exec
+boot/ubuntu.ins
+dists
+doc
+install
+install/filesystem.manifest
+install/filesystem.size
+install/filesystem.squashfs
+install/filesystem.squashfs.gpg
+md5sum.txt
+pics
+pool
+preseed
+ubuntu

=== modified file 'utah/isotest/iso_static_validation.py'
--- utah/isotest/iso_static_validation.py	2018-12-18 20:45:28 +0000
+++ utah/isotest/iso_static_validation.py	2019-03-26 14:10:01 +0000
@@ -357,6 +357,7 @@
         Two list of files are used:
         file_list_di for i386 and amd64
         file_list_di_powerpc for powerpc and amd64+mac
+        file_list_di_s390x for s390x
 
         """
         (stdout, stderr) = self.iso.listfiles()
@@ -365,6 +366,8 @@
 
         if self.st_arch in ['powerpc', 'ppc64el', 'amd64+mac']:
             files_list = open(os.path.join(DATA_PATH, 'file_list_di_powerpc'))
+        elif self.st_arch == 's390x':
+            files_list = open(os.path.join(DATA_PATH, 'file_list_di_s390x'))
         else:  # i386 or amd64
             files_list = open(os.path.join(DATA_PATH, 'file_list_di'))
 
@@ -406,6 +409,9 @@
         if 'trusty' in host_release:
             kernel_string = 'x86 boot sector'
 
+        if st_arch == 's390x':
+            kernel_string = 'Linux S390'
+
         cmd = ['file', vmlinuz_path]
         output = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                   stderr=subprocess.PIPE)