diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-20 15:47:34 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-20 15:47:34 +0200 |
commit | e7f67bfda8b9f7d72ccb37086a7686f625f7db9c (patch) | |
tree | 210ae97882f5edadb3b71ea3473ea3cb4a0455cb /process_configs.sh | |
parent | 95325f68cbc232e30137829afdbe69770f410ec2 (diff) | |
parent | b4aa7140f3d9ab3f0910055d3f8f805ae1326906 (diff) | |
download | kernel-e7f67bfda8b9f7d72ccb37086a7686f625f7db9c.tar.gz kernel-e7f67bfda8b9f7d72ccb37086a7686f625f7db9c.tar.xz kernel-e7f67bfda8b9f7d72ccb37086a7686f625f7db9c.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.18.0-0.rc3.20220420git559089e0a93d442.29.vanilla.1.fc36
Diffstat (limited to 'process_configs.sh')
-rwxr-xr-x | process_configs.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/process_configs.sh b/process_configs.sh index 91e6d1226..e6bce0fe6 100755 --- a/process_configs.sh +++ b/process_configs.sh @@ -191,7 +191,7 @@ function commit_new_configs() # assume we are in $source_tree/configs, need to get to top level pushd "$(switch_to_toplevel)" &>/dev/null - for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config + for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config do arch=$(head -1 "$cfg" | cut -b 3-) cfgtmp="${cfg}.tmp" @@ -303,7 +303,7 @@ function process_configs() [ -f .mismatches ] && rm -f .mismatches count=0 - for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config + for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config do if [ "$count" -eq 0 ]; then # do the first one by itself so that tools are built @@ -385,12 +385,9 @@ do shift done -PACKAGE_NAME="${1:-kernel}" # defines the package name used -KVERREL="$(test -n "$2" && echo "-$2" || echo "")" -SUBARCH="$(test -n "$3" && echo "-$3" || echo "")" -FLAVOR="$(test -n "$4" && echo "-$4" || echo "-ark")" +KVERREL="$(test -n "$1" && echo "-$1" || echo "")" +FLAVOR="$(test -n "$2" && echo "-$2" || echo "-ark")" # shellcheck disable=SC2015 -RHJOBS="$(test -n "$5" && echo "$5" || nproc --all)" SCRIPT=$(readlink -f "$0") SCRIPT_DIR=$(dirname "$SCRIPT") |