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 rpm-software-management#1304)
wally-mageia · Feb 6, 2024 · c1a85ab · c1a85ab
1 parent 7521884
commit c1a85ab
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/...ore-configs/etc/mock/mageia-7-aarch64.cfg → ...configs/etc/mock/eol/mageia-7-aarch64.cfg b/...ore-configs/etc/mock/mageia-7-aarch64.cfg → ...configs/etc/mock/eol/mageia-7-aarch64.cfg
diff --git a/...ore-configs/etc/mock/mageia-7-armv7hl.cfg → ...configs/etc/mock/eol/mageia-7-armv7hl.cfg b/...ore-configs/etc/mock/mageia-7-armv7hl.cfg → ...configs/etc/mock/eol/mageia-7-armv7hl.cfg
diff --git a/mock-core-configs/etc/mock/mageia-7-i586.cfg → ...re-configs/etc/mock/eol/mageia-7-i586.cfg b/mock-core-configs/etc/mock/mageia-7-i586.cfg → ...re-configs/etc/mock/eol/mageia-7-i586.cfg
diff --git a/...core-configs/etc/mock/mageia-7-x86_64.cfg → ...-configs/etc/mock/eol/mageia-7-x86_64.cfg b/...core-configs/etc/mock/mageia-7-x86_64.cfg → ...-configs/etc/mock/eol/mageia-7-x86_64.cfg
diff --git a/...e-configs/etc/mock/templates/mageia-7.tpl → ...nfigs/etc/mock/eol/templates/mageia-7.tpl b/...e-configs/etc/mock/templates/mageia-7.tpl → ...nfigs/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 }}@&section=core&repo=release
-mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}&section=core&repo=release
+#mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}&section=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 }}@&section=core&repo=updates
-mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}&section=core&repo=updates
+#mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}&section=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 }}@&section=core&repo=release&debug=true
-mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}&section=core&repo=release&debug=1
+#mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}&section=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 }}@&section=core&repo=updates&debug=true
-mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}&section=core&repo=updates&debug=1
+#mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch={{ target_arch }}&section=core&repo=updates&debug=1
 fastestmirror=1
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/mageia/RPM-GPG-KEY-Mageia