From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id E971122610; Fri, 19 Sep 2025 20:20:19 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 7B7CD22609; Fri, 19 Sep 2025 20:20:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-yb1-xb2b.google.com (mail-yb1-xb2b.google.com [IPv6:2607:f8b0:4864:20::b2b]) by atuin.qyliss.net (Postfix) with ESMTPS id 3C47522608 for ; Fri, 19 Sep 2025 20:20:17 +0000 (UTC) Received: by mail-yb1-xb2b.google.com with SMTP id 3f1490d57ef6-e94d678e116so2845396276.2 for ; Fri, 19 Sep 2025 13:20:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758313216; x=1758918016; darn=spectrum-os.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=rIqdndzfRyxkiF/iOPjA4FwBSjtzBX4bWbxlw18SMuY=; b=F40GyYxTJEx2lPtrbkm9vZPEFSdzJPK3cGceLWTDBOMW8q9OzRvC+JWaKyj45dZBG0 gYv7NDRcI4n5IDpIq1YUIj88GvPhioxgw8AuuAdHZu/AiZr4uSCb4akZ/j7pb1bJwXKq wvapINxtx/xdrGCywLjc2zn2Xt+PcZZ5ImeP7B0/26jjHM+a9Txnqw+Tg8hf5dPDXG4P DOzzNIy4TceThivnIS9a2H3KRPME8QAJp0vAvpaaMkCYQef+6hTQFjrNLBIFP4r4Kpjv TngyM/RLtn4JoOytXjrHI5DmxZtU57nu5sMrggCpNIjZkhKyGLTGcZcuTAnrz5gRkadt LC+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758313216; x=1758918016; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rIqdndzfRyxkiF/iOPjA4FwBSjtzBX4bWbxlw18SMuY=; b=V7rfHvk4YzWz1ou5ZcHFYp+ZTUDcRrdoho9lGfmsulAhQk7djXNjSgr5bUe2/olEi+ CrEliz5mq74aoCTwYWF0vLYw1xxQ6IkvIqOBOI6KIrys8EeLBvwwla1tRvDkf/PNo3/x FlALGOuWCB1H0IJb39lFXzbpFeTs7397Rq+Es67VsNjawe0/36+iWpkOSSY0riXjV1DW XpUJf8DlqUUA1OHcDnIFIcVZfKmEudb37FcG9NC1wA9IsjJsPenOvore/imYmvk5VYUB 2JG90TEfJtWNG9fDVmMAMD5QFoswvYhcc9yfgS88J1jR8DS75qNhAV1ta6TscFiDs1LK 33vg== X-Gm-Message-State: AOJu0YxKfoJmxVMtuaIZXoGFgc082CgfMgHYLY+hEV+RM6lvV3/7KTeQ 977MwtursQrv0nRzfCHeeSXN3o/Mvbe/GgUfRVQwMhrBz9EUVWxzEbZsnYRFqA== X-Gm-Gg: ASbGnct8kOtwqYY6UcZRaaaSOfUyCdUUj3dweTjlxGgbZm+xIxtujI7Jtp+PdqhDtZu JqGcLDLvV4MxY4WQ2sTfUlGF+2Sxdp3rKwNo0E2208t8GZP+fBpjx9oFDKV/15UJNtHuB1ULItK J2R8RgszMma6UihZlVlIdRVQ8E6K2anc8J/1/F2jl4VqpfYZ3JlelYxCgFwMdkcmqbJG/cY3Qo+ tEJDfUUEyXMCT72bhUgxTHihW7GF9yAQQHhSBsL4hxL27xZaXndjFGBxQO2M2P9MynRqOym2o+v G/zOq4dp7vvYkmVHKuBG+Pbn1uPchGTPX2o/01yUIupHATiglJrqMTZQuol/Gl5dP7Hec7+tf2G nrAKN3v20ZjJPn4g+6gE3OVhXirwaD/3ofwEj19n2ex3fHCsmCpZVg1Kwh4N31gZg8pMmTUxc0j n+LQcUMfI+rNNj9CFF8axR2BR6O2Ya6t3ZImM4Wrr4aV/zgpa1wlJoFg== X-Google-Smtp-Source: AGHT+IFwizmCe/GruWEnQsC6RT4TY7qBnzM8fGy1j0tO5SaGJA+R0u6QQe1duapPcp7cOLH9BLwzmw== X-Received: by 2002:a05:6902:6d08:b0:ea6:e09b:b2d with SMTP id 3f1490d57ef6-ea8997f747cmr4146678276.3.1758313215811; Fri, 19 Sep 2025 13:20:15 -0700 (PDT) Received: from localhost.localdomain (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with UTF8SMTPSA id 3f1490d57ef6-ea5ce70a315sm1988851276.5.2025.09.19.13.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Sep 2025 13:20:15 -0700 (PDT) From: Demi Marie Obenour Date: Fri, 19 Sep 2025 16:13:21 -0400 Subject: [PATCH] Do not ignore errors from tar MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250919-no-ignore-tar-errors-v1-1-4e38380850d1@gmail.com> X-B4-Tracking: v=1; b=H4sIAGC5zWgC/x3MQQqAIBBA0avErBvIKMquEi3UxpqNxhgRiHdPW r7F/xkSCVOCpckg9HDiGCpU24A7TTgIea+GvuvHTiuNISIfIQrhbQRJJEpCR2Zw06yctR5qegl 5fv/tupXyAQusekZmAAAA X-Change-ID: 20250919-no-ignore-tar-errors-cea4c781cbbf To: Spectrum OS Development X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1758312801; l=2637; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=G6fJgm8fl4coe8qBW4RPhZRDDYmeX8lR84r/UB0vUL0=; b=fUG1fElblgAqhZpXbLxe9NEuW0871uN3F+ui2hVbJb8s9yZA4W8CmZSPM7c+h/fBS5PcmF/vA QuVKXe/yZhzB7/bBfOlfLCtvnaHcJUiusOtCzYohignxYnnjNYNnbQY X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: Y3FUAX5QD3EPUMFC2QC2L2VGFI5SDPPO X-Message-ID-Hash: Y3FUAX5QD3EPUMFC2QC2L2VGFI5SDPPO X-MailFrom: demiobenour@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Alyssa Ross , Demi Marie Obenour X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: These would be ignored due to a missing -o pipefail in the shell script. As a result, listing nonexistent s6-rc-compile inputs would cause a broken image to be successfully built. Also remove newlines that broke Vim syntax highlighting. Reported-by: Alyssa Ross Link: https://spectrum-os.org/lists/archives/spectrum-devel/87segu879h.fsf@alyssa.is Signed-off-by: Demi Marie Obenour --- host/rootfs/Makefile | 5 ++--- img/app/Makefile | 5 ++--- vm/sys/net/Makefile | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index b11ba50f369c3440572e06a7eaca429fbe6746a1..322d75026dbcba4301f26abfbf74efa8cc68cdfd 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -168,9 +168,8 @@ S6_RC_FILES = \ build/etc/s6-rc: $(S6_RC_FILES) mkdir -p $$(dirname $@) rm -rf $@ - - dir=$$(mktemp -d) && \ - tar -c $(S6_RC_FILES) | tar -C $$dir -x --strip-components 3 && \ + set -uo pipefail && dir=$$(mktemp -d) && \ + { tar -c $(S6_RC_FILES) | tar -C $$dir -x --strip-components 3; } && \ s6-rc-compile $@ $$dir; \ exit=$$?; rm -r $$dir; exit $$exit diff --git a/img/app/Makefile b/img/app/Makefile index c83b37364c16576e2609f5005b8a6092b644867b..8b9ecf990fe10adb7aa19b46935826d684f10686 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -116,9 +116,8 @@ VM_S6_RC_FILES = \ build/etc/s6-rc: $(VM_S6_RC_FILES) mkdir -p $$(dirname $@) rm -rf $@ - - dir=$$(mktemp -d) && \ - tar -c $(VM_S6_RC_FILES) | tar -C $$dir -x --strip-components 3 && \ + set -uo pipefail && dir=$$(mktemp -d) && \ + { tar -c $(VM_S6_RC_FILES) | tar -C $$dir -x --strip-components 3; } && \ s6-rc-compile $@ $$dir; \ exit=$$?; rm -r $$dir; exit $$exit diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index 79be242ea26e37d6f02af8761320de27d69d5b69..0193cc8c09f895a6021de0d02fde20362818e185 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -81,9 +81,8 @@ VM_S6_RC_FILES = \ build/etc/s6-rc: $(VM_S6_RC_FILES) mkdir -p $$(dirname $@) rm -rf $@ - - dir=$$(mktemp -d) && \ - tar -c $(VM_S6_RC_FILES) | tar -C $$dir -x --strip-components 3 && \ + set -uo pipefail && dir=$$(mktemp -d) && \ + { tar -c $(VM_S6_RC_FILES) | tar -C $$dir -x --strip-components 3; } && \ s6-rc-compile $@ $$dir; \ exit=$$?; rm -r $$dir; exit $$exit --- base-commit: 15ca6c4684313fcc9fcde3bda97d64698bb267ea change-id: 20250919-no-ignore-tar-errors-cea4c781cbbf -- Sincerely, Demi Marie Obenour (she/her/hers)