From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7202866696458076160 X-Received: by 2002:a0d:f307:0:b0:52f:5d8:dd07 with SMTP id c7-20020a0df307000000b0052f05d8dd07mr880016ywf.382.1677048093120; Tue, 21 Feb 2023 22:41:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a81:ac2:0:b0:52e:c2d1:c1dd with SMTP id 185-20020a810ac2000000b0052ec2d1c1ddls2940203ywk.11.-pod-prod-gmail; Tue, 21 Feb 2023 22:41:32 -0800 (PST) X-Google-Smtp-Source: AK7set9CGZBxB7HVxXOLkQACmQrsgDAnMqSzhomaXY1+e0LV9169j3d7qzxMYJQArI6PiBFmQUHe X-Received: by 2002:a0d:d70d:0:b0:533:9d06:5734 with SMTP id z13-20020a0dd70d000000b005339d065734mr6423776ywd.29.1677048092416; Tue, 21 Feb 2023 22:41:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677048092; cv=none; d=google.com; s=arc-20160816; b=Sq0zJ83NNmLj8hTjh2QZEVRW2TDuajcNq7RXLr6skG7VtfBxQNHqnaWrRNZCU+gV+z erT5qzpgYsYTCmvT03vAR/qxzSgadmjWpR+wAH+pGak2ZFwE0uKAQEnyqL/p4CpDvML2 QLuPxsrgFwYP303DJ+xmXD789eitUUxVUGK6LWyFdAukJ5lQ3Jt6LXDmgVwFqJlP4bYU 9Qs346rQQqlmkqyb9GnVG603AtgXWAVxG2TlF99q4oyHgpraWLC2fFtMkfDzullxaNAK 1Awfr80oGKkUphh6yCgtlNUaj8LzXQGYh+K7ZFmnkdPMRZlfnOvbQIxBJ4JEHvsN8Mtg ZMNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=nAvTg2yOc2L4/EXeKqsZFgNLARqbvZHLYcQb+U3rxy8=; b=MYEx2+yHn5XGg/WqnYN+ovbcHslqSOBvz4RW9JBpFAAwW9UD7PPpbmB24XnVRO4Wxt cw219A/210wHhfBsvv7ZFMK86KdeXuUEVcUdlk5yOhqNE1yPAWRu99pEUUBKliEy16Au wYvXk3qllqEbg8u4ayJyt3xDG+Ko3tkyhQSyAn9q2hqKaigEHtoudtAuDoDrk2FsX6gI FVzX1B7NNphTo+s2WVkfEZJNDmqQHFTnhRm7L3lDUqe0nqYBMTwwseiisW97GjXLREcA YcmWPQ8jSMlqsc3dJbfE3s595MnFPWKlMuXV2D6Sxhrw2IXfLc1Mx22UbYkB5Qa3Y/pX ZxcA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id j135-20020a81558d000000b00533bad9d28csi580558ywb.4.2023.02.21.22.41.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 22:41:32 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 31M6fPcH011872 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 Feb 2023 07:41:30 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 13/13] isar-apt: Fix copying isar-apt to workdir Date: Wed, 22 Feb 2023 07:41:25 +0100 Message-Id: <20230222064125.22754-14-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230222064125.22754-1-ubely@ilbers.de> References: <20230222064125.22754-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: JHzTTt9VfRwH Using hardlinks (cp -l) for "dists" may lead to a broken isar-apt state when some parallel process changes original files in deploy directory and this is reflected in isar-apt in workdir. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg-base.bbclass | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index ee745ee1..e50e55de 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -227,9 +227,12 @@ do_prepare_build[depends] = "${SCHROOT_DEP}" do_prepare_build:append() { # Make a local copy of isar-apt repo that is not affected by other parallel builds - mkdir -p ${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH} - rm -rf ${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/* - cp -Rl ${REPO_ISAR_DIR} ${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH} + rm -rf "${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/*" + mkdir -p "${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/apt/${DISTRO}" + cp -Rf "${REPO_ISAR_DIR}/${DISTRO}/dists" "${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/apt/${DISTRO}/" + if [ -d "${REPO_ISAR_DIR}/${DISTRO}/pool" ]; then + cp -Rlf "${REPO_ISAR_DIR}/${DISTRO}/pool" "${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/apt/${DISTRO}/" + fi } do_prepare_build[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" -- 2.20.1