diff options
author | Daniel P. Berrangé <berrange@redhat.com> | 2025-08-04 12:40:54 +0100 |
---|---|---|
committer | Daniel P. Berrangé <dan-gitlab@berrange.com> | 2025-08-05 11:58:44 +0000 |
commit | 4a19757bf37902260a5625915d8e825d8839641e (patch) | |
tree | a4b9dcf11f8e04c945be0eca3e5b76d95356384b | |
parent | 7423b9adba96761d5008481b289ba4f7b66b8a93 (diff) | |
download | libvirt-ci-master.zip libvirt-ci-master.tar.gz libvirt-ci-master.tar.bz2 |
We already prefer pcre2 on Debian, and pcre has been removed from
OpenSUSE Tumbleweed now. Almost all distros already have pcre2 in
parallel for a long time.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-rw-r--r-- | lcitool/facts/mappings.yml | 8 | ||||
-rw-r--r-- | tests/data/packages/out/alpine-321.yml | 2 | ||||
-rw-r--r-- | tests/data/packages/out/alpine-322.yml | 2 | ||||
-rw-r--r-- | tests/data/packages/out/alpine-edge.yml | 2 | ||||
-rw-r--r-- | tests/data/packages/out/fedora-41.yml | 2 | ||||
-rw-r--r-- | tests/data/packages/out/fedora-42.yml | 2 | ||||
-rw-r--r-- | tests/data/packages/out/fedora-rawhide.yml | 2 | ||||
-rw-r--r-- | tests/data/packages/out/opensuse-leap-15.yml | 2 | ||||
-rw-r--r-- | tests/data/packages/out/opensuse-tumbleweed.yml | 2 |
9 files changed, 13 insertions, 11 deletions
diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml index 51dd232..34810e5 100644 --- a/lcitool/facts/mappings.yml +++ b/lcitool/facts/mappings.yml @@ -1405,10 +1405,12 @@ mappings: MacOS: pcre-static: - apk: pcre-dev + apk: pcre2-dev deb: libpcre2-dev - rpm: pcre-static - OpenSUSE: pcre-devel-static + rpm: pcre2-static + OpenSUSE: pcre2-devel-static + AlmaLinux9: pcre-static + CentOSStream9: pcre-static cross-policy-default: foreign perl: diff --git a/tests/data/packages/out/alpine-321.yml b/tests/data/packages/out/alpine-321.yml index a980164..009a464 100644 --- a/tests/data/packages/out/alpine-321.yml +++ b/tests/data/packages/out/alpine-321.yml @@ -160,7 +160,7 @@ native: - openssh-client - osinfo-db-tools - parted-dev -- pcre-dev +- pcre2-dev - perl - perl-app-cpanminus - perl-dev diff --git a/tests/data/packages/out/alpine-322.yml b/tests/data/packages/out/alpine-322.yml index a980164..009a464 100644 --- a/tests/data/packages/out/alpine-322.yml +++ b/tests/data/packages/out/alpine-322.yml @@ -160,7 +160,7 @@ native: - openssh-client - osinfo-db-tools - parted-dev -- pcre-dev +- pcre2-dev - perl - perl-app-cpanminus - perl-dev diff --git a/tests/data/packages/out/alpine-edge.yml b/tests/data/packages/out/alpine-edge.yml index a980164..009a464 100644 --- a/tests/data/packages/out/alpine-edge.yml +++ b/tests/data/packages/out/alpine-edge.yml @@ -160,7 +160,7 @@ native: - openssh-client - osinfo-db-tools - parted-dev -- pcre-dev +- pcre2-dev - perl - perl-app-cpanminus - perl-dev diff --git a/tests/data/packages/out/fedora-41.yml b/tests/data/packages/out/fedora-41.yml index 7656f21..dd84aca 100644 --- a/tests/data/packages/out/fedora-41.yml +++ b/tests/data/packages/out/fedora-41.yml @@ -181,7 +181,7 @@ native: - osinfo-db-tools - pam-devel - parted-devel -- pcre-static +- pcre2-static - perl-App-cpanminus - perl-Archive-Tar - perl-CPAN-Changes diff --git a/tests/data/packages/out/fedora-42.yml b/tests/data/packages/out/fedora-42.yml index 4f391cb..6a68fe3 100644 --- a/tests/data/packages/out/fedora-42.yml +++ b/tests/data/packages/out/fedora-42.yml @@ -180,7 +180,7 @@ native: - osinfo-db-tools - pam-devel - parted-devel -- pcre-static +- pcre2-static - perl-App-cpanminus - perl-Archive-Tar - perl-CPAN-Changes diff --git a/tests/data/packages/out/fedora-rawhide.yml b/tests/data/packages/out/fedora-rawhide.yml index 4f391cb..6a68fe3 100644 --- a/tests/data/packages/out/fedora-rawhide.yml +++ b/tests/data/packages/out/fedora-rawhide.yml @@ -180,7 +180,7 @@ native: - osinfo-db-tools - pam-devel - parted-devel -- pcre-static +- pcre2-static - perl-App-cpanminus - perl-Archive-Tar - perl-CPAN-Changes diff --git a/tests/data/packages/out/opensuse-leap-15.yml b/tests/data/packages/out/opensuse-leap-15.yml index 94c1f52..368453e 100644 --- a/tests/data/packages/out/opensuse-leap-15.yml +++ b/tests/data/packages/out/opensuse-leap-15.yml @@ -184,7 +184,7 @@ native: - osinfo-db-tools - pam-devel - parted-devel -- pcre-devel-static +- pcre2-devel-static - perl - perl-App-cpanminus - perl-Archive-Tar diff --git a/tests/data/packages/out/opensuse-tumbleweed.yml b/tests/data/packages/out/opensuse-tumbleweed.yml index 9007454..850fe14 100644 --- a/tests/data/packages/out/opensuse-tumbleweed.yml +++ b/tests/data/packages/out/opensuse-tumbleweed.yml @@ -183,7 +183,7 @@ native: - osinfo-db-tools - pam-devel - parted-devel -- pcre-devel-static +- pcre2-devel-static - perl - perl-App-cpanminus - perl-CPAN-Changes |