Merge lp:~cjwatson/click/native-chroots into lp:click/devel

[Colin Watson]

chroot: Handle the case where we can execute binaries for the target architecture directly and thus don't need a cross-compiler (LP: #1319153).

chroot: Handle the case where we can execute binaries for the target architecture directly and thus don't need a cross-compiler (LP: #1319153).

This implements my suggestion from here:

  https://bugs.launchpad.net/ubuntu/+source/click/+bug/1319153/comments/3

[Michael Vogt (mvo)]

This looks good!

You may want to consider using amd64 in line 110 in "def test_gen_sources_native(self):" so that line 47,48 is tested (but thats really minor).

review: Approve

[Michael Vogt (mvo)]

Please ignore my previous comment about the "def test_gen_sources_native(self):". The new test test_gen_sources_native() is testing the new case when native_arch == target_arch and the other cases are already tested.

review: Approve

=== modified file 'click/chroot.py'
--- click/chroot.py	2014-05-20 08:59:35 +0000
+++ click/chroot.py	2014-05-20 11:54:47 +0000
@@ -132,9 +132,10 @@
             series = framework_series[self.framework_base]
         self.series = series
         self.session = session
-        self.native_arch = subprocess.check_output(
+        system_arch = subprocess.check_output(
             ["dpkg", "--print-architecture"],
             universal_newlines=True).strip()
+        self.native_arch = self._get_native_arch(system_arch, self.target_arch)
         self.chroots_dir = "/var/lib/schroot/chroots"
         # this doesn't work because we are running this under sudo
         if 'DEBOOTSTRAP_MIRROR' in os.environ:
@@ -149,6 +150,24 @@
             self.user = pwd.getpwuid(os.getuid()).pw_name
         self.dpkg_architecture = self._dpkg_architecture()
 
+    def _get_native_arch(self, system_arch, target_arch):
+        """Determine the proper native architecture for a chroot.
+
+        Some combinations of system and target architecture do not require
+        cross-building, so in these cases we just create a chroot suitable
+        for native building.
+        """
+        if (system_arch, target_arch) in (
+                ("amd64", "i386"),
+                # This will only work if the system is running a 64-bit
+                # kernel; but there's no alternative since no i386-to-amd64
+                # cross-compiler is available in the Ubuntu archive.
+                ("i386", "amd64"),
+                ):
+            return target_arch
+        else:
+            return system_arch
+
     def _dpkg_architecture(self):
         dpkg_architecture = {}
         command = ["dpkg-architecture", "-a%s" % self.target_arch]
@@ -171,7 +190,10 @@
             pockets.append('%s-%s' % (series, pocket))
         sources = []
         # write binary lines
-        for arch in (target_arch, native_arch):
+        arches = [target_arch]
+        if native_arch != target_arch:
+            arches.append(native_arch)
+        for arch in arches:
             if arch not in primary_arches:
                 mirror = ports_mirror
             else:
@@ -211,6 +233,13 @@
         mode = stat.S_IMODE(os.stat(path).st_mode)
         os.chmod(path, mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
 
+    def _make_cross_package(self, prefix):
+        if self.native_arch == self.target_arch:
+            return prefix
+        else:
+            target_tuple = self.dpkg_architecture["DEB_HOST_GNU_TYPE"]
+            return "%s-%s" % (prefix, target_tuple)
+
     def create(self, keep_broken_chroot_on_fail=False):
         if self.exists():
             raise ClickChrootAlreadyExistsException(
@@ -224,11 +253,10 @@
             proxy = subprocess.check_output(
                 'unset x; eval "$(apt-config shell x Acquire::HTTP::Proxy)"; echo "$x"',
                 shell=True, universal_newlines=True).strip()
-        target_tuple = self.dpkg_architecture["DEB_HOST_GNU_TYPE"]
         build_pkgs = [
             "build-essential", "fakeroot",
-            "apt-utils", "g++-%s" % target_tuple,
-            "pkg-config-%s" % target_tuple, "cmake",
+            "apt-utils", self._make_cross_package("g++"),
+            self._make_cross_package("pkg-config"), "cmake",
             "dpkg-cross", "libc-dev:%s" % self.target_arch
             ]
         for package in extra_packages.get(self.framework_base, []):

=== modified file 'click/tests/test_chroot.py'
--- click/tests/test_chroot.py	2014-05-20 06:30:48 +0000
+++ click/tests/test_chroot.py	2014-05-20 11:54:47 +0000
@@ -30,6 +30,18 @@
 
 
 class TestClickChroot(TestCase):
+    def test_get_native_arch_amd64_to_amd64(self):
+        chroot = ClickChroot("amd64", "ubuntu-sdk-14.04", series="trusty")
+        self.assertEqual("amd64", chroot._get_native_arch("amd64", "amd64"))
+
+    def test_get_native_arch_amd64_to_armhf(self):
+        chroot = ClickChroot("armhf", "ubuntu-sdk-14.04", series="trusty")
+        self.assertEqual("amd64", chroot._get_native_arch("amd64", "armhf"))
+
+    def test_get_native_arch_amd64_to_i386(self):
+        chroot = ClickChroot("i386", "ubuntu-sdk-14.04", series="trusty")
+        self.assertEqual("i386", chroot._get_native_arch("amd64", "i386"))
+
     def test_gen_sources_archive_only(self):
         chroot = ClickChroot("amd64", "ubuntu-sdk-13.10", series="trusty")
         chroot.native_arch = "i386"
@@ -83,3 +95,29 @@
             'deb-src http://archive.ubuntu.com/ubuntu trusty-updates main',
             'deb-src http://archive.ubuntu.com/ubuntu trusty-security main',
         ], sources)
+
+    def test_gen_sources_native(self):
+        chroot = ClickChroot("i386", "ubuntu-sdk-14.04", series="trusty")
+        chroot.native_arch = "i386"
+        sources = chroot._generate_sources(
+            chroot.series, chroot.native_arch, chroot.target_arch,
+            "main")
+        self.assertEqual([
+            'deb [arch=i386] http://archive.ubuntu.com/ubuntu trusty main',
+            'deb [arch=i386] http://archive.ubuntu.com/ubuntu trusty-updates main',
+            'deb [arch=i386] http://archive.ubuntu.com/ubuntu trusty-security main',
+            'deb-src http://archive.ubuntu.com/ubuntu trusty main',
+            'deb-src http://archive.ubuntu.com/ubuntu trusty-updates main',
+            'deb-src http://archive.ubuntu.com/ubuntu trusty-security main',
+        ], sources)
+
+    def test_make_cross_package_native(self):
+        chroot = ClickChroot("amd64", "ubuntu-sdk-14.04", series="trusty")
+        chroot.native_arch = "amd64"
+        self.assertEqual("g++", chroot._make_cross_package("g++"))
+
+    def test_make_cross_package_cross(self):
+        chroot = ClickChroot("armhf", "ubuntu-sdk-14.04", series="trusty")
+        chroot.native_arch = "amd64"
+        self.assertEqual(
+            "g++-arm-linux-gnueabihf", chroot._make_cross_package("g++"))

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-20 09:02:41 +0000
+++ debian/changelog	2014-05-20 11:54:47 +0000
@@ -21,6 +21,11 @@
   * click chroot creation depends on dpkg-architecture, so recommend
     dpkg-dev.
 
+  [ Colin Watson ]
+  * chroot: Handle the case where we can execute binaries for the target
+    architecture directly and thus don't need a cross-compiler
+    (LP: #1319153).
+
  -- Colin Watson <[e-mail]>  Thu, 15 May 2014 17:10:58 +0100
 
 click (0.4.22) utopic; urgency=medium