setup_rpm_repo/create_repo: "Arch dependent binaries in noarch package" (#83108) (#83231)

This fixes "Arch dependent binaries in noarch package" error cause by
including files created by make_elf function in noarch packages. While the
error only manifests itself on EL 7 and 8 it is better to use files
suitable for noarch packages to prevent the error potentially
re-occuring in the future.

(cherry picked from commit 87bead3dcf)
pull/83242/head
Martin Krizek 6 months ago committed by GitHub
parent a7258d9bdc
commit 8976724d89
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -448,7 +448,7 @@
- present - present
- dnf: - dnf:
name: /foo.so name: /foo.gif
state: present state: present
register: dnf_result register: dnf_result

@ -12,11 +12,11 @@ from ansible.module_utils.common.respawn import has_respawned, probe_interpreter
HAS_RPMFLUFF = True HAS_RPMFLUFF = True
can_use_rpm_weak_deps = None can_use_rpm_weak_deps = None
try: try:
from rpmfluff import SimpleRpmBuild, GeneratedSourceFile, make_elf from rpmfluff import SimpleRpmBuild, GeneratedSourceFile, make_gif
from rpmfluff import YumRepoBuild from rpmfluff import YumRepoBuild
except ImportError: except ImportError:
try: try:
from rpmfluff.make import make_elf from rpmfluff.make import make_gif
from rpmfluff.sourcefile import GeneratedSourceFile from rpmfluff.sourcefile import GeneratedSourceFile
from rpmfluff.rpmbuild import SimpleRpmBuild from rpmfluff.rpmbuild import SimpleRpmBuild
from rpmfluff.yumrepobuild import YumRepoBuild from rpmfluff.yumrepobuild import YumRepoBuild
@ -47,8 +47,8 @@ SPECS = [
RPM('dinginessentail-with-weak-dep', '1.0', '1', None, ['dinginessentail-weak-dep'], None, None), RPM('dinginessentail-with-weak-dep', '1.0', '1', None, ['dinginessentail-weak-dep'], None, None),
RPM('dinginessentail-weak-dep', '1.0', '1', None, None, None, None), RPM('dinginessentail-weak-dep', '1.0', '1', None, None, None, None),
RPM('noarchfake', '1.0', '1', None, None, None, 'noarch'), RPM('noarchfake', '1.0', '1', None, None, None, 'noarch'),
RPM('provides_foo_a', '1.0', '1', None, None, 'foo.so', 'noarch'), RPM('provides_foo_a', '1.0', '1', None, None, 'foo.gif', 'noarch'),
RPM('provides_foo_b', '1.0', '1', None, None, 'foo.so', 'noarch'), RPM('provides_foo_b', '1.0', '1', None, None, 'foo.gif', 'noarch'),
RPM('number-11-name', '11.0', '1', None, None, None, None), RPM('number-11-name', '11.0', '1', None, None, None, None),
RPM('number-11-name', '11.1', '1', None, None, None, None), RPM('number-11-name', '11.1', '1', None, None, None, None),
RPM('epochone', '1.0', '1', '1', None, None, "noarch"), RPM('epochone', '1.0', '1', '1', None, None, "noarch"),
@ -74,7 +74,7 @@ def create_repo(arch='x86_64'):
pkg.add_installed_file( pkg.add_installed_file(
"/" + spec.file, "/" + spec.file,
GeneratedSourceFile( GeneratedSourceFile(
spec.file, make_elf() spec.file, make_gif()
) )
) )

Loading…
Cancel
Save