Merge lp:~robru/cupstream2distro/fix-eatmydata into lp:cupstream2distro

[Robert Bruce Park]

Disable eatmydata functionality in vivid.

Fix libeatmydata spew as seen here:

https://ci-train.ubuntu.com/job/ubuntu-landing-017-1-build/76/consoleFull

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:791
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/241/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/241/rebuild

review: Approve (continuous-integration)

[lp:~robru/cupstream2distro/fix-eatmydata]

792. By Robert Bruce Park on 2014-10-28

Testing, testing, this thing on?

793. By Robert Bruce Park on 2014-10-28

Maybe if I...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:793
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/242/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/242/rebuild

review: Approve (continuous-integration)

[lp:~robru/cupstream2distro/fix-eatmydata]

794. By Robert Bruce Park on 2014-10-28

That should just about do it... ?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:794
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/243/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/243/rebuild

review: Approve (continuous-integration)

[lp:~robru/cupstream2distro/fix-eatmydata]

795. By Robert Bruce Park on 2014-10-28

Ok last chance...

796. By Robert Bruce Park on 2014-10-28

And, I give up!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:796
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/244/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/244/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Note that jenkins is meaningless because there's no test coverage for this, I've been tinkering with it directly in production instead.

=== modified file 'chroot-tools/.pbuilderrc'
--- chroot-tools/.pbuilderrc	2014-01-08 10:17:20 +0000
+++ chroot-tools/.pbuilderrc	2014-10-28 02:11:02 +0000
@@ -30,4 +30,12 @@
 # EXTRAPACKAGES is not obeyed by 'cowbuilder --create' but running
 # 'cowbuilder--update' will happily fix that.
 EXTRAPACKAGES="eatmydata pbuilder bzr bzr-builddeb"
-export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libeatmydata/libeatmydata.so"
+case $DIST in
+precise|trusty|utopic)
+    export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libeatmydata/libeatmydata.so"
+    ;;
+*)
+    # FIXME: This rubbish is totally broken in Vivid.
+    #export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/$(dpkg-architecture -a$ARCH -qDEB_HOST_MULTIARCH)/libeatmydata.so"
+    ;;
+esac