From 02b7182a3fd8eadf9a892a5aae18ca52d6622900 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Fri, 3 May 2024 16:04:26 +0200 Subject: mappings: Reflect libclang-dev split on Ubuntu2404 In Ubuntu 24.04 (well, 23.04 even) the libclang-dev package was renamed to libclang-rt-dev (see [1] and search for 1:14.0.6-10~exp4 release). Since this is basically a new package, add it as such to our mappings file. And of course, some distros (like Alpine, OpenSUSE) did not make that change, or some older ones (like Ubuntu 22.04 or Debian 11) are too old for this change. NB, some distros include this under 'Recommended packages', but usually we pass arguments to apt-get/dnf/... that make it not install those. 1: https://changelogs.ubuntu.com/changelogs/pool/main/l/llvm-toolchain-18/llvm-toolchain-18_18.1.3-1/changelog Signed-off-by: Michal Privoznik --- lcitool/facts/mappings.yml | 7 +++++++ tests/data/packages/in/packages.yml | 1 + tests/data/packages/out/almalinux-8.yml | 1 + tests/data/packages/out/almalinux-9.yml | 1 + tests/data/packages/out/centos-stream-9.yml | 1 + tests/data/packages/out/debian-12-cross-s390x.yml | 1 + tests/data/packages/out/debian-12.yml | 1 + tests/data/packages/out/debian-sid.yml | 1 + tests/data/packages/out/fedora-39.yml | 1 + tests/data/packages/out/fedora-40.yml | 1 + tests/data/packages/out/fedora-rawhide-cross-mingw64.yml | 1 + tests/data/packages/out/fedora-rawhide.yml | 1 + tests/data/packages/out/ubuntu-2404.yml | 1 + 13 files changed, 19 insertions(+) diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml index 2ff8481..d0b5ceb 100644 --- a/lcitool/facts/mappings.yml +++ b/lcitool/facts/mappings.yml @@ -764,6 +764,13 @@ mappings: deb: libclang-dev rpm: clang-devel + libclang-rt: + deb: libclang-rt-dev + rpm: compiler-rt + OpenSUSE: clang-devel + Debian11: libclang-dev + Ubuntu2204: libclang-dev + libcmpiutil: rpm: libcmpiutil-devel AlmaLinux: diff --git a/tests/data/packages/in/packages.yml b/tests/data/packages/in/packages.yml index 7765242..7b54fc3 100644 --- a/tests/data/packages/in/packages.yml +++ b/tests/data/packages/in/packages.yml @@ -107,6 +107,7 @@ packages: - libcacard - libcap-ng - libclang +- libclang-rt - libcmpiutil - libconfig - libcurl diff --git a/tests/data/packages/out/almalinux-8.yml b/tests/data/packages/out/almalinux-8.yml index f778aa3..47c6bd3 100644 --- a/tests/data/packages/out/almalinux-8.yml +++ b/tests/data/packages/out/almalinux-8.yml @@ -30,6 +30,7 @@ native: - clippy - cloud-init - cloud-utils-growpart +- compiler-rt - cpp - ctags - cyrus-sasl-devel diff --git a/tests/data/packages/out/almalinux-9.yml b/tests/data/packages/out/almalinux-9.yml index 3755c72..1873191 100644 --- a/tests/data/packages/out/almalinux-9.yml +++ b/tests/data/packages/out/almalinux-9.yml @@ -31,6 +31,7 @@ native: - clippy - cloud-init - cloud-utils-growpart +- compiler-rt - cpp - ctags - cyrus-sasl-devel diff --git a/tests/data/packages/out/centos-stream-9.yml b/tests/data/packages/out/centos-stream-9.yml index 3755c72..1873191 100644 --- a/tests/data/packages/out/centos-stream-9.yml +++ b/tests/data/packages/out/centos-stream-9.yml @@ -31,6 +31,7 @@ native: - clippy - cloud-init - cloud-utils-growpart +- compiler-rt - cpp - ctags - cyrus-sasl-devel diff --git a/tests/data/packages/out/debian-12-cross-s390x.yml b/tests/data/packages/out/debian-12-cross-s390x.yml index 16c9b76..0ea9687 100644 --- a/tests/data/packages/out/debian-12-cross-s390x.yml +++ b/tests/data/packages/out/debian-12-cross-s390x.yml @@ -166,6 +166,7 @@ native: - libarchive-tar-perl - libc-dev-bin - libclang-dev +- libclang-rt-dev - libcpan-changes-perl - libdigest-perl - libdigest-perl-md5-perl diff --git a/tests/data/packages/out/debian-12.yml b/tests/data/packages/out/debian-12.yml index 550ed48..a1961d8 100644 --- a/tests/data/packages/out/debian-12.yml +++ b/tests/data/packages/out/debian-12.yml @@ -80,6 +80,7 @@ native: - libcap-ng-dev - libcapstone-dev - libclang-dev +- libclang-rt-dev - libcmocka-dev - libconfig-dev - libcpan-changes-perl diff --git a/tests/data/packages/out/debian-sid.yml b/tests/data/packages/out/debian-sid.yml index 550ed48..a1961d8 100644 --- a/tests/data/packages/out/debian-sid.yml +++ b/tests/data/packages/out/debian-sid.yml @@ -80,6 +80,7 @@ native: - libcap-ng-dev - libcapstone-dev - libclang-dev +- libclang-rt-dev - libcmocka-dev - libconfig-dev - libcpan-changes-perl diff --git a/tests/data/packages/out/fedora-39.yml b/tests/data/packages/out/fedora-39.yml index 4215c5e..e573bea 100644 --- a/tests/data/packages/out/fedora-39.yml +++ b/tests/data/packages/out/fedora-39.yml @@ -27,6 +27,7 @@ native: - cloud-init - cloud-utils-growpart - codespell +- compiler-rt - cpp - cppi - ctags diff --git a/tests/data/packages/out/fedora-40.yml b/tests/data/packages/out/fedora-40.yml index 4215c5e..e573bea 100644 --- a/tests/data/packages/out/fedora-40.yml +++ b/tests/data/packages/out/fedora-40.yml @@ -27,6 +27,7 @@ native: - cloud-init - cloud-utils-growpart - codespell +- compiler-rt - cpp - cppi - ctags diff --git a/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml b/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml index 2342e7d..9575365 100644 --- a/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml +++ b/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml @@ -56,6 +56,7 @@ native: - cloud-init - cloud-utils-growpart - codespell +- compiler-rt - cpp - cppi - ctags diff --git a/tests/data/packages/out/fedora-rawhide.yml b/tests/data/packages/out/fedora-rawhide.yml index f47c5f7..c81c46f 100644 --- a/tests/data/packages/out/fedora-rawhide.yml +++ b/tests/data/packages/out/fedora-rawhide.yml @@ -27,6 +27,7 @@ native: - cloud-init - cloud-utils-growpart - codespell +- compiler-rt - cpp - cppi - ctags diff --git a/tests/data/packages/out/ubuntu-2404.yml b/tests/data/packages/out/ubuntu-2404.yml index 4f4f05f..6964862 100644 --- a/tests/data/packages/out/ubuntu-2404.yml +++ b/tests/data/packages/out/ubuntu-2404.yml @@ -80,6 +80,7 @@ native: - libcap-ng-dev - libcapstone-dev - libclang-dev +- libclang-rt-dev - libcmocka-dev - libconfig-dev - libcpan-changes-perl -- cgit v1.1