Merge lp:~sil2100/livecd-rootfs/bionic-core-series-per-suite into lp:~ubuntu-core-dev/livecd-rootfs/bionic-proposed

Proposed by Łukasz Zemczak on 2018-10-29
Status: Needs review
Proposed branch: lp:~sil2100/livecd-rootfs/bionic-core-series-per-suite
Merge into: lp:~ubuntu-core-dev/livecd-rootfs/bionic-proposed
Diff against target: 38 lines (+15/-1)
2 files modified
debian/changelog (+7/-1)
live-build/auto/config (+8/-0)
To merge this branch: bzr merge lp:~sil2100/livecd-rootfs/bionic-core-series-per-suite
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2018-10-29 Pending
Review via email: mp+357964@code.launchpad.net

Commit message

Decide what model assertion series to fetch depending on the suite. Use 16 for xenial and 18 for other series (bionic+). This enables core18 image builds. Backported from cosmic.

Description of the change

Decide what model assertion series to fetch depending on the suite. Use 16 for xenial and 18 for other series (bionic+). This enables core18 image builds. Backported from cosmic.

NOTE: Please only merge/release this once we have the core16-build support released in xenial. Currently not having this in bionic enables a window for us to build core16 images (since cosmic is core18-only).

To post a comment you must log in.
Balint Reczey (rbalint) wrote :

The target Bazaar branch is not active anymore.
Please resubmit the merge proposal against https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+ref/ubuntu/bionic .

Unmerged revisions

1687. By Łukasz Zemczak on 2018-10-29

Backport core18 build-support from cosmic.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2018-10-26 21:01:17 +0000
3+++ debian/changelog 2018-10-29 17:09:45 +0000
4@@ -1,8 +1,14 @@
5 livecd-rootfs (2.525.10) UNRELEASED; urgency=medium
6
7+ [ Steve Langasek ]
8 * Fix Vcs-Bzr link.
9
10- -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 26 Oct 2018 15:01:07 -0600
11+ [ Łukasz 'sil2100' Zemczak ]
12+ * Decide what model assertion series to fetch depending on the suite. Use 16
13+ for xenial and 18 for other series (bionic+). This enables core18 image
14+ builds. Backported from cosmic.
15+
16+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Mon, 29 Oct 2018 18:05:55 +0100
17
18 livecd-rootfs (2.525.9) bionic; urgency=medium
19
20
21=== modified file 'live-build/auto/config'
22--- live-build/auto/config 2018-08-27 22:32:07 +0000
23+++ live-build/auto/config 2018-10-29 17:09:45 +0000
24@@ -189,6 +189,14 @@
25 UBUNTU_IMAGE_ARGS="--image-size 3700M" ;;
26 *)
27 UBUNTU_IMAGE_ARGS="" ;;
28+ esac
29+ case $SUITE in
30+ xenial)
31+ # Ubuntu Core 16
32+ ;;
33+ *)
34+ # Ubuntu Core 18
35+ MODEL="ubuntu-core-18-${MODEL#pc-}" ;;
36 esac
37
38 echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common

Subscribers

People subscribed via source and target branches