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

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

[Andrea Cervesato]

This is the current standard for LTP and it permits to remove Makefile
from the kirk mainline, that is strictly related to LTP install.

Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
Andrea Cervesato (2):
      kirk: remove submodule before moving it
      kirk: move kirk source code inside tools/kirk/kirk-src

 .gitmodules                   |  6 +++---
 tools/kirk/Makefile           | 22 ++++++++++++++++++++++
 tools/{kirk => kirk/kirk-src} |  0
 3 files changed, 25 insertions(+), 3 deletions(-)
---
base-commit: 64de9f928970dacfc3ea2acefc407dbc25e539cf
change-id: 20251031-kirk_move_submodule-515942b5dde9

Best regards,
-- 
Andrea Cervesato <andrea.cervesato@suse.com>


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

[LTP] [PATCH 1/2] kirk: remove submodule before moving it

[Andrea Cervesato]

From: Andrea Cervesato <andrea.cervesato@suse.com>

Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
 .gitmodules | 3 ---
 tools/kirk  | 1 -
 2 files changed, 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index c9a6eea31..8f081decc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "tools/sparse/sparse-src"]
 	path = tools/sparse/sparse-src
 	url = git://git.kernel.org/pub/scm/devel/sparse/sparse.git
-[submodule "tools/kirk"]
-	path = tools/kirk
-	url = https://github.com/linux-test-project/kirk.git
 [submodule "tools/ltx/ltx-src"]
 	path = tools/ltx/ltx-src
 	url = https://github.com/linux-test-project/ltx.git
diff --git a/tools/kirk b/tools/kirk
deleted file mode 160000
index e0ef9f28b..000000000
--- a/tools/kirk
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e0ef9f28bcf15d00cf8a03915df894bb38a5d8ea

-- 
2.51.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

[LTP] [PATCH 2/2] kirk: move kirk source code inside tools/kirk/kirk-src

[Andrea Cervesato]

From: Andrea Cervesato <andrea.cervesato@suse.com>

Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
 .gitmodules         |  3 +++
 tools/kirk/Makefile | 22 ++++++++++++++++++++++
 tools/kirk/kirk-src |  1 +
 3 files changed, 26 insertions(+)

diff --git a/.gitmodules b/.gitmodules
index 8f081decc..a1ac4b1b8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "tools/ltx/ltx-src"]
 	path = tools/ltx/ltx-src
 	url = https://github.com/linux-test-project/ltx.git
+[submodule "tools/kirk/kirk-src"]
+	path = tools/kirk/kirk-src
+	url = https://github.com/linux-test-project/kirk.git
diff --git a/tools/kirk/Makefile b/tools/kirk/Makefile
new file mode 100644
index 000000000..1a09c43ce
--- /dev/null
+++ b/tools/kirk/Makefile
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) 2023 SUSE LLC <andrea.cervesato@suse.com>
+#
+# Install script for Linux Testing Project
+
+top_srcdir		?= ../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+BASE_DIR		:= $(abspath $(DESTDIR)/$(prefix))
+
+install:
+	mkdir -p $(BASE_DIR)/libkirk
+	mkdir -p $(BASE_DIR)/libkirk/channels
+
+	install -m 00644 $(top_srcdir)/tools/kirk/kirk-src/libkirk/*.py $(BASE_DIR)/libkirk
+	install -m 00644 $(top_srcdir)/tools/kirk/kirk-src/libkirk/channels/*.py $(BASE_DIR)/libkirk/channels
+	install -m 00775 $(top_srcdir)/tools/kirk/kirk-src/kirk $(BASE_DIR)/kirk
+
+	cd $(BASE_DIR) && ln -sf kirk runltp-ng
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/tools/kirk/kirk-src b/tools/kirk/kirk-src
new file mode 160000
index 000000000..e0ef9f28b
--- /dev/null
+++ b/tools/kirk/kirk-src
@@ -0,0 +1 @@
+Subproject commit e0ef9f28bcf15d00cf8a03915df894bb38a5d8ea

-- 
2.51.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

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

[Cyril Hrubis]

Hi!
Acked-by: Cyril Hrubis <chrubis@suse.cz>

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [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

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp