Merge lp:~mwhudson/livecd-rootfs/bug-1711735 into lp:~ubuntu-core-dev/livecd-rootfs/trusty-proposed

Proposed by Michael Hudson-Doyle on 2017-10-30
Status: Merged
Merged at revision: 922
Proposed branch: lp:~mwhudson/livecd-rootfs/bug-1711735
Merge into: lp:~ubuntu-core-dev/livecd-rootfs/trusty-proposed
Diff against target: 37 lines (+13/-6)
2 files modified
debian/changelog (+7/-0)
live-build/auto/build (+6/-6)
To merge this branch: bzr merge lp:~mwhudson/livecd-rootfs/bug-1711735
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2017-10-30 Pending
Review via email: mp+333005@code.launchpad.net

Description of the change

Turns out this is super simple, just copy the fix from trunk.

Testing is a bit more involved of course.

I created my own copy of the ~cloud-images-release-managers/+livefs/ubuntu/trusty/docker-ubuntu-core livefs at https://launchpad.net/~mwhudson/+livefs/ubuntu/trusty/docker-ubuntu-core-tests, uploaded a version of livecd-rootfs with no changes to ppa:mwhudson/scratch, built a amd64 and armhf image, checked they were using the right livecd-rootfs, uploaded a version of livecd-rootfs with the change from this branch to the same ppa and built amd64 and armhf again.

I then diffed the pre and post fix tarballs and confirmed that there are no meaningful changes in amd64 ("http://security.ubuntu.com/ubuntu" has become "http://security.ubuntu.com/ubuntu/" in the sources.list) and that the changes we wanted to see are in the armhf tarballs. I also tested apt update in the armhf tarballs via qemu-arm-static and it now succeeds.

If you want to check my working I've uploaded the pre and post fix tarballs to http://people.canonical.com/~mwh/bug-1711735/

To post a comment you must log in.

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 2017-06-07 05:18:48 +0000
3+++ debian/changelog 2017-10-30 20:31:54 +0000
4@@ -1,3 +1,10 @@
5+livecd-rootfs (2.208.15) trusty; urgency=medium
6+
7+ * Fix security mirror sources.list entries for non-x86 architectures by
8+ backporting trunk revision 1408. (LP: #1711735)
9+
10+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Mon, 30 Oct 2017 12:18:48 +1300
11+
12 livecd-rootfs (2.208.14) trusty; urgency=medium
13
14 [ Robert C. Jennings ]
15
16=== modified file 'live-build/auto/build'
17--- live-build/auto/build 2017-05-26 01:35:31 +0000
18+++ live-build/auto/build 2017-10-30 20:31:54 +0000
19@@ -99,12 +99,12 @@
20 # deb http://archive.canonical.com/ubuntu $LB_DISTRIBUTION partner
21 # deb-src http://archive.canonical.com/ubuntu $LB_DISTRIBUTION partner
22
23-deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security main restricted
24-# deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security main restricted
25-deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security universe
26-# deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security universe
27-deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security multiverse
28-# deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security multiverse
29+deb $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security main restricted
30+# deb-src $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security main restricted
31+deb $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security universe
32+# deb-src $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security universe
33+deb $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security multiverse
34+# deb-src $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security multiverse
35 EOF
36
37 fi

Subscribers

People subscribed via source and target branches