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

[Michael Hudson-Doyle]

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/

=== modified file 'debian/changelog'
--- debian/changelog	2017-06-07 05:18:48 +0000
+++ debian/changelog	2017-10-30 20:31:54 +0000
@@ -1,3 +1,10 @@
+livecd-rootfs (2.208.15) trusty; urgency=medium
+
+  * Fix security mirror sources.list entries for non-x86 architectures by
+    backporting trunk revision 1408. (LP: #1711735)
+
+ -- Michael Hudson-Doyle <[e-mail]>  Mon, 30 Oct 2017 12:18:48 +1300
+
 livecd-rootfs (2.208.14) trusty; urgency=medium
 
   [ Robert C. Jennings ]
 
=== modified file 'live-build/auto/build'
--- live-build/auto/build	2017-05-26 01:35:31 +0000
+++ live-build/auto/build	2017-10-30 20:31:54 +0000
@@ -99,12 +99,12 @@
 # deb http://archive.canonical.com/ubuntu $LB_DISTRIBUTION partner
 # deb-src http://archive.canonical.com/ubuntu $LB_DISTRIBUTION partner
 
-deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security main restricted
-# deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security main restricted
-deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security universe
-# deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security universe
-deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security multiverse
-# deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security multiverse
+deb $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security main restricted
+# deb-src $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security main restricted
+deb $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security universe
+# deb-src $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security universe
+deb $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security multiverse
+# deb-src $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security multiverse
 EOF
 
 	fi