From d1060e62094779396a1818e0ad7a2e8426f97456 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Fri, 26 Apr 2024 10:30:01 +0200 Subject: targets: Drop Ubuntu 20.04 Signed-off-by: Michal Privoznik --- lcitool/facts/mappings.yml | 14 -- lcitool/facts/targets/ubuntu-2004.yml | 25 --- tests/data/packages/out/ubuntu-2004.yml | 296 -------------------------------- 3 files changed, 335 deletions(-) delete mode 100644 lcitool/facts/targets/ubuntu-2004.yml delete mode 100644 tests/data/packages/out/ubuntu-2004.yml diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml index 5b6c58e..a037d74 100644 --- a/lcitool/facts/mappings.yml +++ b/lcitool/facts/mappings.yml @@ -192,7 +192,6 @@ mappings: apk: util-linux deb: bsdextrautils rpm: util-linux - Ubuntu2004: bsdmainutils bzip2: default: bzip2 @@ -606,7 +605,6 @@ mappings: apk: hexdump deb: bsdextrautils rpm: util-linux - Ubuntu2004: bsdmainutils hostname: default: hostname @@ -738,7 +736,6 @@ mappings: apk: libbpf-dev deb: libbpf-dev rpm: libbpf-devel - Ubuntu2004: cross-policy-default: foreign libc: @@ -910,7 +907,6 @@ mappings: deb: libnbd-dev rpm: libnbd-devel Debian11: - Ubuntu2004: libnl3: apk: libnl3-dev @@ -955,7 +951,6 @@ mappings: apk: pipewire-dev deb: libpipewire-0.3-dev rpm: pipewire-devel - Ubuntu2004: cross-policy-default: foreign libpmem: @@ -1091,7 +1086,6 @@ mappings: apk: liburing-dev deb: liburing-dev rpm: liburing-devel - Ubuntu2004: cross-policy-default: foreign libusbx: @@ -1149,7 +1143,6 @@ mappings: rpm: libxdp-devel Debian11: OpenSUSELeap15: - Ubuntu2004: Ubuntu2204: cross-policy-default: foreign @@ -1198,7 +1191,6 @@ mappings: pkg: lua54 rpm: lua-devel MacOS: lua - Ubuntu2004: lua5.3 lvm2: default: lvm2 @@ -1226,7 +1218,6 @@ mappings: meson: default: meson - Ubuntu2004: mkisofs: apk: cdrkit @@ -1279,7 +1270,6 @@ mappings: pkg: MacOS: OpenSUSE: - Ubuntu2004: ncursesw: default: ncurses @@ -1299,7 +1289,6 @@ mappings: AlmaLinux8: netcf-devel CentOSStream8: netcf-devel Debian11: libnetcf-dev - Ubuntu2004: libnetcf-dev cross-policy-default: skip net-snmp: @@ -1671,7 +1660,6 @@ mappings: AlmaLinux8: CentOSStream8: OpenSUSELeap15: - Ubuntu2004: # Present but broken for our needs # https://bugs.launchpad.net/ubuntu/+source/python-build/+bug/1992108 Ubuntu2204: @@ -2007,7 +1995,6 @@ mappings: # Revisit mid-october 2023 after the next quarterly release. FreeBSD: Debian11: - Ubuntu2004: systemd: deb: libsystemd-dev @@ -2064,7 +2051,6 @@ mappings: pkg: py39-tomli MacOS: Debian11: - Ubuntu2004: unzip: default: unzip diff --git a/lcitool/facts/targets/ubuntu-2004.yml b/lcitool/facts/targets/ubuntu-2004.yml deleted file mode 100644 index d31fd5d..0000000 --- a/lcitool/facts/targets/ubuntu-2004.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -os: - name: 'Ubuntu' - version: '2004' - libosinfo_id: 'http://ubuntu.com/ubuntu/20.04' - -packaging: - format: 'deb' - command: 'apt-get' - -paths: - bash: /bin/bash - cc: /usr/bin/gcc - ccache: /usr/bin/ccache - make: /usr/bin/make - ninja: /usr/bin/ninja - pip3: /usr/bin/pip3 - python: /usr/bin/python3 - sudoers: /etc/sudoers - -ansible_python_package: python3 -ansible_python_interpreter: /usr/bin/python3 - -containers: - base: docker.io/library/ubuntu:20.04 diff --git a/tests/data/packages/out/ubuntu-2004.yml b/tests/data/packages/out/ubuntu-2004.yml deleted file mode 100644 index 5955a63..0000000 --- a/tests/data/packages/out/ubuntu-2004.yml +++ /dev/null @@ -1,296 +0,0 @@ -native: -- ant -- ant-optional -- augeas-lenses -- augeas-tools -- autoconf -- automake -- autopoint -- bash -- bash-completion -- bc -- bison -- black -- bsdmainutils -- bzip2 -- ca-certificates -- cargo -- ccache -- check -- chrony -- clang -- cloud-guest-utils -- cloud-init -- codespell -- cpanminus -- cpp -- dbus -- debianutils -- diffutils -- dnsmasq-base -- dwarves -- e2fsprogs -- ebtables -- expect -- exuberant-ctags -- fdisk -- findutils -- flake8 -- flex -- fuse3 -- g++ -- gcc -- gcovr -- gdb -- genisoimage -- gettext -- git -- gnutls-bin -- golang -- grep -- gtk-doc-tools -- gtk-update-icon-cache -- gzip -- hostname -- hwdata -- icoutils -- intltool -- iproute2 -- iptables -- jq -- junit -- kmod -- libaccessors-perl -- libacl1-dev -- libaio-dev -- libapparmor-dev -- libarchive-dev -- libarchive-tar-perl -- libasan6 -- libasound2-dev -- libattr1-dev -- libaudit-dev -- libblkid-dev -- libbrlapi-dev -- libbz2-dev -- libc-dev-bin -- libc6-dev -- libcacard-dev -- libcap-ng-dev -- libcapstone-dev -- libclang-dev -- libcmocka-dev -- libconfig-dev -- libcpan-changes-perl -- libcurl4-gnutls-dev -- libdaxctl-dev -- libdevmapper-dev -- libdigest-perl -- libdigest-perl-md5-perl -- libdrm-dev -- libepoxy-dev -- libev-dev -- libextutils-cbuilder-perl -- libfdt-dev -- libffi-dev -- libfile-slurp-perl -- libfuse-dev -- libfuse3-dev -- libgbm-dev -- libgcrypt20-dev -- libgdk-pixbuf2.0-dev -- libgirepository1.0-dev -- libglib2.0-dev -- libglib2.0-dev-bin -- libglusterfs-dev -- libgnutls28-dev -- libgtk-3-dev -- libgtk-vnc-2.0-dev -- libguestfs-dev -- libguestfs-tools -- libibumad-dev -- libibverbs-dev -- libio-compress-perl -- libio-interface-perl -- libio-string-perl -- libiscsi-dev -- libjemalloc-dev -- libjna-java -- libjpeg-turbo8-dev -- libjson-c-dev -- libjson-glib-dev -- liblttng-ust-dev -- liblzma-dev -- liblzo2-dev -- libmodule-build-perl -- libncursesw5-dev -- libnet-openssh-perl -- libnet-snmp-perl -- libnetaddr-ip-perl -- libnetcf-dev -- libnfs-dev -- libnl-3-dev -- libnl-route-3-dev -- libnuma-dev -- libopenwsman-dev -- libpam0g-dev -- libparted-dev -- libpcap0.8-dev -- libpciaccess-dev -- libpcre2-dev -- libperl-dev -- libpixman-1-dev -- libpmem-dev -- libpng-dev -- libpulse-dev -- librbd-dev -- librdmacm-dev -- libreadline-dev -- librest-dev -- libsanlock-dev -- libsasl2-dev -- libsdl2-dev -- libsdl2-image-dev -- libseccomp-dev -- libselinux1-dev -- libslirp-dev -- libsnappy-dev -- libsndio-dev -- libsnmp-dev -- libsoup2.4-dev -- libspice-client-gtk-3.0-dev -- libspice-protocol-dev -- libspice-server-dev -- libssh-dev -- libssh2-1-dev -- libstd-rust-dev -- libsub-uplevel-perl -- libsystemd-dev -- libtap-formatter-html-perl -- libtap-formatter-junit-perl -- libtap-harness-archive-perl -- libtasn1-6-dev -- libtest-exception-perl -- libtest-harness-perl -- libtest-lwp-useragent-perl -- libtest-pod-coverage-perl -- libtest-pod-perl -- libtest-simple-perl -- libtime-hr-perl -- libtirpc-dev -- libtool -- libtool-bin -- libtorrent-dev -- libubsan1 -- libudev-dev -- libusb-1.0-0-dev -- libusbredirhost-dev -- libvdeplug-dev -- libvirglrenderer-dev -- libvirt-dev -- libvirt-glib-1.0-dev -- libvte-2.91-dev -- libxen-dev -- libxml-twig-perl -- libxml-writer-perl -- libxml-xpath-perl -- libxml2-dev -- libxml2-utils -- libxslt1-dev -- libyajl-dev -- libyaml-perl -- libzstd-dev -- llvm -- locales -- lsof -- lua5.3 -- lvm2 -- make -- mount -- mtools -- multipath-tools -- nano -- nbd-client -- nbd-server -- nbdkit -- ncat -- net-tools -- nettle-dev -- nfs-common -- ninja-build -- numad -- ocaml -- ocaml-findlib -- ocaml-nox -- open-iscsi -- openjdk-17-jdk-headless -- openssh-client -- original-awk -- osinfo-db-tools -- perl -- perl-base -- php-dev -- php-imagick -- pkgconf -- policykit-1 -- publican -- python3 -- python3-boto3 -- python3-dbus -- python3-dev -- python3-docutils -- python3-gi -- python3-libxml2 -- python3-lxml -- python3-numpy -- python3-opencv -- python3-pillow -- python3-pip -- python3-pytest -- python3-requests -- python3-selinux -- python3-setuptools -- python3-sphinx -- python3-sphinx-rtd-theme -- python3-venv -- python3-wheel -- python3-yaml -- qemu-system -- qemu-utils -- rake -- rpm2cpio -- ruby-dev -- rust-clippy -- rustc -- screen -- scrub -- sed -- socat -- sparse -- strace -- sudo -- systemtap-sdt-dev -- tar -- tcl-dev -- tcpdump -- tesseract-ocr -- tesseract-ocr-eng -- texinfo -- unzip -- uuid-dev -- valac -- valgrind -- vim-nox -- wget -- wireshark-dev -- xfslibs-dev -- xorriso -- xsltproc -- xz-utils -- zip -- zlib1g-dev -- zstd -pypi: -- build -- meson==0.56.0 -- tomli -- cgit v1.1