From c351fa0be02afef05d93e78656a04d51e129cf39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jani=20V=C3=A4limaa?= Date: Sun, 4 Feb 2024 11:20:34 +0200 Subject: [PATCH] configs: Mageia 7 is EOL Even though Mageia 7 is EOL fix: - use bugfix release 7.1 as `$releasever` - mirror url as Mageia 7 mirror is only available in distrib-coffee archive - build bootstrap chroots with target arch (fixes https://github.com/rpm-software-management/mock/issues/1304) --- .../etc/mock/{ => eol}/mageia-7-aarch64.cfg | 0 .../etc/mock/{ => eol}/mageia-7-armv7hl.cfg | 0 .../etc/mock/{ => eol}/mageia-7-i586.cfg | 0 .../etc/mock/{ => eol}/mageia-7-x86_64.cfg | 0 .../etc/mock/{ => eol}/templates/mageia-7.tpl | 19 ++++++++++--------- 5 files changed, 10 insertions(+), 9 deletions(-) rename mock-core-configs/etc/mock/{ => eol}/mageia-7-aarch64.cfg (100%) rename mock-core-configs/etc/mock/{ => eol}/mageia-7-armv7hl.cfg (100%) rename mock-core-configs/etc/mock/{ => eol}/mageia-7-i586.cfg (100%) rename mock-core-configs/etc/mock/{ => eol}/mageia-7-x86_64.cfg (100%) rename mock-core-configs/etc/mock/{ => eol}/templates/mageia-7.tpl (65%) diff --git a/mock-core-configs/etc/mock/mageia-7-aarch64.cfg b/mock-core-configs/etc/mock/eol/mageia-7-aarch64.cfg similarity index 100% rename from mock-core-configs/etc/mock/mageia-7-aarch64.cfg rename to mock-core-configs/etc/mock/eol/mageia-7-aarch64.cfg diff --git a/mock-core-configs/etc/mock/mageia-7-armv7hl.cfg b/mock-core-configs/etc/mock/eol/mageia-7-armv7hl.cfg similarity index 100% rename from mock-core-configs/etc/mock/mageia-7-armv7hl.cfg rename to mock-core-configs/etc/mock/eol/mageia-7-armv7hl.cfg diff --git a/mock-core-configs/etc/mock/mageia-7-i586.cfg b/mock-core-configs/etc/mock/eol/mageia-7-i586.cfg similarity index 100% rename from mock-core-configs/etc/mock/mageia-7-i586.cfg rename to mock-core-configs/etc/mock/eol/mageia-7-i586.cfg diff --git a/mock-core-configs/etc/mock/mageia-7-x86_64.cfg b/mock-core-configs/etc/mock/eol/mageia-7-x86_64.cfg similarity index 100% rename from mock-core-configs/etc/mock/mageia-7-x86_64.cfg rename to mock-core-configs/etc/mock/eol/mageia-7-x86_64.cfg diff --git a/mock-core-configs/etc/mock/templates/mageia-7.tpl b/mock-core-configs/etc/mock/eol/templates/mageia-7.tpl similarity index 65% rename from mock-core-configs/etc/mock/templates/mageia-7.tpl rename to mock-core-configs/etc/mock/eol/templates/mageia-7.tpl index 4a1fb2d38..c1be6559c 100644 --- a/mock-core-configs/etc/mock/templates/mageia-7.tpl +++ b/mock-core-configs/etc/mock/eol/templates/mageia-7.tpl @@ -1,9 +1,10 @@ config_opts['chroot_setup_cmd'] = 'install basesystem-minimal rpm-build rpm-mageia-setup rpm-mageia-setup-build' config_opts['dist'] = 'mga7' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['releasever'] = '7' +config_opts['releasever'] = '7.1' 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:7' config_opts['use_bootstrap_image'] = False config_opts['description'] = 'Mageia 7' @@ -30,9 +31,9 @@ user_agent={{ user_agent }} [mageia] name=Mageia $releasever - {{ target_arch }} -#baseurl=http://mirrors.kernel.org/mageia/distrib/$releasever/{{ target_arch }}/media/core/release/ +baseurl=https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia-archive/distrib/$releasever/{{ target_arch }}/media/core/release/ #metalink=https://mirrors.mageia.org/metalink?distrib=mageia-$releasever&arch={{ target_arch }}@§ion=core&repo=release -mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}§ion=core&repo=release +#mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}§ion=core&repo=release fastestmirror=1 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/mageia/RPM-GPG-KEY-Mageia @@ -41,9 +42,9 @@ skip_if_unavailable=False [updates] name=Mageia $releasever - {{ target_arch }} - Updates -#baseurl=http://mirrors.kernel.org/mageia/distrib/$releasever/{{ target_arch }}/media/core/updates/ +baseurl=https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia-archive/distrib/$releasever/{{ target_arch }}/media/core/updates/ #metalink=https://mirrors.mageia.org/metalink?distrib=mageia-$releasever&arch={{ target_arch }}@§ion=core&repo=updates -mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}§ion=core&repo=updates +#mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}§ion=core&repo=updates fastestmirror=1 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/mageia/RPM-GPG-KEY-Mageia @@ -52,9 +53,9 @@ skip_if_unavailable=False [mageia-debuginfo] name=Mageia $releasever - {{ target_arch }} - Debug -#baseurl=http://mirrors.kernel.org/mageia/distrib/$releasever/{{ target_arch }}/media/debug/core/release/ +baseurl=https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia-archive/distrib/$releasever/{{ target_arch }}/media/debug/core/release/ #metalink=https://mirrors.mageia.org/metalink?distrib=mageia-$releasever&arch={{ target_arch }}@§ion=core&repo=release&debug=true -mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}§ion=core&repo=release&debug=1 +#mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}§ion=core&repo=release&debug=1 fastestmirror=1 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/mageia/RPM-GPG-KEY-Mageia @@ -63,9 +64,9 @@ skip_if_unavailable=False [updates-debuginfo] name=Mageia $releasever - {{ target_arch }} - Updates - Debug -#baseurl=http://mirrors.kernel.org/mageia/distrib/$releasever/{{ target_arch }}/media/debug/core/updates/ +baseurl=https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia-archive/distrib/$releasever/{{ target_arch }}/media/debug/core/updates/ #metalink=https://mirrors.mageia.org/metalink?distrib=mageia-$releasever&arch={{ target_arch }}@§ion=core&repo=updates&debug=true -mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}§ion=core&repo=updates&debug=1 +#mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}§ion=core&repo=updates&debug=1 fastestmirror=1 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/mageia/RPM-GPG-KEY-Mageia