diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2023-03-02 15:39:58 +0000 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2023-03-02 15:42:54 +0000 |
| commit | c3f2bc9d8a1374367f60ac6d7cf4c3db72d66663 (patch) | |
| tree | ebca7c25e388a1bfaace4b955216ab8f4650e7d9 | |
| parent | 3f56a95c5821394dd41d992ad8f1467c034cd40e (diff) | |
| download | libvirt-ci-c3f2bc9d8a1374367f60ac6d7cf4c3db72d66663.zip libvirt-ci-c3f2bc9d8a1374367f60ac6d7cf4c3db72d66663.tar.gz libvirt-ci-c3f2bc9d8a1374367f60ac6d7cf4c3db72d66663.tar.bz2 | |
Revert "facts: workaround bogus retirement of capstone from EPEL9"
This reverts commit ff239cf5bf5263b1c72a80e5e95963acd57f5a44.
capstone was unretired in EPEL-9[1], so we can go back to relying
on the regular repos instead of downloading it.
[1] https://bugzilla.redhat.com/show_bug.cgi?id=2124181#c11
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, 2 insertions, 11 deletions
diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml index 13f3115..ba05e54 100644 --- a/lcitool/facts/mappings.yml +++ b/lcitool/facts/mappings.yml @@ -200,15 +200,6 @@ 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 d249b73..b9d8fa2 100644 --- a/tests/data/formatters/out/almalinux-9-all-projects.Dockerfile +++ b/tests/data/formatters/out/almalinux-9-all-projects.Dockerfile @@ -21,6 +21,7 @@ RUN dnf update -y && \ bzip2 \ bzip2-devel \ ca-certificates \ + capstone-devel \ cargo \ ccache \ check-devel \ @@ -66,7 +67,6 @@ 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 e2b998c..6995a0f 100644 --- a/tests/data/packages/out/almalinux-9.yml +++ b/tests/data/packages/out/almalinux-9.yml @@ -22,6 +22,7 @@ native: - bzip2 - bzip2-devel - ca-certificates +- capstone-devel - cargo - ccache - check-devel @@ -72,7 +73,6 @@ 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 |