]> git.ipfire.org Git - people/ms/pakfire.git/commitdiff
Add support for aarch64
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 20 Jan 2015 12:31:30 +0000 (07:31 -0500)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 20 Jan 2015 12:31:30 +0000 (07:31 -0500)
macros/arch.macro
src/pakfire/distro.py
src/pakfire/system.py

index e3d38cc1e7b1cadeb3f3974ca1f8128e3872e003..46f3cb2483f7e3905cb224a7559c22cb571149b5 100644 (file)
@@ -17,8 +17,12 @@ infodir           = %{datadir}/info
 mandir            = %{datadir}/man
 unitdir           = %{prefix}/lib/systemd/system
 
+# Libs are installed in /lib64 and %{prefix}/lib64 on aarch64 and x86_64
+if "%{DISTRO_ARCH}" == "aarch64"
+       lib = lib64
+end
+
 if "%{DISTRO_ARCH}" == "x86_64"
-       # Libs are installed in /lib64 and %{prefix}/lib64 on x86_64
        lib = lib64
 end
 
index fae20bb36987c8a170d0f6be3b586c98c0730d3a..a6ff59891fc419fd93d0ca824caa05621fa5e61a 100644 (file)
@@ -165,7 +165,7 @@ class Distribution(object):
                """
                        Returns the "class" this architecture belongs to.
                """
-               if self.arch.startswith("arm"):
+               if self.arch.startswith("arm") or self.arch == "aarch64":
                        return "arm"
 
                if self.arch in ("i686", "x86_64"):
index 2bba8020819bac4d942e5a110a49e9c9ce8edce7..950bb83652516e3a9f72c89a65cc1204b275cb47 100644 (file)
@@ -89,6 +89,8 @@ class System(object):
                        "armv6l"    : ["armv5tel",],
                        "armv7l"    : ["armv7hl", "armv5tel",],
                        "armv7hl"   : ["armv7hl", "armv5tel",],
+
+                       "aarch64"   : ["aarch64",],
                }
 
                try: