Allow multiple modes

build.sh

@@ -285,12 +285,12 @@ for (( a = 0; a < $#; a++ )); do
         usage
     else
         check_mode "${args[$a]}"
-        debug "have mode '${mode}'"
+        debug "have modes '${modes[*]}'"
     fi
 done
 
 
-if [[ ${#commands[@]} -eq 0 || ${mode} == "" ]]; then
+if [[ ${#commands[@]} -eq 0 || ${#modes[@]} -eq 0 ]]; then
     echo
     error "A build mode and command must be selected!"
     usage
@@ -307,35 +307,6 @@ fi
 
 msg "$(date) :: ${script_name} started..."
 
-get_conflicts
-get_kernel_update_funcs
-debug_print_default_vars
-
-
-export script_dir mode kernel_name
-source_safe "src/kernels/${kernel_name}.sh"
-
-
-if have_command "cleanup"; then
-    cleanup
-    # exit
-fi
-
-
-if have_command "reset_pkgs"; then
-    msg "Performing git reset for packages/${kernel_name}/*"
-        msg "${update_funcs[@]}"
-    for func in "${update_funcs[@]}"; do
-        debug "Evaluating '${func}'"
-        "${func}"
-        msg "${pkg_list[@]}"
-        for pkg in "${pkg_list[@]}"; do
-            run_cmd "cd '${script_dir}/packages/${kernel_name}/${pkg}' && git reset --hard HEAD"
-        done
-    done
-fi
-
-
 if have_command "update_sums"; then
     # Only the files in the zfs-utils package will be updated
     run_cmd_show_and_capture_output "sha256sum ${script_dir}/src/zfs-utils/zfs-utils.bash-completion-r1"
@@ -359,19 +330,51 @@ if have_command "update_chroot"; then
     run_cmd "ccm64 u"
 fi
 
+for (( i = 0; i < ${#modes[@]}; i++ )); do
+    mode=${modes[i]}
+    kernel_name=${kernel_names[i]}
 
-for func in "${update_funcs[@]}"; do
+    get_conflicts
-    debug "Evaluating '${func}'"
+    get_kernel_update_funcs
-    "${func}"
+    debug_print_default_vars
-    if have_command "update"; then
+
-        msg "Updating PKGBUILDs for kernel '${kernel_name}'"
+    export script_dir mode kernel_name
-        generate_package_files
+    source_safe "src/kernels/${kernel_name}.sh"
-    fi
+
-    if have_command "make"; then
+
-        build_packages
+    if have_command "cleanup"; then
-        build_sources
+        cleanup
+        # exit
     fi
-    if have_command "sources"; then
+
-        build_sources
+
+    if have_command "reset_pkgs"; then
+        msg "Performing git reset for packages/${kernel_name}/*"
+            msg "${update_funcs[@]}"
+        for func in "${update_funcs[@]}"; do
+            debug "Evaluating '${func}'"
+            "${func}"
+            msg "${pkg_list[@]}"
+            for pkg in "${pkg_list[@]}"; do
+                run_cmd "cd '${script_dir}/packages/${kernel_name}/${pkg}' && git reset --hard HEAD"
+            done
+        done
     fi
+
+
+    for func in "${update_funcs[@]}"; do
+        debug "Evaluating '${func}'"
+        "${func}"
+        if have_command "update"; then
+            msg "Updating PKGBUILDs for kernel '${kernel_name}'"
+            generate_package_files
+        fi
+        if have_command "make"; then
+            build_packages
+            build_sources
+        fi
+        if have_command "sources"; then
+            build_sources
+        fi
+    done
 done

lib.sh

@@ -6,9 +6,9 @@ shopt -s nullglob
 dry_run=0
 debug_flag=0
 haz_error=0
-mode=""
+modes=()
 test_mode=""
-kernel_name="" # set by generate_mode_list
+kernel_names=() # set by generate_mode_list
 mode_list=() # set by generate_mode_list
 test_commands_list=() # set by generate_test_commands_list
 update_funcs=() # set by generate_mode_list
@@ -397,6 +397,13 @@ kernel_version_full_no_hyphen() {
 
 # from makepkg
 source_safe() {
+    # reset variables
+    kernel_version_full_pkgver=""
+    kernel_version_full=""
+    kernel_version=""
+    zfs_pkgver=""
+    spl_pkgver=""
+
     export script_dir mode kernel_name
     shopt -u extglob
     if ! source "$@"; then
@@ -554,18 +561,14 @@ check_zol_version() {
 check_mode() {
     # $1 the mode to check for
     debug "check_mode: checking '$1'"
+
     for m in "${mode_list[@]}"; do
         debug "check_mode: on '${m}'"
         local moden=$(echo ${m} | cut -f2 -d:)
         # debug "moden: ${moden}"
         if [[ "${moden}" == "$1" ]]; then
-            if [[ ${mode} != "" ]]; then
+            modes+=("$1")
-                error "Already have mode '${moden}', only one mode can be used at a time!"
+            kernel_names+=("$(echo ${m} | cut -f1 -d:)")
-                usage
-                exit 155
-            fi
-            mode="$1"
-            kernel_name=$(echo ${m} | cut -f1 -d:)
             return
         fi
     done
@@ -687,6 +690,8 @@ generate_test_commands_list() {
 
 
 get_kernel_update_funcs() {
+    update_funcs=()
+
     for kernel in $(ls ${script_dir}/src/kernels); do
         if [[ ${kernel%.*} != ${kernel_name} ]]; then
             continue
@@ -697,6 +702,11 @@ get_kernel_update_funcs() {
 }
 
 get_conflicts() {
+    zfs_headers_conflicts_all=()
+    spl_headers_conflicts_all=()
+    zfs_conflicts_all=()
+    spl_conflicts_all=()
+
     for kernel in $(ls ${script_dir}/src/kernels); do
         # do not conflict with common or dkms packages
         if [[ "$kernel" == "common.sh"  || "$kernel" == "common-git.sh" || "$kernel" == "dkms.sh" ]]; then

push.sh

@@ -76,12 +76,12 @@ for (( a = 0; a < $#; a++ )); do
         usage
     else
         check_mode "${args[$a]}"
-        debug "have mode '${mode}'"
+        debug "have modes '${modes[*]}'"
     fi
 done
 
 
-if [[ ${mode} == "" && ${push_repo} -eq 0 ]]; then
+if [[ ${#modes[@]} -eq 0 && ${push_repo} -eq 0 ]]; then
     echo
     error "A mode must be selected!"
     usage
@@ -128,21 +128,25 @@ push_repo() {
 
 
 push_repo
-if [[ ${mode} == "" ]]; then
+if [[ ${#modes[@]} -eq 0 ]]; then
     exit
 fi
 
 
-get_kernel_update_funcs
+for (( i = 0; i < ${#modes[@]}; i++ )); do
-debug_print_default_vars
+    mode=${modes[i]}
+    kernel_name=${kernel_names[i]}
 
+    get_kernel_update_funcs
+    debug_print_default_vars
 
-export script_dir mode kernel_name
+    export script_dir mode kernel_name
-source_safe "src/kernels/${kernel_name}.sh"
+    source_safe "src/kernels/${kernel_name}.sh"
 
 
-for func in "${update_funcs[@]}"; do
+    for func in "${update_funcs[@]}"; do
-    debug "Evaluating '${func}'"
+        debug "Evaluating '${func}'"
-    "${func}"
+        "${func}"
-    push_packages
+        push_packages
+    done
 done

repo.sh

@@ -82,7 +82,7 @@ for (( a = 0; a < $#; a++ )); do
         usage
     else
         check_mode "${args[$a]}"
-        debug "have mode '${mode}'"
+        debug "have modes '${modes[*]}'"
     fi
 done
 
@@ -92,7 +92,7 @@ if [[ $# -lt 1 ]]; then
 fi
 
 
-if [[ ${mode} == "" ]]; then
+if [[ ${#modes[@]} -eq 0 ]]; then
     echo
     error "A mode must be selected!"
     usage
@@ -349,27 +349,33 @@ else
 fi
 
 
-get_kernel_update_funcs
-debug_print_default_vars
 debug "repo_name: ${repo_name}"
 debug "repo_target: ${repo_target}"
 
+for (( i = 0; i < ${#modes[@]}; i++ )); do
+    mode=${modes[i]}
+    kernel_name=${kernel_names[i]}
 
-source_safe "src/kernels/${kernel_name}.sh"
+    get_kernel_update_funcs
+    debug_print_default_vars
 
+    export script_dir mode kernel_name
+    source_safe "src/kernels/${kernel_name}.sh"
 
-export zfs_pkgver=""
-export spl_pkgver=""
 
-for func in ${update_funcs[@]}; do
+    export zfs_pkgver=""
-    debug "Evaluating '${func}'"
+    export spl_pkgver=""
-    "${func}"
+
-    repo_package_list
+    for func in ${update_funcs[@]}; do
-    if [[ ${repo_name} != "chroot_local" ]]; then
+        debug "Evaluating '${func}'"
-        repo_package_backup
+        "${func}"
-    fi
+        repo_package_list
-    sign_packages
+        if [[ ${repo_name} != "chroot_local" ]]; then
-    repo_add
+            repo_package_backup
+        fi
+        sign_packages
+        repo_add
+    done
 done
 
 if [[ ${haz_error} -ne 0 ]]; then