Removed duplicated lines in distro/adaption

Removed the duplicated lines in os_specific files and add the duplicated lines which appear in all os_specific to the default file.

Signed-off-by: Ong, Yen Yee <[email protected]>
Signed-off-by: Chiam, Jia Ying <[email protected]>

Author: yenyeeong

distro/adaptation/amazon_linux/2

@@ -27,7 +27,6 @@ python-pkg-resources: python-setuptools
 qemu-utils: qemu-img
 rstatd: rusers-server
 rt-tests: numactl-devel
-ruby-dev: ruby-devel
 rusersd: rusers-server rusers
 sg3-utils: sg3_utils
 stress-ng:

distro/adaptation/amazon_linux/2023

@@ -17,7 +17,6 @@ libopencryptoki0:
 libpfm-dev: libpfm-devel
 libpfm: libpfm-devel
 libpng12-dev:
-libreadline5: readline
 libstdc++-dev: libstdc++-devel libstdc++-static
 libtracefs-dev:
 libtsan0: libtsan
@@ -39,7 +38,6 @@ python3-openssl: python3-pyOpenSSL
 python3-pkg-resources: python3-setuptools
 rstatd:
 rt-tests:
-ruby-dev: ruby-devel
 rusersd:
 sg3-utils:
 tshark:

distro/adaptation/amazon_linux/default

@@ -411,6 +411,7 @@ qtbase5-dev:
 reiserfsprogs:
 rng-tools5: rng-tools
 rpcsvc-proto: rpcgen
+ruby-dev: ruby-devel
 ruby-git:
 ruby-gnuplot:
 rusers:

distro/adaptation/centos/9

@@ -12,7 +12,6 @@ freeglut3-dev: freeglut-devel
 grub-common: grub2-common
 libbabeltrace-ctf-dev: libbabeltrace-devel
 libbabeltrace-ctf1: libbabeltrace
-libbabeltrace-dev: libbabeltrace-devel
 libbpf-dev: libbpf-devel
 libclang-dev: clang-devel
 libcunit1-dev: CUnit-devel
@@ -25,11 +24,7 @@ libgoogle-perftools-dev:
 libjudy-dev: Judy-devel
 libjudydebian1: Judy
 libpcre3-dev: pcre-devel
-libpfm-dev: libpfm-devel
-libpfm: libpfm
 libpng12-dev:
-libpython2:
-libpython3: python3-libs
 libsndio7.0:
 libusb-1.0-0-dev: libusb-devel
 libusb-1.0-0: libusb
@@ -55,7 +50,6 @@ python3-pyrad:
 python3-six:
 python3-venv: python3-virtualenv
 python: python3
-rng-tools5: rng-tools
 rstatd:
 rusersd:
 udhcpc: busybox

distro/adaptation/debian/10

@@ -1,5 +1,4 @@
 # buster
-btrfs-tools: btrfs-progs
 fsverity:
 gcc: gcc-9
 lib32gcc-dev: lib32gcc-8-dev
@@ -8,7 +7,6 @@ libasan: libasan5
 libevent-openssl: libevent-openssl-2.1-6
 libevent: libevent-2.1-6
 libgcc-dev: libgcc-8-dev
-libgcrypt-dev: libgcrypt20-dev
 libglut-dev:
 libglut3:
 libgsl: libgsl23

distro/adaptation/debian/11

@@ -1,5 +1,4 @@
 # bullseye
-btrfs-tools: btrfs-progs
 gcc: gcc-10
 lib32gcc-dev: lib32gcc-10-dev
 lib64asan3: lib64asan6

distro/adaptation/debian/12

@@ -1,5 +1,4 @@
 # bookworm
-btrfs-tools: btrfs-progs
 crda:
 cython:
 dh-systemd: debhelper
@@ -18,7 +17,6 @@ libcilkrts5:
 libevent-openssl: libevent-openssl-2.1-7
 libevent: libevent-2.1-7
 libgcc-dev: libgcc-11-dev
-libgcrypt-dev: libgcrypt20-dev
 libglut3: libglut3.12
 libgsl: libgsl27
 libhugetlbfs: libhugetlbfs0

distro/adaptation/debian/default

@@ -1,4 +1,5 @@
 bind: bind9
+btrfs-tools: btrfs-progs
 freeglut: freeglut3
 gcc-toolset:
 gtk3: gir1.2-gtk-3.0

distro/adaptation/debian/trixie_sid

@@ -1,5 +1,4 @@
 # bookworm
-btrfs-tools: btrfs-progs
 crda:
 cython:
 dh-systemd: debhelper
@@ -17,7 +16,6 @@ libdw1: libdw1t64
 libevent-openssl: libevent-openssl-2.1-7
 libevent: libevent-2.1-7
 libgcc-dev: libgcc-11-dev
-libgcrypt-dev: libgcrypt20-dev
 libglut3: libglut3.12
 libgsl: libgsl27
 libhugetlbfs: libhugetlbfs0

distro/adaptation/fedora/38

@@ -1,15 +1 @@
-# reason (3)
-cython3: python3-cython
-netpipe-lam:
-netpipe-mpich2:
-netpipe-openmpi:
-netpipe-pvm:
-netpipe-tcp:
-python3-all-dev:
-python3-cherrypy3: python3-cherrypy
-python3-dev: python3-devel
-python3-gi-cairo:
-python3-gi:
-python3-minimal: python3
-python3-openssl: python3-pyOpenSSL
-python3-venv: python3-virtualenv
+

distro/adaptation/fedora/41

@@ -1,39 +1,6 @@
-# reason (3)
-cython3: python3-cython
-libbrlapi-dev: brlapi-devel
-libbrlapi0.8: brlapi
 libcap-ng0: libcap-ng
 libfdt1: libfdt
-libgtk-3-0: gtk3
-libgtk-3-dev: gtk3-devel
-liblzo2-2: lzo
-liblzo2-dev: lzo-devel
-libncurses5: ncurses
 libpcre3-dev: pcre-devel
-librbd-dev: librbd-devel
-libsasl2-dev: cyrus-sasl-devel
-libsdl2-2.0-0: SDL2
-libseccomp2: libseccomp
-libslirp0: libslirp
-libsndio7.0:
 libspice-server1:
-libssh-4: libssh
-libssh-dev: libssh-devel
 libusb-1.0-0-dev: libusb1-devel
 libusb-1.0-0: libusb
-libvde-dev:
-libvde0:
-libvdeplug2:
-netpipe-lam:
-netpipe-mpich2:
-netpipe-openmpi:
-netpipe-pvm:
-netpipe-tcp:
-python3-all-dev:
-python3-cherrypy3: python3-cherrypy
-python3-dev: python3-devel
-python3-gi-cairo:
-python3-gi:
-python3-minimal: python3
-python3-openssl: python3-pyOpenSSL
-python3-venv: python3-virtualenv

distro/adaptation/fedora/default

@@ -15,6 +15,7 @@ cgroupfs-mount:
 comerr-dev: libcom_err-devel
 cron: cronie
 cryptsetup-bin: cryptsetup
+cython3: python3-cython
 dc: bc
 default-jdk: java-1.8.0-openjdk-devel
 dh-exec:
@@ -393,7 +394,14 @@ python-gi:
 python-minimal: python2
 python-pkg-resources: python-setuptools
 python2-libs:
+python3-all-dev:
+python3-cherrypy3: python3-cherrypy
 python3-dev: python3-devel
+python3-gi-cairo:
+python3-gi:
+python3-minimal: python3
+python3-openssl: python3-pyOpenSSL
+python3-venv: python3-virtualenv
 qemu-system: qemu
 qemu-utils: qemu-img
 qt5-default: qt5-qtbase

distro/adaptation/ubuntu/20.04

@@ -5,7 +5,6 @@ fsverity:
 lib32gcc-dev: lib32gcc-10-dev
 libcurl: libcurl4
 libevent-openssl: libevent-openssl-2.1-7
-libgcrypt-dev: libgcrypt20-dev
 libgsl: libgsl23
 libipsec-mb: libipsec-mb0
 libjson: libjson-c4
@@ -16,7 +15,6 @@ libpipewire: libpipewire-0.2-1
 libpolly-dev: libpolly-18-dev
 libprocps: libprocps8
 libpython3: libpython3.9
-libssl: libssl1.1
 libtirpc: libtirpc3
 libtraceevent-dev:
 libtraceevent1:

distro/adaptation/ubuntu/21.04

@@ -1,8 +1,7 @@
-libgcrypt-dev: libgcrypt20-dev
+
 libipsec-mb: libipsec-mb0
 libntfs: libntfs-3g883
 libperl5: libperl5.32
-libssl: libssl1.1
 libtirpc: libtirpc3
 perl-modules-5: perl-modules-5.32
 python-minimal: python2-minimal