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 1EBE265F9; Wed, 10 Sep 2025 05:37:37 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 1851865D8; Wed, 10 Sep 2025 05:37:34 +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-xb33.google.com (mail-yb1-xb33.google.com [IPv6:2607:f8b0:4864:20::b33]) by atuin.qyliss.net (Postfix) with ESMTPS id 2EE1E65D7 for ; Wed, 10 Sep 2025 05:37:33 +0000 (UTC) Received: by mail-yb1-xb33.google.com with SMTP id 3f1490d57ef6-e96dc26dfa2so5383037276.1 for ; Tue, 09 Sep 2025 22:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757482652; x=1758087452; darn=spectrum-os.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=dtUbJiBP6dXSE4V/23cMPLKa7lDXus+j5ESaeXLv0Ig=; b=HSXIXKooKsRg0xaJC1CeNOQ4TGtkZY8jKHDJmwQdSR7DyibIRHlHBVj6unODp2+2dz EOSY0iW3p0yTC5UBDGuqFbdYXXAt06B3YlqC0ck6DwMfFkkkB/ICz11QMGFv+WayyLyZ B7p4hDRTcZI+pyQWxbOXKFDpvKx1gLnBe2iUvQEP6K1GxBQw6zrEO1Z/kpcCtHzKEjkP IdQlcmU+rEWdCNCN4qfaMs+LK2iXWHy0Ub4A+J+QChTvVAaVaWNXrQtfTXB4Ax09//ag 0jJ8BQ3gzdMfF3QygeZ6HYfCc1bUABOVPQrFCXaSlQ/OHzU5tsvdU7oMRAJxGxmJ6oAl fwbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757482652; x=1758087452; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dtUbJiBP6dXSE4V/23cMPLKa7lDXus+j5ESaeXLv0Ig=; b=I8k29GhQCFQl36VH9zY8I0RJ+/7b0GBoQKWyTclxMxOA8+g83wOUIgT7NPJX1OuKjk QvH/mhLywKg5eEgIkkDPlbpi+zsFWdwKNwzV/HcyddCM44yrTsJbDQTjKwdHQPVwr5vT yLYsYiFSEpjVHLS9i4go0G63TZPV01NZfPxkUWmWxy6AM7sZ/IKKkaEoKFnVVHOfFJNl s0jn0utuj5ecwImYusjIXQr0GnpmOCms2hMWPXtP79SG2F8KcNxewEcObNfFU/NlvSIb LRK1YglKRENzLWs7Bm0WTjO9RSHND2K+iyJSv1iJ3Rq4HoIsmxUgRlja3RCRjov4//1K ia6w== X-Gm-Message-State: AOJu0YxlTmdcf9AJ++0aa0UBaAJgVprsgu1eWQowE8WhXWXwgVi1EBzU sKPZ1p3DWwTT8jNmr18ZOyYXIFQPMoI/MRAp2SW3RCi54qbgxK7PfrnNKFmCbA== X-Gm-Gg: ASbGncs0FTBJIQgyyzLJbInMDIu+DaCrJY16Sy8sSR1OdJ0yprEmFaGMd74sT/7VL4q ZyeujsPTn/XprCWZEeHJIyO058eAK/S05IyT0xVjR0FazKBaTIkx9bZbrBEMfE9rGzHIYY/O0Wd tPwiMCpTm+fGisPAccu71LFACP99D5Idhy6RIuXSPiJsnVTIHlMfOlX3+XwvcAUx6fFGKV97BmP yd++CQSb+iwdCKHGt2ucyIMQo70mJHwQUAwP8ZJuJY3CYBadhydBvQJBajeW95pQ7pREUxeUy6M 5yRh75CulEM7EyRAvkkXOho3TeiQMzwzTjD0ukJ100b0q/ayLO6K0jn12uhqk+ex2aSwSZ1anaA 9YCchDGFQiEYDC+2p3x6xbmxUupmJoV/P8c1ujk1O0YbQkKR6rYlj5A9gvpdJC0cdl3lV/R4HUO u8P16+ixrNfQaVI+Hpj7W9xkuehSLyhVjV7J5vLxmpXA3Xc3jPl8mUPg== X-Google-Smtp-Source: AGHT+IGnOvXAtyO3OAS0V5yFy7pmesL+Q8jKzt1g8gOGDXqrPEdFQScaCkuwbeVyifejKlYNG5f7Ww== X-Received: by 2002:a05:6902:c0c:b0:e9b:c7fa:2bc2 with SMTP id 3f1490d57ef6-e9f65455e98mr12493751276.10.1757482651613; Tue, 09 Sep 2025 22:37:31 -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-e9bbe08d6aasm7154642276.24.2025.09.09.22.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Sep 2025 22:37:30 -0700 (PDT) From: Demi Marie Obenour Date: Wed, 10 Sep 2025 01:29:56 -0400 Subject: [PATCH v2 3/3] Common make rules for building erofs images MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250910-genfiles-v2-3-37ebe07a3cdc@gmail.com> References: <20250910-genfiles-v2-0-37ebe07a3cdc@gmail.com> In-Reply-To: <20250910-genfiles-v2-0-37ebe07a3cdc@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1757482194; l=10240; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=95fvJnflTyDxqkknX4CqwVSeT2XMUEIqMJ28WBD7sNg=; b=+R5QA30DYbFXu5G0w/+EK/6TFrQMJXUWQtnJqmVwpm5iR6h3ubY+K7p0ue+b0eLEQG24YOFTI j3ggU1kz1FaA2XMU1O7igMfB1YX4hS1gLIv4JJS1R7y5DkD5iT3vGm7 X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: QE76MCB5BO6NK2XMA4UC5B4GRBMDRFP3 X-Message-ID-Hash: QE76MCB5BO6NK2XMA4UC5B4GRBMDRFP3 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: Demi Marie Obenour , Alyssa Ross 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: Instead of duplicating the logic in three different places, write common code for all three makefiles to use instead. This will make future changes much easier. Signed-off-by: Demi Marie Obenour --- host/rootfs/Makefile | 45 +++------------------------------------------ host/rootfs/default.nix | 1 + img/app/Makefile | 41 ++--------------------------------------- img/app/default.nix | 1 + lib/erofs.mk | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ vm/sys/net/Makefile | 39 ++++----------------------------------- vm/sys/net/default.nix | 1 + 7 files changed, 61 insertions(+), 116 deletions(-) diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index 795d0018ea2858c4d21a9ec42370597fd102473a..e100c9fa240d76a0210b553f5aaa34de93b05e78 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -3,10 +3,8 @@ .POSIX: -include ../../lib/common.mk -include file-list.mk - -dest = build/rootfs.erofs +basedir = ../.. +include $(basedir)/lib/erofs.mk DIRS = \ dev \ @@ -44,44 +42,7 @@ DIRS = \ FIFOS = etc/s6-linux-init/run-image/service/s6-svscan-log/fifo -BUILD_FILES = build/etc/s6-rc - -$(dest): ../../scripts/make-erofs.sh $(PACKAGES_FILE) $(FILES) $(BUILD_FILES) build/empty build/fifo file-list.mk - ( \ - cat $(PACKAGES_FILE) ;\ - for file in $(FILES) $(LINKS); do printf '%s\n%s\n' $$file "$${file#image/}"; done ;\ - for file in $(BUILD_FILES); do printf '%s\n%s\n' $$file $${file#build/}; done ;\ - printf 'build/empty\n%s\n' $(DIRS) ;\ - printf 'build/fifo\n%s\n' $(FIFOS) ;\ - ) | ../../scripts/make-erofs.sh $@ - -build/fifo: - mkdir -p build - mkfifo -m 0600 $@ - -build/empty: - mkdir -p $@ - -# s6-rc-compile's input is a directory, but that doesn't play nice -# with Make, because it won't know to update if some file in the -# directory is changed, or a file is created or removed in a -# subdirectory. Using the whole source directory could also end up -# including files that aren't intended to be part of the input, like -# temporary editor files or .license files. So for all these reasons, -# only explicitly listed files are made available to s6-rc-compile. -build/etc/s6-rc: $(S6_RC_FILES) file-list.mk - mkdir -p $$(dirname $@) - rm -rf $@ - - 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 - -clean: - -chmod -Rf +w build - rm -rf build -.PHONY: clean +all: $(dest) # veritysetup format produces two files, but Make only (portably) # supports one output per rule, so we combine the two outputs then diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index 998220d7b6ed322f64ee52c704e71ec9b4643f59..561bf660829dcd5f5e2ee841662727b262d43ed3 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -178,6 +178,7 @@ stdenvNoCC.mkDerivation { fileset = fileset.intersection src (fileset.unions [ ./. ../../lib/common.mk + ../../lib/erofs.mk ../../scripts/make-erofs.sh ]); }; diff --git a/img/app/Makefile b/img/app/Makefile index 04fbf99c7d2e30527aa54e5e549043d03ce6362b..409c0156bf0d336c17dec6e2324e6fbd6bd4c788 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -4,8 +4,8 @@ .POSIX: -include ../../lib/common.mk -include file-list.mk +basedir = ../.. +include $(basedir)/lib/erofs.mk prefix = build/host libdir = $(prefix)/lib @@ -18,7 +18,6 @@ HOST_BUILD_FILES = \ $(imgdir)/appvm/vmlinux all: $(HOST_BUILD_FILES) -.PHONY: all $(imgdir)/appvm/vmlinux: $(KERNEL) mkdir -p $$(dirname $@) @@ -36,33 +35,6 @@ DIRS = dev run proc sys tmp \ etc/s6-linux-init/run-image/wait FIFOS = etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/fifo -BUILD_FILES = build/etc/s6-rc - -build/fifo: - mkdir -p build - mkfifo -m 0600 $@ - -build/empty: - mkdir -p $@ - -build/rootfs.erofs: ../../scripts/make-erofs.sh $(PACKAGES_FILE) $(addprefix image/,$(FILES)) $(BUILD_FILES) build/empty build/fifo file-list.mk - ( \ - cat $(PACKAGES_FILE) ;\ - for file in $(FILES) $(LINKS); do printf 'image/%s\n%s\n' $$file $$file; done ;\ - for file in $(BUILD_FILES); do printf '%s\n%s\n' $$file $${file#build/}; done ;\ - printf 'build/empty\n%s\n' $(DIRS) ;\ - printf 'build/fifo\n%s\n' $(FIFOS) ;\ - ) | ../../scripts/make-erofs.sh $@ - - -build/etc/s6-rc: $(S6_RC_FILES) file-list.mk - mkdir -p $$(dirname $@) - rm -rf $@ - - dir=$$(mktemp -d) && \ - tar -C image -c $(S6_RC_FILES) | tar -C $$dir -x --strip-components 3 && \ - s6-rc-compile $@ $$dir; \ - exit=$$?; rm -r $$dir; exit $$exit debug: $(GDB) -q \ @@ -139,14 +111,5 @@ run-crosvm: $(imgdir)/appvm/blk/root.img start-vhost-user-gpu start-virtiofsd $(KERNEL) .PHONY: run-crosvm -update-file-list: - ../../scripts/genfiles.awk image > file-list.mk - -.PHONY: update-file-list - run: run-$(VMM) .PHONY: run - -clean: - rm -rf build -.PHONY: clean diff --git a/img/app/default.nix b/img/app/default.nix index 71a939c1c053ebd37fc02fa4eed49b883d50ef49..8c2a114e6b4db52afe9c92f9adb3d5ec52ea2260 100644 --- a/img/app/default.nix +++ b/img/app/default.nix @@ -105,6 +105,7 @@ stdenvNoCC.mkDerivation { fileset = lib.fileset.intersection src (lib.fileset.unions [ ./. ../../lib/common.mk + ../../lib/erofs.mk ../../scripts/make-erofs.sh ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk diff --git a/lib/erofs.mk b/lib/erofs.mk new file mode 100644 index 0000000000000000000000000000000000000000..1166e2153eb8fde48558affb2a59198a0f0ea917 --- /dev/null +++ b/lib/erofs.mk @@ -0,0 +1,49 @@ +# SPDX-License-Identifier: EUPL-1.2+ +# SPDX-FileCopyrightText: 2021-2024 Alyssa Ross +# SPDX-FileCopyrightText: 2022 Unikie +# SPDX-FileCopyrightText: 2025 Demi Marie Obenour + +include $(basedir)/lib/common.mk +include file-list.mk +BUILD_FILES += build/etc/s6-rc +dest = build/rootfs.erofs + +all: +.PHONY: all +$(dest): $(basedir)/scripts/make-erofs.sh $(PACKAGES_FILE) $(FILES) $(BUILD_FILES) build/empty build/fifo file-list.mk + set -euo pipefail; ( \ + cat $(PACKAGES_FILE);\ + for file in $(FILES) $(LINKS); do printf '%s\n%s\n' "$$file" "$${file#image/}"; done;\ + for file in $(BUILD_FILES); do printf '%s\n%s\n' "$$file" "$${file#build/}"; done;\ + for dir in $(DIRS); do printf 'build/empty\n%s\n' "$$dir"; done;\ + for fifo in $(FIFOS); do printf 'build/fifo\n%s\n' "$$fifo"; done;\ + ) | $(basedir)/scripts/make-erofs.sh $@ + +clean: + -chmod -Rf +w build + rm -rf build +.PHONY: clean + false + +build/fifo: + mkdir -p build + mkfifo -m 0600 $@ + +build/empty: + mkdir -p $@ + +# s6-rc-compile's input is a directory, but that doesn't play nice +# with Make, because it won't know to update if some file in the +# directory is changed, or a file is created or removed in a +# subdirectory. Using the whole source directory could also end up +# including files that aren't intended to be part of the input, like +# temporary editor files or .license files. So for all these reasons, +# only explicitly listed files are made available to s6-rc-compile. +build/etc/s6-rc: $(S6_RC_FILES) file-list.mk + mkdir -p build/etc + rm -rf $@ + set -euo 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/vm/sys/net/Makefile b/vm/sys/net/Makefile index 11f9215b58a89569ead0c5cc7a4a24b0cc4eec22..217f95bfeabd80bc6fea1e3264296891ee495ee5 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -3,21 +3,22 @@ .POSIX: -include ../../../lib/common.mk -include file-list.mk +basedir = ../../.. +include $(basedir)/lib/erofs.mk prefix = build/host libdir = $(prefix)/lib vmdir = $(libdir)/spectrum/vm VMM = cloud-hypervisor +DIRS = +FIFOS = HOST_BUILD_FILES = \ $(vmdir)/netvm/blk/root.img \ $(vmdir)/netvm/vmlinux all: $(HOST_BUILD_FILES) -.PHONY: all $(vmdir)/netvm/vmlinux: $(KERNEL) mkdir -p $$(dirname $@) @@ -29,29 +30,6 @@ $(vmdir)/netvm/blk/root.img: ../../../scripts/make-gpt.sh ../../../scripts/sfdis build/rootfs.erofs:root:ea21da27-0391-48da-9235-9d2ab2ca7844:root mv $@.tmp $@ -BUILD_FILES = build/etc/s6-rc - -build/empty: - mkdir -p $@ - -build/rootfs.erofs: ../../../scripts/make-erofs.sh $(PACKAGES_FILE) $(FILES) $(BUILD_FILES) build/empty file-list.mk - ( \ - cat $(PACKAGES_FILE) ;\ - for file in $(FILES) $(LINKS); do printf '%s\n%s\n' $$file "$${file#image/}"; done ;\ - for file in $(BUILD_FILES); do printf '%s\n%s\n' $$file $${file#build/}; done ;\ - printf 'build/empty\n%s\n' $(DIRS) ;\ - ) | ../../../scripts/make-erofs.sh $@ - - -build/etc/s6-rc: $(S6_RC_FILES) file-list.mk - mkdir -p $$(dirname $@) - rm -rf $@ - - 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 - debug: $(GDB) -q \ -ex 'set substitute-path .. $(LINUX_SRC)' \ @@ -103,14 +81,5 @@ run-crosvm: $(vmdir)/netvm/blk/root.img $(KERNEL) .PHONY: run-crosvm -update-file-list: - ../../scripts/genfiles.awk image > file-list.mk - -.PHONY: update-file-list - run: run-$(VMM) .PHONY: run - -clean: - rm -rf build -.PHONY: clean diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index 7b2b8b1fbb9b9027781812307bed0551b80f5a78..c453f02cb204e97d0627b18c66c29a9767159d40 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -104,6 +104,7 @@ stdenvNoCC.mkDerivation { fileset = lib.fileset.intersection src (lib.fileset.unions [ ./. ../../../lib/common.mk + ../../../lib/erofs.mk ../../../scripts/make-erofs.sh ../../../scripts/make-gpt.sh ../../../scripts/sfdisk-field.awk -- 2.51.0