Merge pull request #121 from kellyma2/extension-arch

Enable use of architecture for config extension

Author: kellyma2

bazeldnf/extensions.bzl

@@ -89,6 +89,7 @@ update_lock_file(
     repofile = "{repofile}",
     nobest = {nobest},
     cache_dir = {cache_dir},
+    architecture = "{architecture}",
 )
 """
 
@@ -119,6 +120,7 @@ def _alias_repository_impl(repository_ctx):
             excludes = ", ".join(["'{}'".format(x) for x in repository_ctx.attr.excludes]),
             repofile = repofile,
             nobest = "True" if repository_ctx.attr.nobest else "False",
+            architecture = repository_ctx.attr.architecture,
         ),
     )
     for rpm in repository_ctx.attr.rpms:
@@ -156,6 +158,7 @@ _alias_repository = repository_rule(
         "repository_prefix": attr.string(),
         "nobest": attr.bool(default = False),
         "cache_dir": attr.string(),
+        "architecture": attr.string(values = ["i686", "x86_64", "aarch64", ""]),
     },
 )
 
@@ -175,6 +178,7 @@ def _handle_lock_file(config, module_ctx, registered_rpms = {}):
         "repofile": config.repofile,
         "repository_prefix": config.rpm_repository_prefix,
         "nobest": config.nobest,
+        "architecture": config.architecture,
     }
 
     module_ctx.watch(config.lock_file)
@@ -388,6 +392,10 @@ The lock file content is as:
             doc = "Don't include dependencies in resulting repositories",
             default = False,
         ),
+        "architecture": attr.string(
+            doc = "Architectures to enable in addition to noarch",
+            values = ["i686", "x86_64", "aarch64", ""],
+        ),
     },
 )
 

bazeldnf/private/lock-file-helpers.bzl

@@ -21,6 +21,9 @@ def _collect_lockfile_args(ctx):
     if ctx.attr.cache_dir:
         lockfile_args.extend(["--cache-dir", ctx.attr.cache_dir])
 
+    if ctx.attr.architecture:
+        lockfile_args.extend(["--arch", ctx.attr.architecture])
+
     lockfile_args.append("--ignore-missing")
 
     return lockfile_args
@@ -67,6 +70,7 @@ update_lock_file = rule(
         "repofile": attr.string(),
         "nobest": attr.bool(default = False),
         "cache_dir": attr.string(),
+        "architecture": attr.string(values = ["i686", "x86_64", "aarch64", ""]),
         "_runner": attr.label(allow_single_file = True, default = Label("//bazeldnf/private:update-lock-file.sh")),
     },
     toolchains = [