launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad-buildd/remove-qemu into lp:launchpad-buildd.

Commit message:
Drop qemu emulation support.  It was quite unreliable, and we've had
real hardware for a while.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/remove-qemu/+merge/328083
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad-buildd/remove-qemu into lp:launchpad-buildd.

=== modified file 'bin/slave-prep'
--- bin/slave-prep	2017-07-25 22:11:19 +0000
+++ bin/slave-prep	2017-07-26 12:02:48 +0000
@@ -9,7 +9,7 @@
 
 NTPDATE=ntpdate
 SUDO=sudo
-PACKAGES="launchpad-buildd python-lpbuildd sbuild bzr-builder bzr git-build-recipe git dpkg-dev python-debian qemu-user-static"
+PACKAGES="launchpad-buildd python-lpbuildd sbuild bzr-builder bzr git-build-recipe git dpkg-dev python-debian"
 KERNEL=$(uname -snrvm)
 
 echo "Forking launchpad-buildd slave process..."

=== modified file 'bin/update-debian-chroot'
--- bin/update-debian-chroot	2017-07-25 22:11:19 +0000
+++ bin/update-debian-chroot	2017-07-26 12:02:48 +0000
@@ -23,8 +23,6 @@
 
 echo "Updating debian chroot for build $BUILDID"
 
-hostarch=$(dpkg --print-architecture)
-
 UNAME26=""
 case $SUITE in
   hardy*|lucid*|maverick*|natty*|oneiric*|precise*)
@@ -43,26 +41,6 @@
     ;;
 esac
 
-# Anything more fancy than amd64->ia32 is done with qemu+syscall
-# emulation, handled via binfmt.misc hints to the kernel that require
-# the statically-compiled qemu binary to appear in the same place both
-# inside and outside the chroot.
-if [ "$hostarch" != "$ARCHITECTURETAG" ]
-then
-  case "$hostarch" in
-    i386|amd64|lpia)
-      case "$ARCHITECTURETAG" in
-        armel|armhf)
-          $SUDO /usr/bin/install /usr/bin/qemu-arm-static $ROOT/usr/bin/
-          ;;
-        arm64)
-          $SUDO /usr/bin/install /usr/bin/qemu-aarch64-static $ROOT/usr/bin/
-          ;;
-      esac
-      ;;
-  esac
-fi
-
 export LANG=C
 export DEBIAN_FRONTEND=noninteractive
 export TTY=unknown

=== modified file 'debian/changelog'
--- debian/changelog	2017-07-25 22:11:19 +0000
+++ debian/changelog	2017-07-26 12:02:48 +0000
@@ -2,6 +2,8 @@
 
   * Move the contents of /usr/share/launchpad-buildd/slavebin/ into bin/ in
     the source package, to keep things a bit more organised.
+  * Drop qemu emulation support.  It was quite unreliable, and we've had
+    real hardware for a while.
 
  -- Colin Watson <cjwatson@xxxxxxxxxx>  Tue, 25 Jul 2017 23:07:58 +0100
 

=== modified file 'debian/control'
--- debian/control	2015-10-20 09:41:07 +0000
+++ debian/control	2017-07-26 12:02:48 +0000
@@ -11,7 +11,6 @@
 Depends: python-lpbuildd (=${source:Version}), python, debootstrap, dpkg-dev,
  file, bzip2, sudo, ntpdate, adduser, apt-transport-https, lsb-release,
  pristine-tar, python-apt, sbuild, ${misc:Depends}
-Recommends: qemu-user-static
 Description: Launchpad buildd slave
  This is the launchpad buildd slave package. It contains everything needed to
  get a launchpad buildd going apart from the database manipulation required to