Merge lp:~cjwatson/launchpad-buildd/livefs-ltsp into lp:launchpad-buildd

[Colin Watson]

Install ltsp-server (but not its Recommends) for livefs builds, as Edubuntu needs it.

Edubuntu i386 builds have regressed with the new Launchpad-based builds because ltsp-build-client is unavailable in the chroot:

  https://launchpad.net/~ubuntu-cdimage/+livefs/ubuntu/utopic/edubuntu/+build/97

This was previously only handled by make-chroot.sh in canonical-is-puppet installing ltsp-server in i386 livefs chroots, which was obscure enough that I didn't notice it.

I considered inventing a way for livefs jobs to request additional build-dependencies. However, Stéphane pointed out that ltsp-server without its Recommends is tiny, so it doesn't seem worth it for this.

[William Grant (wgrant)]

This will probably need to be revised later on, as ltsp-server is a fairly non-core package that probably won't be pulled into the rtm derived distro, for example. But it unbreaks things for now.

review: Approve (code)

[lp:~cjwatson/launchpad-buildd/livefs-ltsp]

119. By Colin Watson on 2014-06-24

Confine the ltsp-server ugliness to i386.

=== modified file 'buildlivefs'
--- buildlivefs	2014-06-15 23:40:27 +0000
+++ buildlivefs	2014-06-24 14:59:40 +0000
@@ -109,6 +109,11 @@
 
     def install(self):
         self.chroot(["apt-get", "-y", "install", "livecd-rootfs"])
+        if self.options.arch == "i386":
+            self.chroot([
+                "apt-get", "-y", "--no-install-recommends", "install",
+                "ltsp-server",
+                ])
         if self.options.locale is not None:
             self.chroot([
                 "apt-get", "-y", "--install-recommends", "install",

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-22 15:12:20 +0000
+++ debian/changelog	2014-06-24 14:59:40 +0000
@@ -1,3 +1,10 @@
+launchpad-buildd (124) UNRELEASED; urgency=medium
+
+  * Install ltsp-server (but not its Recommends) for i386 livefs builds, as
+    Edubuntu needs it.
+
+ -- Colin Watson <[e-mail]>  Tue, 24 Jun 2014 14:58:16 +0100
+
 launchpad-buildd (123) hardy; urgency=medium
 
   * Fix handling of livefs builds for the -proposed pocket.