diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2023-02-08 11:57:19 +0000 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2023-02-08 11:57:19 +0000 |
| commit | ff239cf5bf5263b1c72a80e5e95963acd57f5a44 (patch) | |
| tree | 81ecffae3046385893d8cf9ea81e0c09e14b8682 | |
| parent | c25cfb65cc950e56cac8f2e13c2a7d7b4ebe6672 (diff) | |
| download | libvirt-ci-ff239cf5bf5263b1c72a80e5e95963acd57f5a44.zip libvirt-ci-ff239cf5bf5263b1c72a80e5e95963acd57f5a44.tar.gz libvirt-ci-ff239cf5bf5263b1c72a80e5e95963acd57f5a44.tar.bz2 | |
facts: workaround bogus retirement of capstone from EPEL9
EPEL9 retired capstone as soon as it was added to c9s for
the future RHEL-9.2 release. This dooms anyone still using
RHEL < 9.2 who still needs capstone from EPEL, so we
workaround by manually picking the most recent version
This relies on the fact that DNF accepts URLs to package
downloads, as an alternative to plain package names. This
is good enough for generating containers, but could break
if we get other code in lcitool that expects it to always
be a literal package name.
https://bugzilla.redhat.com/show_bug.cgi?id=2124181
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
| -rw-r--r-- | lcitool/facts/mappings.yml | 9 | ||||
| -rw-r--r-- | tests/data/formatters/out/almalinux-9-all-projects.Dockerfile | 2 | ||||
| -rw-r--r-- | tests/data/packages/out/almalinux-9.yml | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml index ff2e0e1..a36fdde 100644 --- a/lcitool/facts/mappings.yml +++ b/lcitool/facts/mappings.yml @@ -200,6 +200,15 @@ mappings: rpm: capstone-devel MacOS: capstone OpenSUSE: + # EPEL9 retired capstone as soon as it was added to c9s for + # the future RHEL-9.2 release. This dooms anyone still using + # RHEL < 9.2 who still needs capstone from EPEL, so we + # workaround by manually picking the most recent version + AlmaLinux9: + aarch64-AlmaLinux9: https://kojipkgs.fedoraproject.org/packages/capstone/4.0.2/9.el9/aarch64/capstone-4.0.2-9.el9.aarch64.rpm + ppc64le-AlmaLinux9: https://kojipkgs.fedoraproject.org/packages/capstone/4.0.2/9.el9/ppc64le/capstone-4.0.2-9.el9.ppc64le.rpm + s390x-AlmaLinux9: https://kojipkgs.fedoraproject.org/packages/capstone/4.0.2/9.el9/s390x/capstone-4.0.2-9.el9.s390x.rpm + x86_64-AlmaLinux9: https://kojipkgs.fedoraproject.org/packages/capstone/4.0.2/9.el9/x86_64/capstone-4.0.2-9.el9.x86_64.rpm cross-policy-default: foreign cargo: diff --git a/tests/data/formatters/out/almalinux-9-all-projects.Dockerfile b/tests/data/formatters/out/almalinux-9-all-projects.Dockerfile index 1756686..d471b90 100644 --- a/tests/data/formatters/out/almalinux-9-all-projects.Dockerfile +++ b/tests/data/formatters/out/almalinux-9-all-projects.Dockerfile @@ -21,7 +21,6 @@ RUN dnf update -y && \ bzip2 \ bzip2-devel \ ca-certificates \ - capstone-devel \ cargo \ ccache \ check-devel \ @@ -67,6 +66,7 @@ RUN dnf update -y && \ guestfs-tools \ gzip \ hostname \ + https://kojipkgs.fedoraproject.org/packages/capstone/4.0.2/9.el9/x86_64/capstone-4.0.2-9.el9.x86_64.rpm \ hwdata \ icoutils \ iproute \ diff --git a/tests/data/packages/out/almalinux-9.yml b/tests/data/packages/out/almalinux-9.yml index 2cba85b..853838a 100644 --- a/tests/data/packages/out/almalinux-9.yml +++ b/tests/data/packages/out/almalinux-9.yml @@ -22,7 +22,6 @@ native: - bzip2 - bzip2-devel - ca-certificates -- capstone-devel - cargo - ccache - check-devel @@ -73,6 +72,7 @@ native: - guestfs-tools - gzip - hostname +- https://kojipkgs.fedoraproject.org/packages/capstone/4.0.2/9.el9/x86_64/capstone-4.0.2-9.el9.x86_64.rpm - hwdata - icoutils - intltool |