I had a local v5.1 build hang for the second (or third) time because I once again forgot to cherry-pick Jeremy's fixup of configs/process_configs.sh from commit ece644100170 ("Linux v5.0-6399-gf90d64483ebd"). I'm positive Jeremy noticed the need for that fixup because a build appeared to hang.
Make sure this doesn't happen again by correctly terminating that loop and then die. (Because, obviously, dying is better than hanging!)
Paul Bolle (2): configs: properly indent process_configs.sh configs: correctly terminate loop
configs/process_configs.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Signed-off-by: Paul Bolle pebolle@tiscali.nl --- configs/process_configs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configs/process_configs.sh b/configs/process_configs.sh index c90b4e171755..a2ec3acb0423 100755 --- a/configs/process_configs.sh +++ b/configs/process_configs.sh @@ -16,9 +16,9 @@ switch_to_toplevel() path="$(pwd)" while test -n "$path" do - test -e $path/MAINTAINERS && \ - test -d $path/drivers && \ - break + test -e $path/MAINTAINERS && \ + test -d $path/drivers && \ + break
path="$(dirname $path)" done
The switch_to_toplevel() function in process_configs.sh contains a buggy loop. It tests whether $path is empty but should test whether $path equals "/". (It repeatedly calls dirname on pwd's output, and since pwd will return an absolute path this will, eventually, return "/" forever.) So let's test for "/" here.
Signed-off-by: Paul Bolle pebolle@tiscali.nl --- configs/process_configs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configs/process_configs.sh b/configs/process_configs.sh index a2ec3acb0423..846fe2e7095b 100755 --- a/configs/process_configs.sh +++ b/configs/process_configs.sh @@ -14,7 +14,7 @@ die() switch_to_toplevel() { path="$(pwd)" - while test -n "$path" + while test "$path" != "/" do test -e $path/MAINTAINERS && \ test -d $path/drivers && \ @@ -23,7 +23,7 @@ switch_to_toplevel() path="$(dirname $path)" done
- test -n "$path" || die "Can't find toplevel" + test "$path" != "/" || die "Can't find toplevel" echo "$path" }
On Mon, May 06, 2019 at 11:01:02AM +0200, Paul Bolle wrote:
I had a local v5.1 build hang for the second (or third) time because I once again forgot to cherry-pick Jeremy's fixup of configs/process_configs.sh from commit ece644100170 ("Linux v5.0-6399-gf90d64483ebd"). I'm positive Jeremy noticed the need for that fixup because a build appeared to hang.
Make sure this doesn't happen again by correctly terminating that loop and then die. (Because, obviously, dying is better than hanging!)
Paul Bolle (2): configs: properly indent process_configs.sh configs: correctly terminate loop
configs/process_configs.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
-- 2.21.0
Applied both patches, thank you!
- Jeremy
kernel@lists.fedoraproject.org