From mboxrd@z Thu Jan 1 00:00:00 1970 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 B707A1ADDD for ; Thu, 17 Aug 2023 22:00:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6168C433C7; Thu, 17 Aug 2023 22:00:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692309628; bh=C8R1ymipNs3XEl0YKTUyVo/M2wx+OlQUe5QHxkr5/XQ=; h=From:Date:Subject:To:Cc:From; b=OXlsr62Rk4LIMl6W0FHAnvVvYIkkVagLOV9Kn+QSFtG+OpbRVqQft4YM7AcMhP+vP LksXAQSk5i4ZKiYPiLM6YPrpKMwhAJ0z+OH7Fqb06lTXGBsE3mwPHRX0Fw6pj4J0tg m4ifeQpLBfvi+BkmNu3kFA0ODLudGBuzfCC0YbA5ML6rsveKWmYU6p0tzKaVYV5Qe+ n/UBLvXEDe5ijxwfY1uIYmQMG9d6bWhjSlwxRHshZ9K2FVz3SfDouB/tkhO5WAPXK2 jgb6j1DQ2CLRnPF4dEYQwaMXdevA57mIPD2iQZz74CkfdD1bKC+yMjnX3E1AqdPk/e H5Mis3PQZDLxA== From: Jeff Layton Date: Thu, 17 Aug 2023 18:00:21 -0400 Subject: [PATCH RFC] bootlinux: add support for "config-kdevops" Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230817-config-kdevops-v1-1-ddcd6c7b89dd@kernel.org> X-B4-Tracking: v=1; b=H4sIAHSY3mQC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDI2MDC0Nz3eT8vLTMdN3slNSy/IJi3eQUcxOjlFQzE8O0FCWgpoKi1LTMCrC B0UpBbs5KsbW1APNXGaJlAAAA To: Luis Chamberlain Cc: kdevops@lists.linux.dev, Jeff Layton X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2247; i=jlayton@kernel.org; h=from:subject:message-id; bh=C8R1ymipNs3XEl0YKTUyVo/M2wx+OlQUe5QHxkr5/XQ=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBk3ph7ynpOlW2LkvgPqdtrrPVLQKQAcITDNCmTl LBUNu9LWKqJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZN6YewAKCRAADmhBGVaC FbjYEADXA+cI4o/4LSwb1XckjcOQIXYGBHrbytZi2i4KJJjtTuAcyZg9NW4XLHqusMAKT+xc2EL 44sGKfj9CtbLqp1OidSb6f7upgDvmrW8TzDRYv0CqCWjLQsMs3XkkrHdOkcitYSdX3aELqIkrLI RjkozP0sbwoe/5p4148ZqSqEvLcNIpjLoyE+uagnhqbYq/zdqVgulAYF5GbqEli4MBsOd/o7nKZ dszoaB5J+ADRWYE5FVP/rqOEdA7P3khUL0o9XkvjYkpKN+VENdCRCMBcUa4Iyw21kjeCS6LXrXr OJ06/EY6o0rcu8AvAiUA8UoKQkcNLgwVfCLJaBd3HFX0HUoAOgyfjp3pRbVQlcQHZ/PYAf9Sj4f K4U9gxo/mtE+88Lr7ImV5RifQXf+1w90Yxeg3jay1zy2rAEFnjY7fdO9b0YLzz6tHHokFQlSjnB /lPeiDJR+4lPS8nSGuNq8IW4p/1RJphLrqU34Qunu9GlORcFvNWg9LaqtvOn2ih9tymN7J3fusr RGtK5v8DKdjoTESBHeS+ZKzSt/5z/do0QeafS+Vw8WQ9oxKH6b/TzrP1EyK5SDb8SYJET8rUw5u HXWOjSq5TeZFm6B8APPhEBjXe4SRbDXmZ4qNtIyi93Yy1ps8yBHroRVYwfk/eVUNUrCS/uP5HeP M2PcPiL48wVuhhA== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Currently, you're expected to have a kernel config file with a name like "config-{{ target_linux_config }}". If there isn't one, then the play aborts. For my use-case, I just want to have a stock config that I periodically update and use regardless of the branch name. If there is a file called config-kdevops in the template directory, use that instead of any version-specific branch. Signed-off-by: Jeff Layton --- Another alterative would be to allow config-branchname to take precedence, and make this one the fallback when one isn't present. --- playbooks/roles/bootlinux/tasks/main.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/bootlinux/tasks/main.yml b/playbooks/roles/bootlinux/tasks/main.yml index e90ba60e1edb..488ff7738078 100644 --- a/playbooks/roles/bootlinux/tasks/main.yml +++ b/playbooks/roles/bootlinux/tasks/main.yml @@ -265,9 +265,25 @@ run_once: true delegate_to: localhost +- name: Check whether config-kdevops exists + stat: + path: "{{ role_path }}/templates/config-kdevops" + register: config_kdevops + delegate_to: localhost + +- name: Found config-kdevops, using it for template + set_fact: + linux_config: "config-kdevops" + when: config_kdevops.stat.exists + +- name: No config-kdevops, looking for {{ target_linux_config }} + set_fact: + linux_config: "{{ target_linux_config }}" + when: not config_kdevops.stat.exists + - name: Copy configuration for Linux {{ target_linux_tree }} on the client side template: - src: "{{ target_linux_config }}" + src: "{{ linux_config }}" dest: "{{ target_linux_dir_path }}/.config" owner: "{{ data_user }}" group: "{{ data_group }}" @@ -278,7 +294,7 @@ - name: Copy configuration for Linux {{ target_linux_tree }} on the host side template: - src: "{{ target_linux_config }}" + src: "{{ linux_config }}" dest: "{{ bootlinux_9p_host_path }}/.config" mode: 0644 tags: [ 'linux', 'git', 'config' ] --- base-commit: 999512fbd14e577be47aafa8703c367bb0089cdc change-id: 20230817-config-kdevops-cd742de641fd Best regards, -- Jeff Layton