From 85c0dd7aeaae23d953f54d0315310e715583f7cb Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Thu, 23 Apr 2026 23:30:06 +0200
Subject: [PATCH 1/4] Make sure that && always has whitespace around it.

---
 build/ab.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/ab.py b/build/ab.py
index 81e3c9fff..56dc4c892 100644
--- a/build/ab.py
+++ b/build/ab.py
@@ -526,6 +526,7 @@ def generate(xs):
 
 
 def filenameof(x):
+    x = targetof(x)
     xs = filenamesof(x.outs)
     assert (
         len(xs) == 1
@@ -611,7 +612,7 @@ def emit_rule(self, ins, outs, cmds=[], label=None):
             emit("build", *fouts, ":rule", *fins)
             emit(
                 " command=",
-                "&&".join([s.strip() for s in rule]).replace("$", "$$"),
+                " && ".join([s.strip() for s in rule]).replace("$", "$$"),
             )
         if label:
             emit(" description=", label)

From 13bcfeb09ed0f588138c8e5f7d55d02b7e47c204 Mon Sep 17 00:00:00 2001
From: dtrg <dtrg@google.com>
Date: Tue, 14 Jul 2026 15:47:51 +0200
Subject: [PATCH 2/4] Add .gitignore.

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..b4774c2bd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.obj/
+compile_commands.json
+

From c525d35835ab5628b922d98a957f2842f795db8c Mon Sep 17 00:00:00 2001
From: dtrg <dtrg@google.com>
Date: Tue, 14 Jul 2026 16:11:18 +0200
Subject: [PATCH 3/4] Remember to ignore .ninja-log.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b4774c2bd..50e96a8e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .obj/
 compile_commands.json
+.ninja_log
 

From cf88337be9df2b38d30f693fa04b3d19e8e66c4b Mon Sep 17 00:00:00 2001
From: dtrg <dtrg@google.com>
Date: Tue, 14 Jul 2026 16:12:43 +0200
Subject: [PATCH 4/4] Fix build script typo causing an intermediate file to go
 into the CWD.

---
 plat/cpm/emu/build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plat/cpm/emu/build.py b/plat/cpm/emu/build.py
index 426b31fbd..63e4e5690 100644
--- a/plat/cpm/emu/build.py
+++ b/plat/cpm/emu/build.py
@@ -21,7 +21,7 @@
         "util/amisc+aslod",
         ".+bdos_out",
     ],
-    outs=["bdos.img"],
+    outs=["=bdos.img"],
     commands=["$[ins] $[outs]"],
 )