s390-tools zipl breaks when user provides target attributes

[Cody Shepherd]

This issue has already been identified and fixed in the (upstream?) github repository: https://github.com/ibm-s390-linux/s390-tools/commit/63ff07ba38dda99e2661a097d05266555c727a2e

The issue fixed by the revert linked above is causing Cloudware Oracular download image builds to fail on s390x. From the image build log:

```
+ ZIPL_EXTRA_PARAMS=--ramdisk=/boot/initrd.img
+ chroot mountpoint /sbin/zipl -V --image=/boot/vmlinuz --parameters=root=LABEL=cloudimg-rootfs --target=/boot/ --targetbase=/dev/loop3 --targettype=SCSI --targetblocksize=512 --targetoffset=2048 --ramdisk=/boot/initrd.img
Error: Could not add image file '/boot/vmlinuz': Could not get disk geometry
Looking for components in '/lib/s390-tools'
Secure boot support: no
Target device information
  Device..........................: 07:03
  Device name.....................: loop3 *)
  Device driver name..............: blkext
  Type............................: disk device
  Disk layout.....................: SCSI disk layout *)
  Geometry - start................: 2048 *)
  File system block size..........: 4096
  Physical block size.............: 512 *)
  Device size in physical blocks..: 4608000
  *) Data provided by user.
Building bootmap in '/boot/'
Adding IPL section
  initial ramdisk...: /boot/initrd.img
  kernel image......: /boot/vmlinuz
zIPL environment block content:
```

The fix is in the github repo but not yet released. The LP builders for Oracular are using version 2.33.1, which contains the bug.

[Frank Heimes (fheimes)]

Thx Cody for this report and you investigation upstream.

An update package, with the above fix included, is currently building in the following PPA:
launchpad.net/~fheimes/+archive/ubuntu/lp2072366

(But btw. why have you attached your Intel ProcCpuinfoMinimal.txt here?)

[Frank Heimes (fheimes)]

debdiffs

[Cody Shepherd (codyshepherd)]

> (But btw. why have you attached your Intel ProcCpuinfoMinimal.txt here?)

I used ubuntu-bug to file the bug, and it collected that automatically. It's irrelevant, I've removed it.

[Frank Heimes (fheimes)]

> > (But btw. why have you attached your Intel ProcCpuinfoMinimal.txt here?)

> I used ubuntu-bug to file the bug, and it collected that automatically. It's irrelevant, I've removed it.

I see...

[Cody Shepherd (codyshepherd)]

I've tested this by running an oracular build on s390x with your ppa package thrown in. The build succeeded, so it looks like the ppa package is what we want.

Relevant portions from the build log:

```
After this operation, 747 MB of additional disk space will be used.
Get:1 http://ftpmaster.internal/ubuntu oracular/main s390x libfuse3-3 s390x 3.14.0-6 [81.9 kB]
Get:2 http://ppa.launchpad.net/fheimes/lp2072366/ubuntu oracular/main s390x s390-tools-data all 2.33.1-0ubuntu4 [18.9 kB]
Get:3 http://ppa.launchpad.net/fheimes/lp2072366/ubuntu oracular/main s390x s390-tools-signed all 2.33.1-0ubuntu4 [13.7 kB]
Get:4 http://ppa.launchpad.net/fheimes/lp2072366/ubuntu oracular/main s390x s390-tools s390x 2.33.1-0ubuntu4 [3206 kB]
...
+ chroot mountpoint /sbin/zipl -V --image=/boot/vmlinuz --parameters=root=LABEL=cloudimg-rootfs --target=/boot/ --targetbase=/dev/loop3 --targettype=SCSI --targetblocksize=512 --targetoffset=2048 --ramdisk=/boot/initrd.img
Looking for components in '/lib/s390-tools'
Secure boot support: no
Target device information
  Device..........................: 07:03
  Device name.....................: loop3 *)
  Device driver name..............: blkext
  Type............................: disk device
  Disk layout.....................: SCSI disk layout *)
  Geometry - start................: 2048 *)
  File system block size..........: 4096
  Physical block size.............: 512 *)
  Device size in physical blocks..: 4608000
  *) Data provided by user.
Building bootmap in '/boot/'
Adding IPL section
  initial ramdisk...: /boot/initrd.img
  kernel image......: /boot/vmlinuz
  kernel parmline...: 'root=LABEL=cloudimg-rootfs'
  component address:
    heap area.......: 0x00002000-0x00005fff
    stack area......: 0x0000f000-0x0000ffff
    internal loader.: 0x0000a000-0x0000dfff
    parameters......: 0x00009000-0x000091ff
    kernel image....: 0x00010000-0x009b1fff
    parmline........: 0x009b3000-0x009b31ff
    initial ramdisk.: 0x009d0000-0x01fde7ff
    environment blk.: 0x009c3000-0x009c3fff
zIPL environment block content:
Preparing boot device for LD-IPL: loop3.
Detected SCSI PCBIOS disk layout.
Writing SCSI master boot record.
Syncing disks...
Done.
```

[Frank Heimes (fheimes)]

Great, thx for your validation, Cody!

[Utkarsh Gupta (utkarsh)]

Thanks, Frank, I've sponsored your upload of s390x-tools. I added this bug in d/ch entry though:

$ dput ubuntu ../s390-tools_2.33.1-0ubuntu4_source.changes
Uploading s390-tools using ftp to ubuntu (host: upload.ubuntu.com; directory: /ubuntu)
running supported-distribution: check whether the target distribution is currently supported (using distro-info)
{'allowed': ['release', 'proposed', 'backports', 'security'], 'known': ['release', 'proposed', 'updates', 'backports', 'security']}
running required-fields: check whether a field is present and non-empty in the changes file
running checksum: verify checksums before uploading
running suite-mismatch: check the target distribution for common errors
running check-debs: makes sure the upload contains a binary package
running gpg: check GnuPG signatures before the upload
Uploading s390-tools_2.33.1-0ubuntu4.dsc
Uploading s390-tools_2.33.1.orig-rust-vendor.tar.xz
Uploading s390-tools_2.33.1.orig.tar.gz
Uploading s390-tools_2.33.1-0ubuntu4.debian.tar.xz
Uploading s390-tools_2.33.1-0ubuntu4_source.buildinfo
Uploading s390-tools_2.33.1-0ubuntu4_source.changes

[Utkarsh Gupta (utkarsh)]

I'll do the second one as soon as the former is built and published to avoid ftbfs or/and waits-for conditional.

[Frank Heimes (fheimes)]

Hello Utkarsh, many thanks for having sponsored this upload, it's highly appreciated!
And I'm sorry that I did had the bug reference in the changelog.
That is something I have on my checklist before doing a PPA upload and creating a debdiff,
and I've grepped for the bug number, but the bug number is also part of the new quilt patch that I've added .

So I'm very happy that you could add it 'on the fly'. Thank you!

[Utkarsh Gupta (utkarsh)]

Thank you, Frank. And no worries. :)

I've sponsored s390-tools-signed, too, now.

$ dput ubuntu ../s390-tools-signed_2.33.1-0ubuntu4_source.changes
Uploading s390-tools-signed using ftp to ubuntu (host: upload.ubuntu.com; directory: /ubuntu)
running supported-distribution: check whether the target distribution is currently supported (using distro-info)
{'allowed': ['release', 'proposed', 'backports', 'security'], 'known': ['release', 'proposed', 'updates', 'backports', 'security']}
running required-fields: check whether a field is present and non-empty in the changes file
running checksum: verify checksums before uploading
running suite-mismatch: check the target distribution for common errors
running check-debs: makes sure the upload contains a binary package
running gpg: check GnuPG signatures before the upload
Uploading s390-tools-signed_2.33.1-0ubuntu4.dsc
Uploading s390-tools-signed_2.33.1-0ubuntu4.tar.xz
Uploading s390-tools-signed_2.33.1-0ubuntu4_source.buildinfo
Uploading s390-tools-signed_2.33.1-0ubuntu4_source.changes

[Launchpad Janitor (janitor)]

This bug was fixed in the package s390-tools - 2.33.1-0ubuntu4

---------------
s390-tools (2.33.1-0ubuntu4) oracular; urgency=medium

  * Add d/p/lp-2072366-Revert-zipl-src-Fix-problems-when-target-params.patch
    to fix an issue with zipl target parameters that is causing build failures
    on Cloudware oracular s390x. (LP: #2072366)

 -- Frank Heimes <email address hidden> Mon, 08 Jul 2024 07:57:31 +0200

[Launchpad Janitor (janitor)]

This bug was fixed in the package s390-tools-signed - 2.33.1-0ubuntu4

---------------
s390-tools-signed (2.33.1-0ubuntu4) oracular; urgency=medium

  * Rebuild against 2.33.1-0ubuntu4 (LP: #2072366)

 -- Frank Heimes <email address hidden> Mon, 08 Jul 2024 08:15:20 +0200