Keep last bit of build tuple on ARM.

diff --git a/python/pakfire/distro.py b/python/pakfire/distro.py
index 96eb6194f08a09ff7c278c169937173bf880a629..df785c487f9b1864e525e40825ff2629ff1cced2 100644 (file)
--- a/python/pakfire/distro.py
+++ b/python/pakfire/distro.py
@@ -121,11 +121,20 @@ class Distribution(object):
        def machine(self):
                vendor = self.vendor.split()[0]
 
-               return "%s-%s-linux-gnu" % (self.arch, vendor.lower())
+               s = "%s-%s-linux-gnu" % (self.arch, vendor.lower())
+
+               if self.arch.startswith("arm"):
+                       s += "eabi"
+
+               return s
 
        @property
        def buildtarget(self):
-               return self.machine.replace("-gnu", "")
+               # Cut off last segment of machine.
+               if not self.arch.startswith("arm"):
+                       return self.machine.replace("-gnu", "")
+
+               return self.machine
 
        @property
        def source_dl(self):