From 326652ef8092500f7b8b5f2936f054c373d5270e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jani=20V=C3=A4limaa?= Date: Sat, 13 Apr 2024 07:44:24 +0300 Subject: [PATCH] configs: Replace Mageia 10 and Cauldron i586 configs with i686 --- mock-core-configs/etc/mock/mageia-10-i586.cfg | 1 - mock-core-configs/etc/mock/mageia-10-i686.cfg | 1 + .../mock/{mageia-cauldron-i586.cfg => mageia-cauldron-i686.cfg} | 2 +- releng/release-notes-next/cauldron-i686.config | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) delete mode 120000 mock-core-configs/etc/mock/mageia-10-i586.cfg create mode 120000 mock-core-configs/etc/mock/mageia-10-i686.cfg rename mock-core-configs/etc/mock/{mageia-cauldron-i586.cfg => mageia-cauldron-i686.cfg} (75%) create mode 100644 releng/release-notes-next/cauldron-i686.config diff --git a/mock-core-configs/etc/mock/mageia-10-i586.cfg b/mock-core-configs/etc/mock/mageia-10-i586.cfg deleted file mode 120000 index 59ad0cbb9..000000000 --- a/mock-core-configs/etc/mock/mageia-10-i586.cfg +++ /dev/null @@ -1 +0,0 @@ -mageia-cauldron-i586.cfg \ No newline at end of file diff --git a/mock-core-configs/etc/mock/mageia-10-i686.cfg b/mock-core-configs/etc/mock/mageia-10-i686.cfg new file mode 120000 index 000000000..e8e823767 --- /dev/null +++ b/mock-core-configs/etc/mock/mageia-10-i686.cfg @@ -0,0 +1 @@ +mageia-cauldron-i686.cfg \ No newline at end of file diff --git a/mock-core-configs/etc/mock/mageia-cauldron-i586.cfg b/mock-core-configs/etc/mock/mageia-cauldron-i686.cfg similarity index 75% rename from mock-core-configs/etc/mock/mageia-cauldron-i586.cfg rename to mock-core-configs/etc/mock/mageia-cauldron-i686.cfg index ab2ba1d6e..36387e59e 100644 --- a/mock-core-configs/etc/mock/mageia-cauldron-i586.cfg +++ b/mock-core-configs/etc/mock/mageia-cauldron-i686.cfg @@ -1,4 +1,4 @@ -config_opts['target_arch'] = 'i586' +config_opts['target_arch'] = 'i686' config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') include('templates/mageia-cauldron.tpl') diff --git a/releng/release-notes-next/cauldron-i686.config b/releng/release-notes-next/cauldron-i686.config new file mode 100644 index 000000000..c11bd808e --- /dev/null +++ b/releng/release-notes-next/cauldron-i686.config @@ -0,0 +1,2 @@ +Add i686 configurations for Mageia Cauldron and Mageia 10, and remove i586 +configurations ([PR#1360][]).