From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id AD7FF22F29; Wed, 6 Apr 2022 08:21:09 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 62EDC22EBE; Wed, 6 Apr 2022 08:21:07 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by atuin.qyliss.net (Postfix) with ESMTPS id 7542C22F23 for ; Wed, 6 Apr 2022 08:21:01 +0000 (UTC) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id BFEC55C00FF; Wed, 6 Apr 2022 04:20:59 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Wed, 06 Apr 2022 04:20:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=fm3; bh=753Xea9z7fNYnJorkDbgUQv8vbH5+HX/GtgjSRe9Gh0=; b=dYn6D E3n8CYjqGF+l3dG2nJ265T06fKjaBBtkjsXPbQi6952Qtbt/WaqkUo4PdCN38xZ7 reoqITqxcOUeqdrgKedKMOoxJcTEdqrqJePrj6VtqIw3oMxIIqAifJafEla/vyDm A61yqP4WNkhYZcykllZcCuRPleXZtURuyZ4sbqbTegAq3OL8SgmSTcBPxN1ekMM9 hbjdl3FfXIEjCo+1RwywXXsAtbXkfjGOK4oxQAIfsreyhETBwzjT+vj+XyuOrTNX c5KJPK3uM2V7qMR7q6enYSfyD7KAUcwnvFo27FkQfzwz3NGAHSfBKpt3MpFG9BPH ug6jho7dPJAhcRVoA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=753Xea9z7fNYnJorkDbgUQv8vbH5+ HX/GtgjSRe9Gh0=; b=NFhbahcUyZdupSuODtOmuzV0xaJjAawHs6SEwll40vE/o 2E6jv6rFNK3vtop6uwD7CffsofUNIIj3073ieFD7ndkT1p8sm0vxbk4kjTqYY5Tb c7ZxsdHCs1J/85QyjnOmLVJEvTfjpyvW4aZSvNMtwSt7gk527f99ChIAo4hKYwS+ 4EcmTE4UzHnybMFXZ4vzghT/46LE+AlQhvAkk+sVSDUuFXomeKih0ClBr5xCbUOD QFt67H3K12JBcoS40QWHBJurYnBSpdgGbQvAjt9eS/Yf6iFLtlzlSF87+DJDQ5I4 q5wmSSdO6ov56OX1ZGM+OO0Vq4XdWhGjtxYqtssTw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudejiedgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpeetlhihshhsrgcu tfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpeejvdetff evleelfedtieduteelledtueejhfejteelveeiheeufffhgeegveekueenucffohhmrghi nhepkhgvrhhnvghlrdguvghvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepqhihlhhishhssegvvhgvrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 6 Apr 2022 04:20:59 -0400 (EDT) Received: by eve.qyliss.net (Postfix, from userid 1000) id B593B668; Wed, 6 Apr 2022 08:20:56 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH] Don't assume /var/empty exists in Makefiles Date: Wed, 6 Apr 2022 08:20:38 +0000 Message-Id: <20220406082038.4012718-1-hi@alyssa.is> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: DP6MXGBMZO4TQLHOIKFQRV37Z3JD44HW X-Message-ID-Hash: DP6MXGBMZO4TQLHOIKFQRV37Z3JD44HW X-MailFrom: qyliss@eve.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Ville Ilvonen X-Mailman-Version: 3.3.5 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 apparently doesn't on Ubuntu, and this way we also don't have to hack around it being missing in the Nix sandbox. Reported-by: Ville Ilvonen --- host/rootfs/Makefile | 9 ++++++--- host/rootfs/default.nix | 5 ----- vm/app/catgirl/Makefile | 9 ++++++--- vm/app/catgirl/default.nix | 5 ----- vm/app/lynx/Makefile | 9 ++++++--- vm/app/lynx/default.nix | 5 ----- vm/sys/net/Makefile | 9 ++++++--- vm/sys/net/default.nix | 5 ----- 8 files changed, 24 insertions(+), 32 deletions(-) diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index 87bc15e..d78cc4c 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -45,15 +45,18 @@ LINKS = bin sbin BUILD_FILES = build/etc/mdev/modalias.sh build/etc/s6-rc MOUNTPOINTS = dev ext run proc sys -build/rootfs.tar: $(PACKAGES_TAR) $(FILES) $(BUILD_FILES) +build/empty: + mkdir -p $@ + +build/rootfs.tar: build/empty $(PACKAGES_TAR) $(FILES) $(BUILD_FILES) cp --no-preserve=mode -f $(PACKAGES_TAR) $@ tar $(TARFLAGS) --append -f $@ $(FILES) $(LINKS) echo $(BUILD_FILES) | cut -d/ -f2 | \ tar $(TARFLAGS) --append -f $@ -C build -T - for m in $(MOUNTPOINTS); do \ - tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," /var/empty ; \ + tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," build/empty ; \ done - tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' /var/empty + tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' build/empty build/etc/mdev/modules.map: scripts/modprobe/gen_modules.map.awk mkdir -p $$(dirname $@) diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index cb02445..0bef7ba 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -94,11 +94,6 @@ stdenv.mkDerivation { MODULES_ORDER = "${kernel}/lib/modules/${kernel.modDirVersion}/modules.order"; PACKAGES_TAR = packagesTar; - postPatch = '' - mkdir $NIX_BUILD_TOP/empty - substituteInPlace Makefile --replace /var/empty $NIX_BUILD_TOP/empty - ''; - installPhase = '' cp build/rootfs.ext4 $out ''; diff --git a/vm/app/catgirl/Makefile b/vm/app/catgirl/Makefile index 5029bb4..3ee5842 100644 --- a/vm/app/catgirl/Makefile +++ b/vm/app/catgirl/Makefile @@ -55,15 +55,18 @@ VM_LINKS = bin etc/ssl/certs/ca-certificates.crt VM_BUILD_FILES = build/etc/s6-rc VM_MOUNTPOINTS = dev run proc sys -build/rootfs.tar: $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES) +build/empty: + mkdir -p $@ + +build/rootfs.tar: build/empty $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES) cp --no-preserve=mode -f $(PACKAGES_TAR) $@ tar $(TARFLAGS) --append -f $@ $(VM_FILES) $(VM_LINKS) echo $(VM_BUILD_FILES) | cut -d/ -f2 | \ tar $(TARFLAGS) --append -f $@ -C build -T - for m in $(VM_MOUNTPOINTS); do \ - tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," /var/empty ; \ + tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," build/empty ; \ done - tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' /var/empty + tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' build/empty VM_S6_RC_FILES = \ etc/s6-rc/catgirl/run \ diff --git a/vm/app/catgirl/default.nix b/vm/app/catgirl/default.nix index 230da00..bf35d04 100644 --- a/vm/app/catgirl/default.nix +++ b/vm/app/catgirl/default.nix @@ -74,11 +74,6 @@ stdenv.mkDerivation { PACKAGES_TAR = packagesTar; VMLINUX = "${kernel.dev}/vmlinux"; - postPatch = '' - mkdir $NIX_BUILD_TOP/empty - substituteInPlace Makefile --replace /var/empty $NIX_BUILD_TOP/empty - ''; - installPhase = '' mv build/svc $out ''; diff --git a/vm/app/lynx/Makefile b/vm/app/lynx/Makefile index f449d27..016b1f5 100644 --- a/vm/app/lynx/Makefile +++ b/vm/app/lynx/Makefile @@ -55,15 +55,18 @@ VM_LINKS = bin etc/ssl/certs/ca-certificates.crt VM_BUILD_FILES = build/etc/s6-rc VM_MOUNTPOINTS = dev run proc sys -build/rootfs.tar: $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES) +build/empty: + mkdir -p $@ + +build/rootfs.tar: build/empty $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES) cp --no-preserve=mode -f $(PACKAGES_TAR) $@ tar $(TARFLAGS) --append -f $@ $(VM_FILES) $(VM_LINKS) echo $(VM_BUILD_FILES) | cut -d/ -f2 | \ tar $(TARFLAGS) --append -f $@ -C build -T - for m in $(VM_MOUNTPOINTS); do \ - tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," /var/empty ; \ + tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," build/empty ; \ done - tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' /var/empty + tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' build/empty VM_S6_RC_FILES = \ etc/s6-rc/lynx/run \ diff --git a/vm/app/lynx/default.nix b/vm/app/lynx/default.nix index f7791d8..b188794 100644 --- a/vm/app/lynx/default.nix +++ b/vm/app/lynx/default.nix @@ -74,11 +74,6 @@ stdenv.mkDerivation { PACKAGES_TAR = packagesTar; VMLINUX = "${kernel.dev}/vmlinux"; - postPatch = '' - mkdir $NIX_BUILD_TOP/empty - substituteInPlace Makefile --replace /var/empty $NIX_BUILD_TOP/empty - ''; - installPhase = '' mv build/svc $out ''; diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index 642c815..7103c0e 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -55,15 +55,18 @@ VM_LINKS = bin var/run VM_BUILD_FILES = build/etc/s6-rc VM_MOUNTPOINTS = dev run proc sys var/lib/connman -build/rootfs.tar: $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES) +build/empty: + mkdir -p $@ + +build/rootfs.tar: build/empty $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES) cp --no-preserve=mode -f $(PACKAGES_TAR) $@ tar $(TARFLAGS) --append -f $@ $(VM_FILES) $(VM_LINKS) echo $(VM_BUILD_FILES) | cut -d/ -f2 | \ tar $(TARFLAGS) --append -f $@ -C build -T - for m in $(VM_MOUNTPOINTS); do \ - tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," /var/empty ; \ + tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," build/empty ; \ done - tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' /var/empty + tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' build/empty VM_S6_RC_FILES = \ etc/s6-rc/connman/dependencies \ diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index e3bd996..55ae9cb 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -83,11 +83,6 @@ stdenv.mkDerivation { PACKAGES_TAR = packagesTar; VMLINUX = "${kernel.dev}/vmlinux"; - postPatch = '' - mkdir $NIX_BUILD_TOP/empty - substituteInPlace Makefile --replace /var/empty $NIX_BUILD_TOP/empty - ''; - installPhase = '' mv build/svc $out ''; -- 2.35.1