Merge lp://staging/~xnox/ubuntu-cdimage/focal-oem-20.04 into lp://staging/ubuntu-cdimage

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 1832
Proposed branch: lp://staging/~xnox/ubuntu-cdimage/focal-oem-20.04
Merge into: lp://staging/ubuntu-cdimage
Diff against target: 497 lines (+61/-48)
46 files modified
bin/anonftpsync (+1/-1)
bin/build-image-set (+1/-1)
bin/buildlive (+1/-1)
bin/check-installable (+1/-1)
bin/checksum-directory (+1/-1)
bin/checksum-remove (+1/-1)
bin/cron.daily (+1/-1)
bin/cron.daily-live (+1/-1)
bin/cron.daily-preinstalled (+1/-1)
bin/cron.dvd (+1/-1)
bin/cron.source (+1/-1)
bin/daily-checks (+1/-1)
bin/default-arches (+1/-1)
bin/diff-manifest (+1/-1)
bin/download-live-filesystems (+1/-1)
bin/extract-debootstrap (+1/-1)
bin/find-live-filesystem (+1/-1)
bin/find-mirror (+1/-1)
bin/for-project (+1/-1)
bin/germinate-to-tasks (+1/-1)
bin/list-seeds (+1/-1)
bin/make-master-task (+1/-1)
bin/make-metalink (+1/-1)
bin/make-torrents (+1/-1)
bin/make-web-indices (+1/-1)
bin/mark-current (+1/-1)
bin/mirror-image-build-logs (+1/-1)
bin/multipidfile (+1/-1)
bin/next-build-date (+1/-1)
bin/post-qa (+1/-1)
bin/publish-daily (+1/-1)
bin/publish-release (+1/-1)
bin/purge-old-images (+1/-1)
bin/rebuild-requests (+1/-1)
bin/run-germinate (+1/-1)
bin/sign-cdimage (+1/-1)
bin/site-manifest (+1/-1)
bin/sync-mirrors (+1/-1)
bin/sync-old-releases (+1/-1)
bin/update-local-indices (+1/-1)
bin/update-tasks (+1/-1)
bin/verify-cloudfront (+1/-1)
bin/wait-for-package (+1/-1)
lib/cdimage/livefs.py (+15/-2)
lib/cdimage/tests/test_livefs.py (+1/-1)
run-tests (+2/-2)
To merge this branch: bzr merge lp://staging/~xnox/ubuntu-cdimage/focal-oem-20.04
Reviewer Review Type Date Requested Status
Iain Lane (community) Approve
Review via email: mp+378175@code.staging.launchpad.net

Commit message

Use oem-20.04 flavour for focal

Use python2 shebang

To post a comment you must log in.
1831. By Ɓukasz Zemczak

Actually, it seems like launchpad (not launchpad-buildd) is overriding datestamp with what's in build.version. Pass the cdimage date to the build as version instead.

1832. By Iain Lane

merge lp:~xnox/ubuntu-cdimage/focal-oem-20.04

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

I feel like we might have to update the oem-XX.YY logic at some point, but let's go with this for now, thanks.

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