From: Daniel Gomez <da.gomez@kernel.org>
To: Luis Chamberlain <mcgrof@kernel.org>,
Chuck Lever <chuck.lever@oracle.com>
Cc: kdevops@lists.linux.dev, Daniel Gomez <da.gomez@kernel.org>,
Daniel Gomez <da.gomez@samsung.com>
Subject: [PATCH 2/8] nixos: do not emit comment-only recipe lines under $(Q)
Date: Thu, 23 Apr 2026 00:16:43 +0200 [thread overview]
Message-ID: <20260423-kdevops-series-a-fixes-v1-2-69a82d0e1631@samsung.com> (raw)
In-Reply-To: <20260423-kdevops-series-a-fixes-v1-0-69a82d0e1631@samsung.com>
From: Daniel Gomez <da.gomez@samsung.com>
Under CONFIG_KDEVOPS_MAKE_VERBOSE=y (or V=1) $(Q) expands to a
prefix that ends in "&& set -x &&", so a recipe line of the form
"$(Q)# comment" becomes "... && set -x && # comment"; the shell
treats "#" as a comment, the trailing "&&" loses its right-hand
operand, and the recipe aborts with a syntax error. Move prose
to Make-level comments above the target so every recipe line is
a real command that $(Q) can wrap safely in either verbosity
mode.
Fixes: 3089c3fec57 ("nixos: add NixOS support as third bringup option with libvirt integration")
Generated-by: Claude AI
Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
---
scripts/nixos.Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/nixos.Makefile b/scripts/nixos.Makefile
index d0ad0bf5..7ed49b05 100644
--- a/scripts/nixos.Makefile
+++ b/scripts/nixos.Makefile
@@ -44,9 +44,10 @@ libvirt_pcie_passthrough_permissions:
$(Q)ansible-playbook \
playbooks/libvirt_pcie_passthrough.yml
+# SSH connectivity is verified during NixOS VM provisioning: VMs get
+# DHCP IPs and SSH is tested directly in the playbook. The marker
+# below just records that the provisioning reached that point.
$(KDEVOPS_PROVISIONED_SSH): $(KDEVOPS_HOSTS_PREFIX)
- $(Q)# The SSH connectivity is verified during NixOS VM provisioning
- $(Q)# VMs get DHCP IPs and SSH is tested directly in the playbook
$(Q)touch $(KDEVOPS_PROVISIONED_SSH)
install_nixos_deps:
--
2.53.0
next prev parent reply other threads:[~2026-04-22 22:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-22 22:16 [PATCH 0/8] kdevops: small NIXOS and gen_hosts fixes Daniel Gomez
2026-04-22 22:16 ` [PATCH 1/8] nixos: remove duplicate nixos_channel extra-var from Makefile Daniel Gomez
2026-04-22 22:16 ` Daniel Gomez [this message]
2026-04-22 22:16 ` [PATCH 3/8] nixos: drop hardcoded qxl video model from libvirt XML Daniel Gomez
2026-04-22 22:16 ` [PATCH 4/8] nixos: destroy the libvirt domain before cleaning up local artefacts Daniel Gomez
2026-04-22 22:16 ` [PATCH 5/8] gen_hosts: scope the python interpreter per inventory group Daniel Gomez
2026-04-22 22:16 ` [PATCH 6/8] gen_hosts: make the linux workflow node name follow bootlinux_builder Daniel Gomez
2026-04-22 22:16 ` [PATCH 7/8] defconfigs/nixos: name NIXOS hosts with the "nixos" prefix Daniel Gomez
2026-04-22 22:16 ` [PATCH 8/8] gen_hosts: drop sudo become on inventory owner refresh Daniel Gomez
2026-04-23 13:50 ` [PATCH 0/8] kdevops: small NIXOS and gen_hosts fixes Chuck Lever
2026-04-23 19:20 ` Daniel Gomez
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=20260423-kdevops-series-a-fixes-v1-2-69a82d0e1631@samsung.com \
--to=da.gomez@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=da.gomez@samsung.com \
--cc=kdevops@lists.linux.dev \
--cc=mcgrof@kernel.org \
/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