From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8F8DB722FB for ; Tue, 15 Jun 2021 13:27:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8D2B92D8E7 for ; Tue, 15 Jun 2021 13:27:55 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 1D0652D8DC for ; Tue, 15 Jun 2021 13:27:55 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id EB1B144022 for ; Tue, 15 Jun 2021 13:27:54 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 15 Jun 2021 13:27:29 +0200 Message-Id: <20210615112729.1099797-7-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210615112729.1099797-1-f.gruenbichler@proxmox.com> References: <20210615112729.1099797-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.800 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [RFC kernel 6/6] d/rules: close race between 'cp' and module handling X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2021 11:27:55 -0000 sometimes the build would fail with cp: cannot stat 'ubuntu-hirsute/.tmp_1987275': No such file or directory make[1]: *** [debian/rules:181: .headers_prepare_mark] Error 1 make[1]: Leaving directory '/home/fgruenbichler/pve-kernel/build' dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 make: *** [Makefile:58: pve-kernel-5.11.21-1-pve_5.11.21-1_amd64.deb] Error 2 if copying was slow enough. so let's do the copying first, then do the rest in parallel without needing to worry about side-effects. Signed-off-by: Fabian Grünbichler --- Notes: resulting debs show the same contents over a few rebuilds, but a second pair of eyes does not hurt! debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 0bd8eb5..6be3f18 100755 --- a/debian/rules +++ b/debian/rules @@ -114,6 +114,9 @@ binary: install .config_mark: cd ${KERNEL_SRC}; scripts/config ${PVE_CONFIG_OPTS} ${MAKE} -C ${KERNEL_SRC} oldconfig + # copy to allow building in parallel to kernel/module compilation without interference + rm -rf ${KERNEL_SRC_COPY} + cp -ar ${KERNEL_SRC} ${KERNEL_SRC_COPY} touch $@ .compile_mark: .config_mark @@ -179,9 +182,6 @@ binary: install rm -rf debian/${PVE_HEADER_PKG} mkdir -p debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME} install -m 0644 ${KERNEL_SRC}/.config debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME} - # copy to allow building in parallel to kernel/module compilation without interference - rm -rf ${KERNEL_SRC_COPY} - cp -ar ${KERNEL_SRC} ${KERNEL_SRC_COPY} make -C ${KERNEL_SRC_COPY} mrproper cd ${KERNEL_SRC_COPY}; find . -path './debian/*' -prune \ -o -path './include/*' -prune \ -- 2.30.2