From ea4748a7cbfa5e2f3ef188f917d4e5aeac70dd0f Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Mon, 13 Dec 2021 08:28:03 -0600
Subject: [PATCH] iggyvolz pointed out that mkroot targets with builtin
 initramfs were quietly exiting with failure near the end. (Ooops, my bad.)

---
 scripts/mkroot.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/mkroot.sh b/scripts/mkroot.sh
index a9b3da35..69246950 100755
--- a/scripts/mkroot.sh
+++ b/scripts/mkroot.sh
@@ -270,9 +270,11 @@ CONFIG_CMDLINE="console=ttyUL0 earlycon"' BUILTIN=1
 fi
 
 # clean up and package root filesystem for initramfs.
-[ -z "$BUILTIN" ] && announce "${CROSS}root.cpio.gz" &&
-  (cd "$ROOT" && find . | cpio -o -H newc ${CROSS_COMPILE:+--no-preserve-owner} | gzip) \
-    > "$OUTPUT/$CROSS"root.cpio.gz || exit 1
+if [ -z "$BUILTIN" ]; then
+  announce "${CROSS}root.cpio.gz"
+  (cd "$ROOT" && find . | cpio -o -H newc ${CROSS_COMPILE:+--no-preserve-owner}\
+    | gzip) > "$OUTPUT/$CROSS"root.cpio.gz || exit 1
+fi
 
 mv "$LOG/$CROSS".{n,y} #2>/dev/null
 rmdir "$MYBUILD" "$BUILD" 2>/dev/null || exit 0 # remove if empty, not an error
-- 
2.39.2