distro/adaptation: update mapping to resolve failures

Signed-off-by: Philip Li <[email protected]>

distro/adaptation/amazon_linux

@@ -2,51 +2,38 @@ apache2: httpd
 apt-file:
 arping: iputils
 autotools-dev: autoconf
-bind9: bind
 binutils-dev: binutils-devel
 build-essential: make automake gcc gcc-c++ kernel-devel rpm-build
 cgroup-bin: libcgroup
 cgroup-tools: libcgroup-tools
 cgroupfs-mount:
-clang-6.0: clang
 cmake:
 cron: cronie
-dbench=4.0-2: dbench
 default-jdk: java-17-amazon-corretto
 dnsutils: bind-utils
 dpkg-dev:
 e2fslibs-dev: e2fsprogs-devel
 exfat-fuse:
 f2fs-tools:
 fakeroot:
-freeglut3: freeglut
 fsmark:
 g++: gcc-c++
-gcc-4.9: gcc
-gcc-5: gcc
-gcc-6-multilib:
-gcc-6: gcc
-gcc-9: gcc
 gcc-multilib:
 gdbserver: gdb-gdbserver
 heirloom-mailx: mailx
 hpcc:
 initramfs-tools: dracut
 install-info: info
 iozone3:
-iproute2: iproute
-junit4: junit
 klibc-utils:
 libacl1-dev: libacl-devel
 libaio-dev: libaio-devel
-libaio1: libaio
 libapparmor-dev:
 libapparmor1:
 libarchive-dev: libarchive-devel
 libarchive13: libarchive
 libasound2-dev: alsa-lib-devel
 libattr1-dev: libattr-devel
-libattr1: libattr
 libaudit-dev: audit-libs-devel
 libbinutils:
 libblas3: blas
@@ -76,15 +63,14 @@ libdw1: libdwarves1
 libedit-dev: libedit-devel
 libegl1-mesa-dev: mesa-libEGL-devel
 libelf1: elfutils-libelf
-libevent-2: libevent
 libevent-dev: libevent-devel
 libexpat1-dev: expat-devel
 libfabric-dev: libfabric-devel
 libfdt-dev: libfdt-devel
 libffi-dev: libffi-devel
 libfuse-dev: fuse-devel
 libgbm-dev: mesa-libgbm-devel
-libgcc-7-dev: libgcc
+libgcc-dev: libgcc
 libgcrypt-dev: libgcrypt-devel
 libgcrypt20: libgcrypt
 libgdbm-dev: gdbm-devel
@@ -134,8 +120,6 @@ liboop-dev:
 libopenmpi-dev: openmpi-devel
 libopenmpi3: openmpi
 libpcap-dev: libpcap-devel
-libpcap0.8-dev: libpcap-devel
-libpcap0.8: libpcap
 libpci-dev: pciutils-devel
 libpci3: pciutils
 libpciaccess-dev: libpciaccess-devel
@@ -150,7 +134,7 @@ libpopt-dev: popt-devel
 libpopt0: popt
 libprocps-dev: procps-ng-devel
 libprotobuf-dev: protobuf-devel
-libpython2.7:
+libpython2:
 libpython3: python3-libs
 libquadmath0: libquadmath
 librdmacm-dev:
@@ -189,8 +173,8 @@ linux-libc-dev: kernel-headers
 linux-libc-dev:i386: kernel-headers
 linux-perf: perf
 linux-tools: perf
-llvm-6.0:
 llvm-dev: llvm-devel
+llvm:
 locales: glibc-common
 ncurses-bin: ncurses
 netcat-openbsd: nmap-ncat

distro/adaptation/amazon_linux-2

@@ -1,6 +1,5 @@
 autopoint: gettext-devel
 btrfs-tools: btrfs-progs
-cmake: cmake cmake3
 klibc-utils:
 libbabeltrace-ctf1:
 libbabeltrace-dev:
@@ -9,7 +8,6 @@ libbsd0:
 libc6-dev-x32:
 libcairo2-dev: cairo-devel
 libcap-dev: libcap-devel
-libcap2: libcap
 libdw-dev: libdwarf-devel
 libelf-dev: elfutils-libelf-devel
 libgles2-mesa: mesa-libGLES

distro/adaptation/amazon_linux-2022

@@ -9,7 +9,6 @@ libbsd0: libbsd
 libc6-dev-x32:
 libcairo2-dev: cairo-devel
 libcap-dev: libcap-devel
-libcap2: libcap
 libdw-dev: elfutils-devel
 libelf-dev: elfutils-devel
 libgles2-mesa:
@@ -36,7 +35,6 @@ rstatd:
 ruby-dev:
 rusersd:
 sg3-utils:
-stress-ng: stress-ng
 tshark:
 update-inetd:
 wpasupplicant:

distro/adaptation/archlinux

@@ -5,15 +5,12 @@ binutils-dev: binutils
 btrfs-tools: btrfs-progs
 build-essential: base-devel
 cgroup-bin: libcgroup cgmanager
-dbench=4.0-2: dbench-git
 dpkg-dev: dpkg
-freeglut3: freeglut
 initramfs-tools: mkinitcpio
 iozone3: iozone
 klibc-utils:
 libacl1-dev: acl
 libaio-dev: libaio
-libaio1: libaio
 libarchive-tools:
 libarchive13: libarchive
 libattr1-dev: attr
@@ -35,8 +32,7 @@ libnl-genl-3-200: libnl
 libnl-genl-3-dev: libnl
 libnuma1: numactl
 liboop-dev: liboop
-libpcap0.8-dev: libpcap
-libpcap0.8: libpcap
+libpcap-dev: libpcap
 libperl5:
 libpopt-dev: popt
 libpopt0: popt

distro/adaptation/centos

@@ -3,19 +3,15 @@ apt-file:
 arping: iputils
 autopoint: gettext
 autotools-dev: autoconf
-bind9: bind
 binutils-dev: binutils-devel
 bsdextrautils:
 bsdmainutils:
 btrfs-tools: btrfs-progs
 build-essential: make automake gcc gcc-c++ kernel-devel rpm-build
 cgroup-bin: libcgroup
 cgroupfs-mount:
-clang-6.0: clang
-cmake: cmake cmake3
 comerr-dev: libcom_err-devel
 cron: cronie
-dbench=4.0-2: dbench
 dc: bc
 default-jdk: java-1.8.0-openjdk-devel
 devscripts:
@@ -28,14 +24,9 @@ dpkg-dev:
 e2fslibs-dev: e2fsprogs-devel
 exfat-fuse:
 f2fs-tools:
-freeglut3: freeglut
 fsmark:
 fsverity: fsverity-utils
 g++-multilib:
-gcc-4.9: gcc
-gcc-5: gcc
-gcc-6-multilib:
-gcc-6: gcc
 gcc-multilib:
 gdbserver: gdb-gdbserver
 gettext-base: gettext
@@ -47,19 +38,16 @@ initramfs-tools: dracut
 install-info: info
 intltool-debian: intltool
 iozone3:
-iproute2: iproute
 iputils-clockdiff: iputils
 iputils-tracepath: iputils
 ipv6toolkit: thc-ipv6
 isc-dhcp-server: dhcp-server
 javahelper:
 jfsutils:
-junit4: junit
 klibc-utils:
 lib32gcc-dev:
 libacl1-dev: libacl-devel
 libaio-dev: libaio-devel
-libaio1: libaio
 libapache2-mpm-itk:
 libapparmor-dev:
 libapparmor1:
@@ -70,7 +58,6 @@ libarchive13: libarchive
 libasound2-dev: alsa-lib-devel
 libasound2: alsa-lib
 libattr1-dev: libattr-devel
-libattr1: libattr
 libaudit-dev: audit-libs-devel
 libbabeltrace-dev: libbabeltrace-devel
 libbinutils:
@@ -99,7 +86,6 @@ libcap-dev: libcap-devel
 libcap-ng-dev: libcap-ng-devel
 libcap-ng0: libcap-ng
 libcap2-bin: libcap
-libcap2: libcap
 libcapnp-dev: capnproto-devel
 libcapstone-dev: capstone-devel
 libcapstone4: capstone
@@ -113,8 +99,6 @@ libconfig-dev: libconfig-devel
 libcpupower-dev:
 libcrypto++-dev: cryptopp-devel
 libcurl4-openssl-dev: libcurl-devel
-libcurl4: libcurl
-libdatrie1: libdatrie
 libdaxctl-dev: daxctl-devel
 libdbd-mysql-perl: perl-DBD-MySQL
 libdbi-perl: perl-DBI
@@ -124,7 +108,6 @@ libdrm-amdgpu1:
 libdrm-dev: libdrm-devel
 libdrm-intel1:
 libdrm-nouveau2:
-libdrm2: libdrm
 libdw-dev: elfutils-devel
 libdwarf-dev: libdwarf-devel
 libedit-dev: libedit-devel
@@ -133,11 +116,10 @@ libegl1-mesa-dev: mesa-libEGL-devel
 libegl1: mesa-libEGL
 libelf-dev: elfutils-devel
 libelf1: elfutils-libelf
-libevent-2: libevent
 libevent-dev: libevent-devel
+libevent-openssl-2:
 libexpat1-dev: expat-devel
 libfabric-dev: libfabric-devel
-libfabric1: libfabric
 libfdt-dev: libfdt-devel
 libfdt1: libfdt
 libffi-dev: libffi-devel
@@ -154,7 +136,7 @@ libfuse-dev: fuse-devel
 libfuse3: fuse3-libs
 libgbm-dev: mesa-libgbm-devel
 libgbm1: mesa-libgbm
-libgcc-7-dev: libgcc
+libgcc-dev: libgcc
 libgcrypt-dev: libgcrypt-devel
 libgcrypt20: libgcrypt
 libgd3: gd
@@ -222,8 +204,8 @@ libklibc-dev:
 libkmod-dev: kmod-devel
 libkmod2: kmod-libs
 libkrb5-dbg:
-libldap-2.4-2:
 libldap2-dev: openldap-devel
+libldap: openldap
 libleveldb-dev:
 libllvm: llvm-libs
 liblsan0: liblsan
@@ -280,8 +262,6 @@ libpangocairo-1.0-0: pango
 libpangoft2-1.0-0: pango
 libpathplan4: graphviz
 libpcap-dev: libpcap-devel
-libpcap0.8-dev: libpcap-devel
-libpcap0.8: libpcap
 libpci-dev: pciutils-devel
 libpci3: pciutils
 libpciaccess-dev: libpciaccess-devel
@@ -310,7 +290,7 @@ libprocps: procps-ng
 libprotobuf-dev: protobuf-devel
 libpthread-stubs0-dev:
 libpulse-dev: pulseaudio-libs-devel
-libpython2.7:
+libpython2:
 libpython3: python3-libs
 libqt5opengl5-dev:
 libquadmath0: libquadmath
@@ -339,6 +319,7 @@ libsm6: libSM
 libsmbclient-dev: libsmbclient-devel
 libsnappy-dev: snappy-devel
 libsnappy1v5: snappy
+libsodium-dev: libsodium-devel
 libspice-protocol-dev: spice-protocol
 libspice-server-dev:
 libspice-server1:
@@ -365,6 +346,8 @@ libtsan0: libtsan
 libudev-dev: systemd-devel
 libudev1: systemd-libs
 libunwind-dev: libunwind-devel
+liburcu-dev: userspace-rcu-devel
+liburcu: userspace-rcu
 liburing-dev: liburing-devel
 libuuid1: libuuid
 libuv1-dev: libuv-devel
@@ -427,7 +410,7 @@ linux-libc-dev: kernel-headers
 linux-libc-dev:i386: kernel-headers
 linux-perf: perf
 linux-tools: perf
-llvm-6.0: llvm7.0
+llvm: llvm7.0
 locales: glibc-common
 manpages-dev: man-pages
 mesa-utils: mesa-demos
@@ -469,8 +452,6 @@ python-minimal: python2
 python-numpy: numpy
 python-openssl: pyOpenSSL
 python-pkg-resources: python-setuptools
-python3-mako: python-pyramid-mako
-python3-markupsafe: python34-markupsafe
 qemu-system: qemu-kvm
 qemu-utils: qemu-img
 qemu: qemu-kvm
@@ -492,7 +473,6 @@ sg3-utils: sg3_utils
 sgml-base: sgml-common
 sgml-data: sgml-common
 snmp: net-snmp
-stress-ng: stress-ng
 systemtap-sdt-dev: systemtap-sdt-devel
 telnetd-ssl:
 thin-provisioning-tools:

distro/adaptation/centos-9

@@ -7,17 +7,15 @@ cryptsetup-bin: cryptsetup
 cython3: python3-cython
 default-jdk:
 exfat-utils: exfatprogs
-freeglut3-dev: freeglut-devel-3.2.1
+freeglut3-dev: freeglut-devel
 grub-common: grub2-common
-libacl1: libacl-2.3.1
 libbabeltrace-ctf-dev: libbabeltrace-devel
 libbabeltrace-ctf1: libbabeltrace
 libbabeltrace-dev: libbabeltrace-devel
 libbpf-dev: libbpf-devel-1.3.0
 libclang-dev: clang-devel
 libcunit1-dev: CUnit-devel
 libdw1: libdwarves1
-libevent-2.1: libevent-2.1.12
 libfdt-dev: libfdt
 libgles2-mesa-dev: mesa-libGL-devel
 libgles2-mesa: mesa-libGLES
@@ -28,7 +26,7 @@ libjudydebian1: Judy
 libpfm4-dev: libpfm-devel
 libpfm4: libpfm
 libpng12-dev:
-libpython2.7: python3-libs
+libpython2:
 libpython3: python3-libs
 libusb-1.0-0-dev: libusbx-devel
 libusb-1.0-0: libusbx
@@ -42,6 +40,9 @@ python3-csvkit:
 python3-dev: python3-devel
 python3-gi-cairo:
 python3-gi:
+python3-hid: python3-hidapi
+python3-mako: python-pyramid-mako
+python3-markupsafe: python34-markupsafe
 python3-minimal: python3
 python3-nose:
 python3-openssl: python3-pyOpenSSL