Updates for arm64

debian/control

@@ -10,7 +10,7 @@ Build-Depends:
 Standards-Version: 4.0.0
 
 Package: deckdebuild
-Architecture: any
+Architecture: all
 Depends:
  ${misc:Depends},
  ${python3:Depends},

deckdebuild

@@ -13,7 +13,7 @@ import os
 import sys
 from os import environ
 
-from libdeckdebuild import deckdebuild, DeckDebuildError
+from libdeckdebuild import get_host_arch, deckdebuild, DeckDebuildError
 from conffile import ConfFile
 
 default_values = {
@@ -25,7 +25,8 @@ default_values = {
     "vardir": "/var/lib/deckdebuilds",
     "build_source": False,
     "path_to_buildroot": "",
-    "path_to_output_dir": os.getcwd()
+    "path_to_output_dir": os.getcwd(),
+    "arch": get_host_arch()
     }
 
 
@@ -62,7 +63,7 @@ class Conf(dict):
             elif isinstance(value, str) and value.lower() == 'false':
                 value = False
             if isinstance(value,  bool):
-                action = "store_{}".format(str(not value).lower())
+                action = f"store_{str(not value).lower()}"
                 new_key = key+'_action'
                 default[new_key] = action
             default[key] = value
@@ -72,62 +73,74 @@ class Conf(dict):
 
 def main():
     conf = Conf()
-
     parser = argparse.ArgumentParser(
              description="build a Debian package in a decked chroot")
     parser.add_argument("-r", "--root-cmd",
                         help="command used to gain root_privileges"
                              " env: DECKDEBUILD_ROOT_CMD"
-                             " default: {}".format(conf.root_cmd),
+                             f" default: {conf.root_cmd}",
                         default=conf.root_cmd)
     parser.add_argument("-u", "--user",
                         help="build username (created if it doesn't exist)"
                              " env: DECKDEBUILD_USER"
-                             " default: {}".format(conf.user),
+                             f" default: {conf.user}",
                         default=conf.user)
+    parser.add_argument("-a", "--arch",
+                        help="architechture to build package for"
+                             " env: DECKDEBUILD_ARCH"
+                             f" default: {conf.arch}",
+                        default=conf.arch)
     parser.add_argument("-p", "--preserve-build",
                         help="don't remove build deck after build"
                              " env: DECKDEBUILD_PRESERVE_BUILD"
-                             " default: {}".format(conf.preserve_build),
+                             f" default: {conf.preserve_build}",
                         action=conf.preserve_build_action)
     parser.add_argument("-f", "--faketime",
                         help="use faketime (must be installed)"
                              " env: DECKDEBUILD_FAKETIME"
-                             " default: {}".format(conf.faketime),
+                             f" default: {conf.faketime}",
                         action=conf.faketime_action)
     parser.add_argument("--satisfydepends-cmd",
                         help="program used to satisfy build dependencies"
                              " env: DECKDEBUILD_SATISFYDEPENDS_CMD"
-                             " default: {}".format(conf.satisfydepends_cmd),
+                             f" default: {conf.satisfydepends_cmd}",
                         default=conf.satisfydepends_cmd)
     parser.add_argument("--vardir",
                         help="var data path"
                              " env: DECKDEBUILD_VARDIR"
-                             " default: {}".format(conf.vardir),
+                             f" default: {conf.vardir}",
                         default=conf.vardir)
     parser.add_argument("-b", "--build-source",
                         help="Build source package too."
                              " env: DECKDEBUILD_BUILD_SOURCE"
-                             " default: {}".format(conf.build_source),
+                             f" default: {conf.build_source}",
                         action=conf.build_source_action)
+    # XXX need to append arch to buildroot if it isn't already
+    # and need to warn user...
     parser.add_argument("path_to_buildroot",
                         help="Path to an exisiting buildroot")
     parser.add_argument("path_to_output_dir", nargs='?',
                         help="Path to output",
                         default=os.getcwd())
     args = parser.parse_args()
+
+    if get_host_arch() != "amd64" and args.arch == "amd64":
+        fatal("amd64 can only be built on amd64")
     try:
         deckdebuild(os.getcwd(),
-                    args.path_to_buildroot, args.path_to_output_dir,
-                    root_cmd=args.root_cmd, user=args.user,
+                    args.path_to_buildroot,
+                    args.path_to_output_dir,
+                    root_cmd=args.root_cmd,
+                    user=args.user,
                     preserve_build=args.preserve_build,
                     faketime=args.faketime,
                     satisfydepends_cmd=args.satisfydepends_cmd,
                     vardir=args.vardir,
-                    build_source=args.build_source)
+                    build_source=args.build_source,
+                    arch=args.arch)
     except DeckDebuildError as e:
         fatal(e)
 
 
-if __name__=='__main__':
+if __name__ == '__main__':
     main()