diff --git a/bin/setup-local b/bin/setup-local index 8a0ca3fd1..7511f4662 100755 --- a/bin/setup-local +++ b/bin/setup-local @@ -102,7 +102,7 @@ def install_packages(script, distro) packages |= dev_packages return if packages.empty? - unless system "#{LKP_SRC}/distro/scripts/install-#{distro}-packages", *packages + unless system "#{LKP_SRC}/distro/installer/#{distro}", *packages puts "Cannot install some packages in #{LKP_SRC}/distro/#{distro}/#{script}" exit 1 end diff --git a/distro/archlinux-packages.yaml b/distro/adaptation/archlinux similarity index 100% rename from distro/archlinux-packages.yaml rename to distro/adaptation/archlinux diff --git a/distro/scripts/install-archlinux-packages b/distro/installer/archlinux similarity index 100% rename from distro/scripts/install-archlinux-packages rename to distro/installer/archlinux diff --git a/distro/scripts/install-debian-packages b/distro/installer/debian similarity index 100% rename from distro/scripts/install-debian-packages rename to distro/installer/debian diff --git a/lib/install.rb b/lib/install.rb index aa7cee488..0b354ab03 100755 --- a/lib/install.rb +++ b/lib/install.rb @@ -17,7 +17,7 @@ def get_dependency_packages(distro, script) # generic_packages based on debian return generic_packages if distro == 'debian' - distro_file = "#{LKP_SRC}/distro/#{distro}-packages.yaml" + distro_file = "#{LKP_SRC}/distro/adaptation/#{distro}" distro_packages = YAML.load_file(distro_file) packages = [] generic_packages.each_with_index { |pkg_name, index|