debian-cd

Merge lp://staging/~xnox/debian-cd/drop-di-s390x into lp://staging/~ubuntu-cdimage/debian-cd/ubun3

drop-di-s390x
Merge into ubun3

Proposed by Dimitri John Ledkov on 2020-05-21

Status:	Merged
Merged at revision:	2059
Proposed branch:	lp://staging/~xnox/debian-cd/drop-di-s390x
Merge into:	lp://staging/~ubuntu-cdimage/debian-cd/ubun3
Diff against target:	182 lines (+50/-79) 4 files modified data/groovy/s390x/README.boot (+2/-0) data/groovy/s390x/boot/ubuntu.exec (+11/-0) data/groovy/s390x/boot/ubuntu.ins (+6/-0) tools/boot/groovy/boot-s390x (+31/-79)
To merge this branch:	bzr merge lp://staging/~xnox/debian-cd/drop-di-s390x
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Steve Langasek		2020-05-21	Approve on 2020-05-22
Review via email: mp+384384@code.staging.launchpad.net

Commit message

This drops d-i dependency from groovy/boot-s390x

Note tested, but once applied will monitor daily builds for correctness of build.

Best to read the new script, rather than the diff, it is greatly simplified.

Revision history for this message

Steve Langasek (vorlon) wrote on 2020-05-21:

This implies we no longer support building inches using the d-i initrd on s390x. Is there a corresponding mp for ubuntu-cdimage?

review: Needs Information

Revision history for this message

Dimitri John Ledkov (xnox) wrote on 2020-05-21:

> This implies we no longer support building inches using the d-i initrd on
> s390x. Is there a corresponding mp for ubuntu-cdimage?

There are no products on any arch that use d-i initrd's in groovy.

ubuntu-legacy-server product was introduced in focal, and capped at focal, and is not built for groovy (albeit still in crontab for groovy, producing nothing). Note how http://cdimage.ubuntu.com/ubuntu-server/daily/ is empty.

Revision history for this message

Steve Langasek (vorlon) wrote on 2020-05-21:

Ok, I've fixed the cronjob.

But what about the duplication between data/groovy/s390x/boot/ubuntu.ins and data/groovy/s390x/ubuntu.ins?

Revision history for this message

Steve Langasek (vorlon) wrote on 2020-05-21:

if the reason is that we want the file at both /ubuntu.ins and /boot/ubuntu.ins within the CD, I think that should be handled by copying a single file to both locations, or making one a symlink to the other, rather than having two copies of the same file in the data tree.

review: Needs Fixing

lp://staging/~xnox/debian-cd/drop-di-s390x updated on 2020-05-22