debian-cd

Merge lp://staging/~laney/debian-cd/focal into lp://staging/~ubuntu-cdimage/debian-cd/ubun3

  1. focal
  2. Merge into ubun3
Proposed by Iain Lane
Status: Merged
Merged at revision: 2074
Proposed branch: lp://staging/~laney/debian-cd/focal
Merge into: lp://staging/~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 150 lines (+84/-11)
3 files modified
CONF.sh (+3/-6)
Makefile (+79/-0)
tools/add_secured (+2/-5)
To merge this branch: bzr merge lp://staging/~laney/debian-cd/focal
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+386318@code.staging.launchpad.net

This proposal supersedes a proposal from 2020-06-24.

Description of the change

Various fixes to make debian-cd work on focal (ancientminister, new cdimage host). I tried to retain compatibility with xenial (nusakan) - the changes have been tested there in isolation but I've not actually pulled an updated debian-cd to test them end-to-end.

Mainly gpg and some apt-related changes.

I could split this up into logical MPs if you want (but bzr...).

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote : Posted in a previous version of this proposal

This and https://code.launchpad.net/~ubuntu-cdimage/ubuntu-cdimage/focal/+merge/386317 depend on each other

Revision history for this message
Iain Lane (laney) wrote : Posted in a previous version of this proposal

NO. Wrong target branch.

Revision history for this message
Steve Langasek (vorlon) :
review: Needs Information
Revision history for this message
Iain Lane (laney) :
lp://staging/~laney/debian-cd/focal updated
2072. By Iain Lane

Makefile: Handle the keyring being present in -security/-updates/-proposed

This is a bit involved, since we need to find the newest one and use that.

Revision history for this message
Iain Lane (laney) wrote :

Ok, now it handles updates/security/proposed if they're enabled.

(I'm just trying a build of xenial and will reply again if that fails.)

lp://staging/~laney/debian-cd/focal updated
2073. By Iain Lane

Makefile: Print when extracting the keyring

Useful for debugging when reading the logs later

2074. By Iain Lane

Makefile: Make keyrings from /usr/share/keyrings/ available too

Old versions of ubuntu-keyring shipped keys here. In case of collisions, we
prefer ones from trusted.gpg.d.

Revision history for this message
Steve Langasek (vorlon) wrote :

Approved, provided it actually works :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches