diff --git a/scripts/check-kernel-fix b/scripts/check-kernel-fix index 0f7d17d..4e57d02 100755 --- a/scripts/check-kernel-fix +++ b/scripts/check-kernel-fix @@ -35,7 +35,6 @@ usage() echo " cve: CVE-XXXX-YYYY of the upstream commit (requires VULNS_GIT_PATH)" echo echo "Options:" - echo " -c: check also CVE branches" echo " -h: help" echo " -q: quiet mode (no progress)" echo " -s: show state of branch where an action would be needed" @@ -305,7 +304,6 @@ find_and_print_toplevel_actions() done } -check_cve= verbose_mode= quiet_mode= show_only_states= @@ -317,9 +315,6 @@ do usage exit ;; - c) - check_cve="-c" - ;; s) show_only_states=1 ;; @@ -362,13 +357,13 @@ fi references="$cve $bsc" # Check state of each branch -for_each_build_branch $check_cve "$branches_conf" check_branch_state $sha $references +for_each_build_branch "$branches_conf" check_branch_state $sha $references # Newline after the dots showing progress [ -z "$quiet_mode" ] && echo if [ -z "$show_only_states" ] ; then -for_each_build_branch $check_cve "$branches_conf" find_and_print_toplevel_actions $cvss +for_each_build_branch "$branches_conf" find_and_print_toplevel_actions $cvss if [ ! -e "$actions_file" ] ; then echo "EVERYTHING IS OK!" diff --git a/scripts/common-functions b/scripts/common-functions index 2db9860..82a3747 100644 --- a/scripts/common-functions +++ b/scripts/common-functions @@ -106,28 +106,12 @@ print_merge_branches() for_each_build_branch() { - - local grep_ignore_cve="|cve" - - while [ -n "$1" -a "o${1%%-*}" == "o" ] ; do - case "$1" in - -c) - # Do not ignore cve branches - grep_ignore_cve= - ;; - *) - fail "for_each_build_branch: Unknown parameter: $1" - ;; - esac - shift - done - local branches_conf="$1" local fn="$2" shift 2 local args="$@" - grep -w build "$branches_conf" | grep -v -E "^(master|vanilla|linux-next$grep_ignore_cve)" | \ + grep -w build "$branches_conf" | grep -v -E "^(master|vanilla|linux-next)" | \ while read line ; do line=${line%%\#*} branch=${line%%:*}