[LTP] [PATCH 0/2] Move kirk sources from tools/kirk to tools/kirk/kirk-src

[Petr Vorel]

Hi Andrea,

it's not easy to merge the patch.

$ git am first.patch

Applying: kirk: remove submodule before moving it
warning: unable to rmdir 'tools/kirk': Directory not empty
Applying: kirk: move kirk source code inside tools/kirk/kirk-src
error: tools/kirk/Makefile: already exists in working directory
Patch failed at 0002 kirk: move kirk source code inside tools/kirk/kirk-src


After applying both patches removing whole tools it still does not work:

$ rm -rf tools/; git reset --hard; git submodule update --init
HEAD is now at 9b056c36d3 kirk: move kirk source code inside tools/kirk/kirk-src
error: submodule git dir 'ltp.git/modules/tools/kirk/kirk-src' is inside git dir 'ltp.git/modules/tools/kirk'
fatal: refusing to create/use 'ltp.git/modules/tools/kirk/kirk-src' in another submodule's git dir
Failed to clone 'tools/kirk/kirk-src'. Retry scheduled
error: submodule git dir 'ltp.git/modules/tools/kirk/kirk-src' is inside git dir 'ltp.git/modules/tools/kirk'
fatal: refusing to create/use 'ltp.git/modules/tools/kirk/kirk-src' in another submodule's git dir
Failed to clone 'tools/kirk/kirk-src' a second time, aborting

I'm ok to remove it, but IMHO after you merge people which has used kirk
previously will have to start with a fresh clone.

Also the reason for the move is in the cover letter only. Although it'd be nice
to have the reason in the git commit message I'm ok with it.

Acked-by: Petr Vorel <pvorel@suse.cz>

Kind regards,
Petr