distro: rename files/dirs

CC: Zexi Li <[email protected]> Signed-off-by: Fengguang Wu <[email protected]>
fengguang · Jun 8, 2015 · d4270c6 · d4270c6
1 parent 3303d60
commit d4270c6
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git 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 → distro/adaptation/archlinux b/distro/archlinux-packages.yaml → distro/adaptation/archlinux
diff --git a/distro/scripts/install-archlinux-packages → distro/installer/archlinux b/distro/scripts/install-archlinux-packages → distro/installer/archlinux
diff --git a/distro/scripts/install-debian-packages → distro/installer/debian b/distro/scripts/install-debian-packages → distro/installer/debian
diff --git 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|