Skip to content

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

Merged
merged 1 commit into from
Mar 8, 2025
Merged

Conversation

tzesuinc
Copy link

@tzesuinc tzesuinc commented Mar 7, 2025

Close #489

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"
Copy link

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?

Copy link
Author

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

@tzesuinc tzesuinc closed this Mar 7, 2025
@tzesuinc tzesuinc reopened this Mar 7, 2025
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
@rli9
Copy link

rli9 commented Mar 8, 2025

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.

@tzesuinc
Copy link
Author

tzesuinc commented Mar 8, 2025

thanks, rebase to latest master and conflict resolved

@@ -45,8 +45,8 @@ adapt_packages()
{
Copy link

@rli9 rli9 Mar 8, 2025

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"
Copy link

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

@hanyi00i
Copy link

hanyi00i commented Mar 8, 2025

@rli9 already update the code in lib/install.rb and comment in lib/install.sh, thanks

@rli9 rli9 merged commit b65ad06 into intel:master Mar 8, 2025
22 of 52 checks passed
@rli9
Copy link

rli9 commented Mar 8, 2025

thanks for the patch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

distro/adaptation: reorganize dirs
3 participants