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 160561C0C1; Thu, 07 Aug 2025 18:51:57 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 822AA1C119; Thu, 07 Aug 2025 18:51:53 +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-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) by atuin.qyliss.net (Postfix) with ESMTPS id E1B1E1C116 for ; Thu, 07 Aug 2025 18:51:51 +0000 (UTC) Received: by mail-qt1-x833.google.com with SMTP id d75a77b69052e-4b07d779287so13941611cf.2 for ; Thu, 07 Aug 2025 11:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754592709; x=1755197509; 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=qf3YVuSreWzMpumVClKyNijf70S9jv4qiGg8fmjliJY=; b=AB328tvpXcRTSUtZFgpeX3i8hoN3j1RcClqA2GzMv6wTJZE6xq7W8E0smPkf6M1xug ZQu6SObaAwlpGFU4wI7/A1SFaLHPHD19Ex8x8Lew32gCAtqz1LtFozQszU9bwYhS/lHL RntzhskUTMdpGRaEDQfRWdeeWp0OiC6rpnV7nktF4LY+0NydEhdyQ/Yrl4IhshfnEpYC 6BUG64q0esckGqp1hpH92s6opkyp/nRcGgfsaFZ+pC0xlacStbebXnHEpQ5KRXysToqJ JeYn12lCApt2lBjJr+OUsqik0bcOOmaqL76XV6bORxAwRn3AhlNZkTpCFGIx5YhbFWmj Ujeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754592709; x=1755197509; 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=qf3YVuSreWzMpumVClKyNijf70S9jv4qiGg8fmjliJY=; b=DwRdtOAExjekew1MwUJzIwV1Ntl7PxgSpLLWptv1ZbyMxKEmVXkTUoa5q4gEk3FWyd f8x9pNIgHsq+l5v+Ydfni39owj4sZ80TdIXL0Knz5wNu4f60egVrL8x0RNRYxiZvwPWb GTL/LK8MdbBuFf5Xu3p5z+z/oeYD9YCWRqAl4kM8S++VIcTcAKK+2U6D3ErfKIqYnl9k Nbg/rbCOiJ+HXqMUNw3xo+s/i7kwpXumsRxKeFimkf1i5VSBJ1FFXSRNJTuLC870eUuB TG0ZN1rgkEIFe/7P5VVPpauEDM+OxNObb/UoRFMRK+ISuZmIPAc12BP6GdQumPnNbVtU 4htw== X-Gm-Message-State: AOJu0Yy/BDXQd4384XCfswu4aVoc7w4NSx4wYp/hIo/VULrBp08B/EJY 4/jIYF/QXtnOBucSgeP7JGFatJYfPebf/QKPRkDTfvlRe/OyYhRHNJo9FgtGcw== X-Gm-Gg: ASbGncuvRGGmq1JsLwWTHhAnSrgAqYoersiSo4H+ilO1T2Jn9oS9TFZc9OZcooOeJHz xxfBHPd8N9JvoGst9jtV96xD4IYLZRvRlyUOIGid5de2RxhwPrgNBhAFZMnlsbROkd6S8lhlZKe YNmc0q69qYCo7S3fTZf4V/5c/VSrCOeN6dHRPf5memtvFwJwz132vvhbtdKubE8BgY9MZwcOP0D ONnKdPzJeShZQWyh4DUI86OZHiXYYrjEVgGJweN6P+f/df8yWhHS0v05K4QDU1coOr+mguPbpAG AeM+IdB6Tx4ytw4cYob0kgx5g61zKiZwnF45A98s4TsX3SL+fnYIh3VQF48PsI2lR2UfK5bWqaY N+E8JUIjG5eU42pcClDab6Zf+wJ3eiPrEacgWJg== X-Google-Smtp-Source: AGHT+IFP1spyXpNJolaOUr6TW/GhN2DaX6URoLQ5H0WffXpNPrvfWjn10GHEm1qpTL4ei32z/rN3kw== X-Received: by 2002:ad4:5fca:0:b0:705:8d7:a0c3 with SMTP id 6a1803df08f44-7099a3463f9mr5014256d6.34.1754592708998; Thu, 07 Aug 2025 11:51:48 -0700 (PDT) Received: from localhost.localdomain ([89.187.178.201]) by smtp.gmail.com with UTF8SMTPSA id 6a1803df08f44-7097e906c3csm23323516d6.65.2025.08.07.11.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Aug 2025 11:51:48 -0700 (PDT) From: Demi Marie Obenour Date: Thu, 07 Aug 2025 14:50:01 -0400 Subject: [PATCH] Add wrapper scripts to run make in a Nix shell MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250807-make-wrapper-scripts-v1-1-3f020195a916@gmail.com> X-B4-Tracking: v=1; b=H4sIAFj1lGgC/x3MQQqDQAxA0atI1gbiSJniVaSLMMY2FHVIihUG7 +7g8i3+L+BiKg5DU8BkV9dtrejaBtKH17egTtUQKDzoSREX/gr+jXMWQ0+m+ecYY+g7TpSII9Q 0m8x63NvxdZ4XybWwWmYAAAA= X-Change-ID: 20250807-make-wrapper-scripts-77231ac0c0a7 To: Spectrum OS Development X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1754592600; l=3164; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=G9JIfO954he5Qp2vnZ/KcwPWxlgvk+o6PKkg6bKUdqs=; b=REYVs6UeXKH6jgvYp0xRNW6/FVGme3PjmwRzroqS3hDTswDX/21rbiulPyRR9uaCSdyMA2ZxA x8rdTf1Y/3jAUJn+sn+L3YpeVgS4WyR1Qcc5VciEXnp5qfC9MJC/fXS X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: UBLQPGPFTCMJ2ZCXTHSH2Z7QIPKLCSQT X-Message-ID-Hash: UBLQPGPFTCMJ2ZCXTHSH2Z7QIPKLCSQT 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: It is very easy to forget to do this, and the results are confusing at best and wrong at worst. Add wrapper scripts that get it right and also automatically change to the correct directory for you. Signed-off-by: Demi Marie Obenour --- host/initramfs/run-make.sh | 1 + host/rootfs/run-make.sh | 1 + img/app/run-make.sh | 1 + release/live/run-make.sh | 1 + scripts/run-make.sh | 12 ++++++++++++ tools/lseek/run-make.sh | 1 + vm/sys/net/run-make.sh | 1 + 7 files changed, 18 insertions(+) diff --git a/host/initramfs/run-make.sh b/host/initramfs/run-make.sh new file mode 120000 index 0000000000000000000000000000000000000000..2142d230828768016cf5a4a59a895448ae3b12d9 --- /dev/null +++ b/host/initramfs/run-make.sh @@ -0,0 +1 @@ +../../scripts/run-make.sh \ No newline at end of file diff --git a/host/rootfs/run-make.sh b/host/rootfs/run-make.sh new file mode 120000 index 0000000000000000000000000000000000000000..2142d230828768016cf5a4a59a895448ae3b12d9 --- /dev/null +++ b/host/rootfs/run-make.sh @@ -0,0 +1 @@ +../../scripts/run-make.sh \ No newline at end of file diff --git a/img/app/run-make.sh b/img/app/run-make.sh new file mode 120000 index 0000000000000000000000000000000000000000..2142d230828768016cf5a4a59a895448ae3b12d9 --- /dev/null +++ b/img/app/run-make.sh @@ -0,0 +1 @@ +../../scripts/run-make.sh \ No newline at end of file diff --git a/release/live/run-make.sh b/release/live/run-make.sh new file mode 120000 index 0000000000000000000000000000000000000000..2142d230828768016cf5a4a59a895448ae3b12d9 --- /dev/null +++ b/release/live/run-make.sh @@ -0,0 +1 @@ +../../scripts/run-make.sh \ No newline at end of file diff --git a/scripts/run-make.sh b/scripts/run-make.sh new file mode 100755 index 0000000000000000000000000000000000000000..b865bb3461b5d3f192598d273cee278a76d0a6b7 --- /dev/null +++ b/scripts/run-make.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env -S bash -- +# SPDX-License-Identifier: CC0-1.0 +# SPDX-FileCopyrightText: 2025 Demi Marie Obenour +set -eu +case $0 in (/*) cd "${0%/*}/";; (*/*) cd "./${0%/*}";; esac +if [ ! -f shell.nix ] || [ ! -f Makefile ]; then + echo "Must have a shell.nix and a Makefile" >&2 + exit 1 +fi +cmd='exec make' +for i; do cmd+=" '"${i//\'/\'\\\'\'}\'; done +exec nix-shell --pure --run "$cmd" diff --git a/tools/lseek/run-make.sh b/tools/lseek/run-make.sh new file mode 120000 index 0000000000000000000000000000000000000000..2142d230828768016cf5a4a59a895448ae3b12d9 --- /dev/null +++ b/tools/lseek/run-make.sh @@ -0,0 +1 @@ +../../scripts/run-make.sh \ No newline at end of file diff --git a/vm/sys/net/run-make.sh b/vm/sys/net/run-make.sh new file mode 120000 index 0000000000000000000000000000000000000000..38a7b0cf91ebf669e9794d91c6962cbe882de20f --- /dev/null +++ b/vm/sys/net/run-make.sh @@ -0,0 +1 @@ +../../../scripts/run-make.sh \ No newline at end of file --- base-commit: 39baa378367d95fac6ce4d0140b25203b2ee9b53 change-id: 20250807-make-wrapper-scripts-77231ac0c0a7 -- Sincerely, Demi Marie Obenour (she/her/hers)