Attachment 14343 Details for Bug 32620 – patch from jani allowing mock to build for arm arches

patch from jani allowing mock to build for arm arches

0001-configs-Build-Mageia-bootstrap-chroots-with-target-a.patch (text/plain), 1.90 KB, created by Philippe Didier on 2024-02-07 13:01:21 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Didier

Created: 2024-02-07 13:01:21 CET

Size: 1.90 KB

patch

obsolete

>From 5f754f4765b076ff4fa60111cdabac3719b66779 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 280fb73b..b65b6ea3 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 195830be..dd406ca9 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'
>-- 
>2.43.0
>

From 5f754f4765b076ff4fa60111cdabac3719b66779 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 280fb73b..b65b6ea3 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 195830be..dd406ca9 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'
-- 
2.43.0

Actions: View

Attachments on bug 32620: 14210 | 14211 | 14212 | 14317 | 14342 | 14343