From 96a8439679d2c679ec198fa97cda10a6a83d6f13 Mon Sep 17 00:00:00 2001 From: Michal Hocko <mhocko@suse.com> Date: Jun 13 2025 08:25:28 +0000 Subject: Merge branch 'users/mhocko/scripts/supported-leap' into users/mhocko/scripts/for-next --- diff --git a/scripts/check-kernel-fix b/scripts/check-kernel-fix index 839c45f..f934910 100755 --- a/scripts/check-kernel-fix +++ b/scripts/check-kernel-fix @@ -380,13 +380,13 @@ check_branch_state() if [[ $? -eq 1 ]] then set_branch_sha_state $branch $sha "unknown_support_disagree" + return # Enable the state only after we are confident this doesn't lead to false # negatives # else # set_branch_sha_state $branch $sha "nope_unsupported" +# return fi - -# return fi local eligible="" diff --git a/scripts/common-functions b/scripts/common-functions index c284eba..5ba6ad0 100644 --- a/scripts/common-functions +++ b/scripts/common-functions @@ -200,6 +200,14 @@ check_config() return 0 } +branch_has_leap() +{ + local branch="$1" + + [[ "$branch" =~ SLE15-SP6.* || "$branch" =~ SL-16.0.* ]] + return $? +} + check_mod_support() { local branch="$1" @@ -208,6 +216,9 @@ check_mod_support() shift 3 local failed=0 local mod_num=0 + local leap_mode="" + + branch_has_leap "$branch" && leap_mode=" Best effort mode for Leap" local files="$(split_join_files "$@")" @@ -216,8 +227,8 @@ check_mod_support() mod_num=$(($mod_num+1)) if git grep -q "^-.*\\<$module\\>" origin/${branch#origin/} -- supported.conf then - echo -e "\tWW $module not supported." >> "$output_file_name" - failed=$(($failed+1)) + echo -e "\tWW $module not supported.$leap_mode" >> "$output_file_name" + [ -z "$leap_mode" ] && failed=$(($failed+1)) fi done < <(sqlite3 -batch -noheader -csv "$CONF_FILE_MAP" \ "SELECT DISTINCT module_dir.dir || '/' || module.module