From fe34e6ad5ae58ceb8460627f2989e841b4de8200 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Thu, 6 Apr 2023 19:36:07 -0700 Subject: [PATCH] add i686 to variants, make variants local --- .prepopulate.json.swp | Bin 0 -> 28672 bytes shared/general.conf | 14 ++++++++------ variants.xml | 3 +++ 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 .prepopulate.json.swp diff --git a/.prepopulate.json.swp b/.prepopulate.json.swp new file mode 100644 index 0000000000000000000000000000000000000000..356eb35420f102a525cbc3ced93fa8ea062a6302 GIT binary patch literal 28672 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 literal 0 HcmV?d00001 diff --git a/shared/general.conf b/shared/general.conf index b86d023..747ada5 100644 --- a/shared/general.conf +++ b/shared/general.conf @@ -22,12 +22,14 @@ module_defaults_dir = { 'dir': '.', } -variants_file = { - 'scm': 'git', - 'repo': VARIANTS_REPO, - 'branch': VARIANTS_BRANCH, - 'file': VARIANTS_FILE, -} +variants_file = "variants.xml" + +#variants_file = { +# 'scm': 'git', +# 'repo': VARIANTS_REPO, +# 'branch': VARIANTS_BRANCH, +# 'file': VARIANTS_FILE, +#} extra_files = [ ("^.*$", { diff --git a/variants.xml b/variants.xml index 357e3f6..7c062cc 100644 --- a/variants.xml +++ b/variants.xml @@ -6,6 +6,7 @@ aarch64 x86_64 + i686 ppc64le @@ -64,6 +65,7 @@ aarch64 ppc64le x86_64 + i686 @@ -260,6 +262,7 @@ aarch64 ppc64le x86_64 + i686 rocky-powertools