From patchwork Fri Mar 28 20:56:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Gomez X-Patchwork-Id: 14032438 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC00F3C0C for ; Fri, 28 Mar 2025 20:56:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743195395; cv=none; b=McA481EbQ/7EJe2t1hokTk8Va9+w15GVkqDBmFwMKgI7nlFIy6nCQglS1vrMkWH5LimpnDTF4BpS+XwI37fPpwTqdqMzEhZdnQ/1xMgafeF5OaPtCZkeOkQ4gQLKrF1b58IeZmLYPE3SJtTSgJwcFAMPrmoGlyP+jqvRYXWgym0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743195395; c=relaxed/simple; bh=pKj/hXGsEobjrM4yl7h4q3QXysnVBU5D82XXBZRVR6s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fHgZ9fUK7WnuDXIXqwjUc309PEq3aEuxggRHix4H08ldsMk8YiOtN/abb3k3vQzqLi+nGUvYVKUDeu885+5dXGp/BVcGDNm9MRJONy3HuE1sRKYSJLxQTkLGYOK5mQsihW+cm8QZuZzZKg9Eqhdp6pwwUWnOjmAkgfzGI83xGKs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Hculuiry; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Hculuiry" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5AA6C4CEE9; Fri, 28 Mar 2025 20:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743195395; bh=pKj/hXGsEobjrM4yl7h4q3QXysnVBU5D82XXBZRVR6s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=HculuiryjHzo8XSN+OMbSB3pf7jq7xmn6dq7WObuadLJEdInFViflYkGaM+H69Nkh FD+u0MMW5MzOlW2pA9PVGK5pqezB8q9oVJ2hWEE0FiF7BhtnBS4DpeRlIRyDqtuPd4 K7AelvjcdPms80KrAUwd8hdNMg7cZzQRf9SFhDqA7J0oLPUlm6uFhxrBNNe3OaLePR DdIfpOdzDorhUHzq+S6KUQZ+DbR7fOcr3NqitbVfBYx6TVqAfhz6HXEs72/kLGvwCe mMp/5RATWlCXhJ81cU4fwB/6hzUyd/Pjr3Xe2t742AoceCLfahhtcaesc24GJMdJfh gLuLxn8JFxDqw== From: Daniel Gomez Date: Fri, 28 Mar 2025 20:56:17 +0000 Subject: [PATCH RFC 4/6] kconfig-env: generate kconfig environment Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250328-kconfig-env-with-ansible-v1-4-3231c0272457@samsung.com> References: <20250328-kconfig-env-with-ansible-v1-0-3231c0272457@samsung.com> In-Reply-To: <20250328-kconfig-env-with-ansible-v1-0-3231c0272457@samsung.com> To: Luis Chamberlain Cc: kdevops@lists.linux.dev, Daniel Gomez , Daniel Gomez X-Mailer: b4 0.14.2 From: Daniel Gomez When menuconfig target is run, generate first the kconfig environment and merge with current .config. Signed-off-by: Daniel Gomez --- Makefile | 1 + scripts/kconfig-env.Makefile | 14 ++++++++++++++ scripts/kconfig/kconfig.Makefile | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5ee7db7d988b9271fed7cb470f807bb9e9ce3cb6..1f939c52284f218a23430a7c5350d7827cb1b905 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,7 @@ export KDEVOPS_VAGRANT := export PYTHONUNBUFFERED=1 export TOPDIR=./ export TOPDIR_PATH = $(shell readlink -f $(TOPDIR)) +include scripts/kconfig-env.Makefile include scripts/refs.Makefile KDEVOPS_NODES_ROLE_TEMPLATE_DIR := $(KDEVOPS_PLAYBOOKS_DIR)/roles/gen_nodes/templates diff --git a/scripts/kconfig-env.Makefile b/scripts/kconfig-env.Makefile new file mode 100644 index 0000000000000000000000000000000000000000..dc2b9f2a65001ba8698a61bfb20b43b366e3d92a --- /dev/null +++ b/scripts/kconfig-env.Makefile @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: copyleft-next-0.3.1 + +PHONY += kconfig-env +kconfig-env: + $(Q)ANSIBLE_STDOUT_CALLBACK=null ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ + --inventory localhost, \ + playbooks/kconfig.yml \ + -e 'ansible_python_interpreter=/usr/bin/python3' \ + --extra-vars "topdir_path=$(TOPDIR_PATH)" + $(Q)$(TOPDIR_PATH)/scripts/kconfig/merge_config.sh -m .config \ + $(TOPDIR_PATH)/.env.config + $(Q)$(MAKE) -C $(TOPDIR_PATH) olddefconfig + +.PHONY = $(PHONY) diff --git a/scripts/kconfig/kconfig.Makefile b/scripts/kconfig/kconfig.Makefile index cc24c7ff3e1c23487aec767075c69fdf3876b39d..19ed56b01db5817dc1e8b7a4db6fa726d87d8065 100644 --- a/scripts/kconfig/kconfig.Makefile +++ b/scripts/kconfig/kconfig.Makefile @@ -36,8 +36,8 @@ $(KCONFIG_DIR)/mconf: $(MAKE) -C $(KCONFIG_DIR)/ mconf PHONY += menuconfig -menuconfig: $(KCONFIG_DIR)/mconf include/config/project.release Kconfig - @$< Kconfig +menuconfig: $(KCONFIG_DIR)/mconf include/config/project.release Kconfig kconfig-env + $< Kconfig $(KCONFIG_DIR)/nconf: $(MAKE) -C $(KCONFIG_DIR)/ nconf