-
Notifications
You must be signed in to change notification settings - Fork 173
reorganize dirs for distro/adaptation #501
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
lib/install.sh
Outdated
@@ -45,8 +45,8 @@ 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/$distro-$_system_version" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks, is it possible to use path like $distro/default and $distro/$_system_version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rli9 sure, had change the path
90b083d
to
b858403
Compare
close intel#489 Signed-off-by: Ooi Han Yi han.yi.ooi@intel.com Signed-off-by: Chong Tze Suin tze.suin.chong@intel.com
thanks, one thing to bother is due to other PR merged, there's confliction with this PR, need consider to rebase to latest code to resolve confliction. |
a5924ad
to
58ecd95
Compare
thanks, rebase to latest master and conflict resolved |
@@ -45,8 +45,8 @@ adapt_packages() | |||
{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks, and consider update below code to check Dir.exist in lib/install.rb?
distro_file = "#{LKP_SRC}/distro/adaptation/#{distro}"
return generic_packages unless File.exist? distro_file
@@ -45,8 +45,8 @@ 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" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks, also help update the comment part
# - adaptation by distro version explicitly, via $LKP_SRC/distro/adaptation/$distro-$_system_version
# - adaptation by distro explicitly, via $LKP_SRC/distro/adaptation/$distro
58ecd95
to
66a9024
Compare
@rli9 already update the code in |
thanks for the patch |
Close #489