Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

override ppc64le %_host_cpu #1195

Merged
merged 1 commit into from
Sep 16, 2024
Merged

override ppc64le %_host_cpu #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions mock-core-configs/etc/mock/centos-stream+epel-8-ppc64le.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ config_opts['root'] = 'centos-stream+epel-8-ppc64le'
config_opts['description'] = 'CentOS Stream 8 + EPEL'
config_opts['target_arch'] = 'ppc64le'
config_opts['legal_host_arches'] = ('ppc64le',)
# see pull-request #1195
config_opts['macros']['%_host_cpu'] = 'ppc64le'
2 changes: 2 additions & 0 deletions mock-core-configs/etc/mock/centos-stream+epel-9-ppc64le.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ config_opts['root'] = 'centos-stream+epel-9-ppc64le'
config_opts['description'] = 'CentOS Stream 9 + EPEL'
config_opts['target_arch'] = 'ppc64le'
config_opts['legal_host_arches'] = ('ppc64le',)
# see pull-request #1195
config_opts['macros']['%_host_cpu'] = 'ppc64le'
2 changes: 2 additions & 0 deletions mock-core-configs/etc/mock/centos-stream+epel-next-8-ppc64le.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ config_opts['root'] = 'centos-stream+epel-next-8-ppc64le'
config_opts['description'] = 'CentOS Stream 8 + EPEL Next'
config_opts['target_arch'] = 'ppc64le'
config_opts['legal_host_arches'] = ('ppc64le',)
# see pull-request #1195
config_opts['macros']['%_host_cpu'] = 'ppc64le'
2 changes: 2 additions & 0 deletions mock-core-configs/etc/mock/centos-stream+epel-next-9-ppc64le.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ config_opts['root'] = 'centos-stream+epel-next-9-ppc64le'
config_opts['description'] = 'CentOS Stream 9 + EPEL Next'
config_opts['target_arch'] = 'ppc64le'
config_opts['legal_host_arches'] = ('ppc64le',)
# see pull-request #1195
config_opts['macros']['%_host_cpu'] = 'ppc64le'
2 changes: 2 additions & 0 deletions mock-core-configs/etc/mock/centos-stream-8-ppc64le.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ config_opts['root'] = 'centos-stream-8-ppc64le'
config_opts['description'] = 'CentOS Stream 8'
config_opts['target_arch'] = 'ppc64le'
config_opts['legal_host_arches'] = ('ppc64le',)
# see pull-request #1195
config_opts['macros']['%_host_cpu'] = 'ppc64le'
2 changes: 2 additions & 0 deletions mock-core-configs/etc/mock/centos-stream-9-ppc64le.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ include('templates/centos-stream-9.tpl')
config_opts['root'] = 'centos-stream-9-ppc64le'
config_opts['target_arch'] = 'ppc64le'
config_opts['legal_host_arches'] = ('ppc64le',)
# see pull-request #1195
config_opts['macros']['%_host_cpu'] = 'ppc64le'
2 changes: 2 additions & 0 deletions mock-core-configs/etc/mock/rhel-7-ppc64le.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ config_opts['target_arch'] = 'ppc64le'
config_opts['legal_host_arches'] = ('ppc64le',)

config_opts['rhel_product'] = 'power-le'
# see pull-request #1195
config_opts['macros']['%_host_cpu'] = 'ppc64le'
2 changes: 2 additions & 0 deletions mock-core-configs/etc/mock/rhel-8-ppc64le.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ include('templates/rhel-8.tpl')

config_opts['target_arch'] = 'ppc64le'
config_opts['legal_host_arches'] = ('ppc64le',)
# see pull-request #1195
config_opts['macros']['%_host_cpu'] = 'ppc64le'
2 changes: 2 additions & 0 deletions mock-core-configs/etc/mock/rhel-9-ppc64le.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ include('templates/rhel-9.tpl')

config_opts['target_arch'] = 'ppc64le'
config_opts['legal_host_arches'] = ('ppc64le',)
# see pull-request #1195
config_opts['macros']['%_host_cpu'] = 'ppc64le'
13 changes: 13 additions & 0 deletions releng/release-notes-next/ppc64le-not-powerpc64le-host-cpu.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
We [updated the configuration][PR#1195] files for chroots that still use older
RPM versions (v4.18 and earlier), which affects RHEL/CentOS 9 and older. These
older RPM versions were built with an incorrect default for the `%_host_cpu`
macro in `ppc64le` chroots, where the macro incorrectly resolved to
`powerpc64le` instead of `ppc64le`.

This incorrect value caused issues during architecture validation, such as when
checking `ExclusiveArch: ppc64le` for `BuildArch: noarch` packages (done
in-chroot by `/bin/rpmbuild`).

The incorrect macro value has now been overridden in the relevant `ppc64le`
configuration files in Mock, ensuring that `ExcludeArch` and `ExclusiveArch`
validations resolve correctly.
Loading