From: Luis Chamberlain <mcgrof@kernel.org>
To: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org
Cc: patches@lists.linux.dev, amir73il@gmail.com, pankydev8@gmail.com,
tytso@mit.edu, josef@toxicpanda.com, jmeneghi@redhat.com,
jake@lwn.net, mcgrof@kernel.org
Subject: [PATCH 2/4] kdevops: move generic kdevops variables to its own file
Date: Fri, 13 May 2022 12:38:29 -0700 [thread overview]
Message-ID: <20220513193831.4136212-3-mcgrof@kernel.org> (raw)
In-Reply-To: <20220513193831.4136212-1-mcgrof@kernel.org>
There are shared kdevops variables between different workflows,
which *can* be used by any workflow. Move these into a generic
kdevops helper Makefile, as we can later expand on this.
This makes no functional changes.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
workflows/Makefile | 33 +--------------------------------
workflows/common/Makefile | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 32 deletions(-)
create mode 100644 workflows/common/Makefile
diff --git a/workflows/Makefile b/workflows/Makefile
index 928e42f..033ffc7 100644
--- a/workflows/Makefile
+++ b/workflows/Makefile
@@ -1,37 +1,6 @@
# SPDX-License-Identifier: copyleft-next-0.3.1
-# How we create the partition for the workflow data partition
-WORKFLOW_DATA_DEVICE:=$(subst ",,$(CONFIG_WORKFLOW_DATA_DEVICE))
-WORKFLOW_DATA_PATH:=$(subst ",,$(CONFIG_WORKFLOW_DATA_PATH))
-WORKFLOW_DATA_FSTYPE:=$(subst ",,$(CONFIG_WORKFLOW_DATA_FSTYPE))
-WORKFLOW_DATA_LABEL:=$(subst ",,$(CONFIG_WORKFLOW_DATA_LABEL))
-
-WORKFLOW_KDEVOPS_GIT:=$(subst ",,$(CONFIG_WORKFLOW_KDEVOPS_GIT))
-WORKFLOW_KDEVOPS_GIT_DATA:=$(subst ",,$(CONFIG_WORKFLOW_KDEVOPS_GIT_DATA))
-WORKFLOW_KDEVOPS_DIR:=$(subst ",,$(CONFIG_WORKFLOW_KDEVOPS_DIR))
-
-WORKFLOW_ARGS += data_device=$(WORKFLOW_DATA_DEVICE)
-WORKFLOW_ARGS += data_path=$(WORKFLOW_DATA_PATH)
-WORKFLOW_ARGS += data_fstype=$(WORKFLOW_DATA_FSTYPE)
-WORKFLOW_ARGS += data_label=$(WORKFLOW_DATA_LABEL)
-WORKFLOW_ARGS += kdevops_git=$(WORKFLOW_KDEVOPS_GIT)
-WORKFLOW_ARGS += kdevops_data=\"$(WORKFLOW_KDEVOPS_GIT_DATA)\"
-WORKFLOW_ARGS += kdevops_dir=\"$(WORKFLOW_KDEVOPS_DIR)\"
-
-ifeq (y,$(CONFIG_WORKFLOW_MAKE_CMD_OVERRIDE))
-WORKFLOW_MAKE_CMD:=$(subst ",,$(CONFIG_WORKFLOW_MAKE_CMD))
-endif
-
-ifeq (y,$(CONFIG_WORKFLOW_INFER_USER_AND_GROUP))
-WORKFLOW_ARGS += infer_uid_and_group=True
-else
-WORKFLOW_DATA_USER:=$(subst ",,$(CONFIG_WORKFLOW_DATA_USER))
-WORKFLOW_DATA_GROUP:=$(subst ",,$(CONFIG_WORKFLOW_DATA_GROUP))
-
-WORKFLOW_ARGS += data_user=$(WORKFLOW_DATA_USER)
-WORKFLOW_ARGS += data_group=$(WORKFLOW_DATA_GROUP)
-
-endif # CONFIG_WORKFLOW_MAKE_CMD_OVERRIDE == y
+include workflows/common/Makefile
BOOTLINUX_ARGS :=
ifeq (y,$(CONFIG_BOOTLINUX))
diff --git a/workflows/common/Makefile b/workflows/common/Makefile
new file mode 100644
index 0000000..da21d78
--- /dev/null
+++ b/workflows/common/Makefile
@@ -0,0 +1,34 @@
+# SPDX-License-Identifier: copyleft-next-0.3.1
+
+# How we create the partition for the workflow data partition
+WORKFLOW_DATA_DEVICE:=$(subst ",,$(CONFIG_WORKFLOW_DATA_DEVICE))
+WORKFLOW_DATA_PATH:=$(subst ",,$(CONFIG_WORKFLOW_DATA_PATH))
+WORKFLOW_DATA_FSTYPE:=$(subst ",,$(CONFIG_WORKFLOW_DATA_FSTYPE))
+WORKFLOW_DATA_LABEL:=$(subst ",,$(CONFIG_WORKFLOW_DATA_LABEL))
+
+WORKFLOW_KDEVOPS_GIT:=$(subst ",,$(CONFIG_WORKFLOW_KDEVOPS_GIT))
+WORKFLOW_KDEVOPS_GIT_DATA:=$(subst ",,$(CONFIG_WORKFLOW_KDEVOPS_GIT_DATA))
+WORKFLOW_KDEVOPS_DIR:=$(subst ",,$(CONFIG_WORKFLOW_KDEVOPS_DIR))
+
+WORKFLOW_ARGS += data_device=$(WORKFLOW_DATA_DEVICE)
+WORKFLOW_ARGS += data_path=$(WORKFLOW_DATA_PATH)
+WORKFLOW_ARGS += data_fstype=$(WORKFLOW_DATA_FSTYPE)
+WORKFLOW_ARGS += data_label=$(WORKFLOW_DATA_LABEL)
+WORKFLOW_ARGS += kdevops_git=$(WORKFLOW_KDEVOPS_GIT)
+WORKFLOW_ARGS += kdevops_data=\"$(WORKFLOW_KDEVOPS_GIT_DATA)\"
+WORKFLOW_ARGS += kdevops_dir=\"$(WORKFLOW_KDEVOPS_DIR)\"
+
+ifeq (y,$(CONFIG_WORKFLOW_MAKE_CMD_OVERRIDE))
+WORKFLOW_MAKE_CMD:=$(subst ",,$(CONFIG_WORKFLOW_MAKE_CMD))
+endif
+
+ifeq (y,$(CONFIG_WORKFLOW_INFER_USER_AND_GROUP))
+WORKFLOW_ARGS += infer_uid_and_group=True
+else
+WORKFLOW_DATA_USER:=$(subst ",,$(CONFIG_WORKFLOW_DATA_USER))
+WORKFLOW_DATA_GROUP:=$(subst ",,$(CONFIG_WORKFLOW_DATA_GROUP))
+
+WORKFLOW_ARGS += data_user=$(WORKFLOW_DATA_USER)
+WORKFLOW_ARGS += data_group=$(WORKFLOW_DATA_GROUP)
+
+endif # CONFIG_WORKFLOW_INFER_USER_AND_GROUP == y
--
2.35.1
next prev parent reply other threads:[~2022-05-13 19:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-13 19:38 [PATCH 0/4] kdevops: use linux-kdevops for the main tree Luis Chamberlain
2022-05-13 19:38 ` [PATCH 1/4] workflows/Kconfig: be consistent when enabling fstests or blktests Luis Chamberlain
2022-05-14 2:21 ` Bart Van Assche
2022-05-15 15:10 ` Luis Chamberlain
2022-05-13 19:38 ` Luis Chamberlain [this message]
2022-05-13 19:38 ` [PATCH 3/4] playbooks: add a common playbook a git reset task for kdevops Luis Chamberlain
2022-05-20 14:44 ` Pankaj Raghav
2022-05-23 17:38 ` Luis Chamberlain
2022-05-13 19:38 ` [PATCH 4/4] kdevops: make linux-kdevops the default tree Luis Chamberlain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220513193831.4136212-3-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=amir73il@gmail.com \
--cc=jake@lwn.net \
--cc=jmeneghi@redhat.com \
--cc=josef@toxicpanda.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=pankydev8@gmail.com \
--cc=patches@lists.linux.dev \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).