distro/adaptation: reorganize dirs

close #489

Signed-off-by: Ooi Han Yi [email protected]
Signed-off-by: Chong Tze Suin [email protected]

Author: tzesuinc

distro/adaptation/aliyun

@@ -0,0 +1 @@
+../redhat/default

distro/adaptation/aliyun/default

@@ -1,47 +1,47 @@
-autopoint: gettext
-bsdtar: bsdtar
-btrfs-tools:
-gfortran: gcc-gfortran
-libarchive-tools: libarchive-devel
-libbabeltrace-ctf-dev: libbabeltrace-devel
-libbabeltrace-ctf1: libbabeltrace
-libbabeltrace-dev: libbabeltrace-devel
-libbsd-dev: libbsd-devel
-libbsd0: libbsd
-libcapstone-dev: capstone-devel
-libdw-dev: elfutils-devel
-libelf-dev: elfutils-devel
-libgles2-mesa:
-libmariadb3: mariadb-connector-c
-libopencryptoki0:
-libpfm-dev: libpfm-devel
-libpfm: libpfm-devel
-libpng12-dev:
-libreadline5: readline
-libstdc++-dev: libstdc++-devel libstdc++-static
-libtracefs-dev:
-libtsan0: libtsan
-libvirt-clients:
-libvirt-daemon-system:
-libvirt-dev:
-libyaml-cpp-dev: yaml-cpp-devel
-libzstd-dev: libzstd-devel
-linux-cpupower:
-mysql-server:
-network-manager:
-openbsd-inetd:
-perl-modules-5: perl
-pkg-config:
-python3-dev: python3-devel
-python3-minimal: python3
-python3-openssl: python3-pyOpenSSL
-python3-pkg-resources: python3-setuptools
-rstatd:
-rt-tests:
-ruby-dev: ruby-devel
-rusersd:
-sg3-utils:
-tshark:
-update-inetd:
-wpasupplicant:
-xutils-dev:
+autopoint: gettext
+bsdtar: bsdtar
+btrfs-tools:
+gfortran: gcc-gfortran
+libarchive-tools: libarchive-devel
+libbabeltrace-ctf-dev: libbabeltrace-devel
+libbabeltrace-ctf1: libbabeltrace
+libbabeltrace-dev: libbabeltrace-devel
+libbsd-dev: libbsd-devel
+libbsd0: libbsd
+libcapstone-dev: capstone-devel
+libdw-dev: elfutils-devel
+libelf-dev: elfutils-devel
+libgles2-mesa:
+libmariadb3: mariadb-connector-c
+libopencryptoki0:
+libpfm-dev: libpfm-devel
+libpfm: libpfm-devel
+libpng12-dev:
+libreadline5: readline
+libstdc++-dev: libstdc++-devel libstdc++-static
+libtracefs-dev:
+libtsan0: libtsan
+libvirt-clients:
+libvirt-daemon-system:
+libvirt-dev:
+libyaml-cpp-dev: yaml-cpp-devel
+libzstd-dev: libzstd-devel
+linux-cpupower:
+mysql-server:
+network-manager:
+openbsd-inetd:
+perl-modules-5: perl
+pkg-config:
+python3-dev: python3-devel
+python3-minimal: python3
+python3-openssl: python3-pyOpenSSL
+python3-pkg-resources: python3-setuptools
+rstatd:
+rt-tests:
+ruby-dev: ruby-devel
+rusersd:
+sg3-utils:
+tshark:
+update-inetd:
+wpasupplicant:
+xutils-dev:

distro/adaptation/amazon_linux-2 distro/adaptation/amazon_linux/2

@@ -0,0 +1 @@
+12

distro/adaptation/amazon_linux-2023 distro/adaptation/amazon_linux/2023

@@ -0,0 +1 @@
+38

distro/adaptation/amazon_linux distro/adaptation/amazon_linux/default

@@ -0,0 +1 @@
+../centos/9

distro/adaptation/archlinux distro/adaptation/archlinux/default

@@ -0,0 +1 @@
+../centos/default

distro/adaptation/centos-9 distro/adaptation/centos/9

@@ -0,0 +1 @@
+../centos/9

distro/adaptation/centos distro/adaptation/centos/default

@@ -0,0 +1 @@
+../centos/default

distro/adaptation/clear distro/adaptation/clear/default

@@ -0,0 +1 @@
+../centos/9

distro/adaptation/debian-bookworm_sid

@@ -0,0 +1 @@
+../centos/default

distro/adaptation/debian-10 distro/adaptation/debian/10

@@ -6,7 +6,7 @@
 require "#{LKP_SRC}/lib/programs"
 
 def adapt_packages(distro, generic_packages)
-  distro_file = "#{LKP_SRC}/distro/adaptation/#{distro}"
+  distro_file = "#{LKP_SRC}/distro/adaptation/#{distro}/default"
   return generic_packages unless File.exist? distro_file
 
   distro_packages = YAML.load_file(distro_file)

distro/adaptation/debian-11 distro/adaptation/debian/11

@@ -38,15 +38,15 @@ adapt_package()
 # There are two kinds of packages, packages provided by distribution and packages installed by makepkg
 # The priority for package adaptation is as follow:
 # - adaptation by makepkg, via $LKP_SRC/distro/adaptation-pkg/$distro
-# - adaptation by distro version explicitly, via $LKP_SRC/distro/adaptation/$distro-$_system_version
-# - adaptation by distro explicitly, via $LKP_SRC/distro/adaptation/$distro
+# - adaptation by distro version explicitly, via $LKP_SRC/distro/adaptation/$distro/$_system_version
+# - adaptation by distro explicitly, via $LKP_SRC/distro/adaptation/$distro/default
 # - default to input package name, not found in above
 adapt_packages()
 {
 	local distro_file distro_ver_file
 	if [ -z "$PKG_TYPE" ]; then
-		distro_ver_file="$LKP_SRC/distro/adaptation/$distro-$_system_version"
-		distro_file="$LKP_SRC/distro/adaptation/$distro"
+		distro_ver_file="$LKP_SRC/distro/adaptation/$distro/$_system_version"
+		distro_file="$LKP_SRC/distro/adaptation/$distro/default"
 	else
 		distro_file="$LKP_SRC/distro/adaptation-$PKG_TYPE/$distro"
 	fi