kpv/kps: Does not map .git submodule repo properly for git operations to be performed

[aradhya07]

I ran the kpv script from a linux repo which is a git submodule to another repo, but it seems that kpv is not able to get the parameters properly!

set -x is enabled in the script for a detailed debug log below.

a0496377@uda0496377:~/workspace/ks3-integrated-repo/ks3-linux-integrated/linux$ ~/workspace/tools/kernel_patch_verify/kpv -V -C -n 5
+ IMG_NAME=ghcr.io/nmenon/arm-kernel-dev
++ which docker
+ docker=/usr/bin/docker
+ '[' -z /usr/bin/docker ']'
+ '[' ghcr.io/nmenon/arm-kernel-dev = ghcr.io/nmenon/arm-kernel-dev ']'
+ docker pull ghcr.io/nmenon/arm-kernel-dev
Using default tag: latest
latest: Pulling from nmenon/arm-kernel-dev
Digest: sha256:6754ca8b37dfcd4ad19050a5f1558d2d6a9ebc514454724dd4ca2b78bf61815f
Status: Image is up to date for ghcr.io/nmenon/arm-kernel-dev:latest
ghcr.io/nmenon/arm-kernel-dev:latest
++ which ccache
+ ccache=/usr/bin/ccache
+ '[' -z ccache ']'
++ ccache -s
++ grep 'cache directory'
++ sed -e 's/\s\s*/ /g'
++ cut -d ' ' -f3
+ CCACHEDIR=/home/a0496377/.ccache
++ git config --get user.name
+ GN='Aradhya Bhatia'
++ git config --get user.email
+ GE=a-bhatia1@ti.com
+ '[' -z a-bhatia1@ti.com -o -z 'Aradhya Bhatia' ']'
+ TMP_PREFIX=kernel_patch_verify_kpv
++ mktemp -t kernel_patch_verify_kpv.gitconfig.XXXXXX
+ TMP_GITCONFIG=/tmp/kernel_patch_verify_kpv.gitconfig.diNqKT
+ echo '[user]'
+ git config --list
+ grep '^user'
+ cut -d . -f2-
+ echo '[core]'
+ git config --list
+ grep '^core'
+ cut -d . -f2-
++ mktemp -t kernel_patch_verify_kpv.passwd.XXXXXX
+ TMP_PASSWD=/tmp/kernel_patch_verify_kpv.passwd.mDAUsp
++ mktemp -t kernel_patch_verify_kpv.grp.XXXXXX
+ TMP_GRP=/tmp/kernel_patch_verify_kpv.grp.VPn6Iq
++ id -u
+ USER_ID=1000
++ id -g
+ GROUP_ID=1000
++ id -gn
+ getent group a0496377
++ id -un
+ getent passwd a0496377
+ DOCKER_MOUNT_DIRS='-v /tmp/kernel_patch_verify_kpv.gitconfig.diNqKT:/home/a0496377/.gitconfig '
+ DOCKER_MOUNT_DIRS+='-v /tmp/kernel_patch_verify_kpv.passwd.mDAUsp:/etc/passwd:ro '
+ DOCKER_MOUNT_DIRS+='-v /tmp/kernel_patch_verify_kpv.grp.VPn6Iq:/etc/group:ro '
+ DOCKER_MOUNT_DIRS+='-v /tmp:/tmp '
+ DOCKER_MOUNT_DIRS+='-v /opt:/opt '
+ DOCKER_MOUNT_DIRS+='-v /home/a0496377/.ccache:/ccache '
++ pwd
+ DOCKER_MOUNT_DIRS+='-v /home/a0496377/workspace/ks3-integrated-repo/ks3-linux-integrated/linux:/workdir '
++ git rev-parse --git-common-dir
+ GIT_WORKTREE_COMMONDIR=/home/a0496377/workspace/ks3-integrated-repo/ks3-linux-integrated/.git/modules/linux
+ [[ /home/a0496377/workspace/ks3-integrated-repo/ks3-linux-integrated/.git/modules/linux != \.\g\i\t ]]
+ DOCKER_MOUNT_DIRS+=' -v	/home/a0496377/workspace/ks3-integrated-repo/ks3-linux-integrated/.git/modules/linux:/home/a0496377/workspace/ks3-integrated-repo/ks3-linux-integrated/.git/modules/linux '
+ export PATH=/workdir/scripts/dtc/:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/opt/cross-gcc-linux-10/bin/:/opt/cross-gcc-linux-9/bin/
+ PATH=/workdir/scripts/dtc/:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/opt/cross-gcc-linux-10/bin/:/opt/cross-gcc-linux-9/bin/
+ docker run --rm -ti --user 1000:1000 -e PATH -v /tmp/kernel_patch_verify_kpv.gitconfig.diNqKT:/home/a0496377/.gitconfig -v /tmp/kernel_patch_verify_kpv.passwd.mDAUsp:/etc/passwd:ro -v /tmp/kernel_patch_verify_kpv.grp.VPn6Iq:/etc/group:ro -v /tmp:/tmp -v /opt:/opt -v /home/a0496377/.ccache:/ccache -v /home/a0496377/workspace/ks3-integrated-repo/ks3-linux-integrated/linux:/workdir -v /home/a0496377/workspace/ks3-integrated-repo/ks3-linux-integrated/.git/modules/linux:/home/a0496377/workspace/ks3-integrated-repo/ks3-linux-integrated/.git/modules/linux ghcr.io/nmenon/arm-kernel-dev kernel_patch_verify -V -C -n 5
fatal: not a git repository: /workdir/../.git/modules/linux
fatal: not a git repository: /workdir/../.git/modules/linux
We need to know who you are to proceed, please check 'git config -l' and fix via:
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
+ rm -f /tmp/kernel_patch_verify_kpv.gitconfig.diNqKT /tmp/kernel_patch_verify_kpv.grp.VPn6Iq /tmp/kernel_patch_verify_kpv.passwd.mDAUsp
a0496377@uda0496377:~/workspace/ks3-integrated-repo/ks3-linux-integrated/linux$

[nmenon]

i was able to reproduce the bug -> but after spending some time attempting to fixing, it did'nt seem straight forward when i think of combinations of work-tree and submodules and recursive submodules.

[nmenon]

Updated $subject.

git rev-parse --git-common-dir is the key -> gitdir in .git file gets decoded as proper path, but there are cross references and path depth issues involved - so it might look like keep it simple by using /workdir as an approach might be hard to do.

Anyone looking at this issue - please see if there is a fix possible.

[StaticRocket]

To properly catch everything the following command must be run and cd to until no output is received to recurse back to the root of the project:

git rev-parse --show-superproject-working-tree

Then we can use the following to get the root project's true path:

git rev-parse --git-common-dir

Then:

1. That root projects true path will need to be mounted through to the container as is.
2. The path mounted to /workdir will need to be changed to the root of the project so submodule relative gitdir paths work
3. The command executed prior to kernel_patch_verify will need to be cd /workdir/<relative-path-to-submodule-from-project-root>

[StaticRocket]

@aradhya07 , give that patch a shot. I've got another amalgamation that uses the recursive method I described above but it looks very gross.