From e3c44ca87a1dde9eb3a3cd0118c7489739152b47 Mon Sep 17 00:00:00 2001 From: reuben olinsky Date: Wed, 5 Aug 2026 19:29:42 +0000 Subject: [PATCH] chore: update stage2-prod config Now that PROD is building stage2 against stage2, we need to remove the stage1 compat package from the buildroot. We also remove some forcibly-set macros to be more consistent with koji configuration in PROD; this enables us to reproduce some package build failures that show up without these set. --- distro/mock/azl4/stage2-prod/azurelinux-4.0.tpl | 8 -------- 1 file changed, 8 deletions(-) diff --git a/distro/mock/azl4/stage2-prod/azurelinux-4.0.tpl b/distro/mock/azl4/stage2-prod/azurelinux-4.0.tpl index 6522036bbae..28c15f77dd0 100644 --- a/distro/mock/azl4/stage2-prod/azurelinux-4.0.tpl +++ b/distro/mock/azl4/stage2-prod/azurelinux-4.0.tpl @@ -5,11 +5,6 @@ config_opts['use_bootstrap_image'] = False # TODO: This will be moved into a comp.xml file. config_opts['chroot_setup_cmd'] = 'install' -# We enable this for now; it's only required for stage2 builds that consume -# dependencies from stage1. This config currently consumes dependencies from -# stage1. -config_opts['chroot_setup_cmd'] += ' azurelinux-stage1-compat' - config_opts['chroot_setup_cmd'] += ' bash' config_opts['chroot_setup_cmd'] += ' bzip2' config_opts['chroot_setup_cmd'] += ' coreutils' @@ -43,9 +38,6 @@ config_opts['plugin_conf']['ccache_enable'] = False config_opts['cleanup_on_success'] = False config_opts['cleanup_on_failure'] = False -config_opts['macros']['%dist'] = '.azl4' -config_opts['macros']['%vendor'] = 'Microsoft Corporation' -config_opts['macros']['%distribution'] = 'Azure Linux' config_opts['dist'] = 'azl4' config_opts['extra_chroot_dirs'] = ['/run/lock'] config_opts['releasever'] = '4.0'