From 320151ea526e066146964eecff4ce125b1abfff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jani=20V=C3=A4limaa?= <wally@mageia.org>
Date: Sun, 4 Feb 2024 10:51:15 +0200
Subject: [PATCH] configs: Build Mageia bootstrap chroots with target arch

Fixes: https://github.com/rpm-software-management/mock/issues/1304
---
 mock-core-configs/etc/mock/templates/mageia-branched.tpl | 1 +
 mock-core-configs/etc/mock/templates/mageia-cauldron.tpl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mock-core-configs/etc/mock/templates/mageia-branched.tpl b/mock-core-configs/etc/mock/templates/mageia-branched.tpl
index 280fb73b3..b65b6ea3e 100644
--- a/mock-core-configs/etc/mock/templates/mageia-branched.tpl
+++ b/mock-core-configs/etc/mock/templates/mageia-branched.tpl
@@ -4,6 +4,7 @@ config_opts['dist'] = 'mga{{ releasever }}'  # only useful for --resultdir varia
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['macros']['%distro_section'] = 'core'
 config_opts['package_manager'] = 'dnf'
+config_opts['bootstrap_forcearch'] = '{{ target_arch }}'
 config_opts['bootstrap_image'] = 'docker.io/library/mageia:{{ releasever }}'
 config_opts['use_bootstrap_image'] = False
 config_opts['description'] = 'Mageia {{ releasever }}'
diff --git a/mock-core-configs/etc/mock/templates/mageia-cauldron.tpl b/mock-core-configs/etc/mock/templates/mageia-cauldron.tpl
index 195830be1..dd406ca9c 100644
--- a/mock-core-configs/etc/mock/templates/mageia-cauldron.tpl
+++ b/mock-core-configs/etc/mock/templates/mageia-cauldron.tpl
@@ -5,6 +5,7 @@ config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '10'
 config_opts['macros']['%distro_section'] = 'core'
 config_opts['package_manager'] = 'dnf'
+config_opts['bootstrap_forcearch'] = '{{ target_arch }}'
 config_opts['bootstrap_image'] = 'docker.io/library/mageia:cauldron'
 config_opts['use_bootstrap_image'] = False
 config_opts['description'] = 'Mageia Cauldron'