From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7219176629804728320 X-Received: by 2002:a05:6a00:a90:b0:625:5949:6dc0 with SMTP id b16-20020a056a000a9000b0062559496dc0mr661529pfl.4.1680845541265; Thu, 06 Apr 2023 22:32:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:390d:b0:230:cffb:708e with SMTP id ob13-20020a17090b390d00b00230cffb708els3618899pjb.0.-pod-preprod-gmail; Thu, 06 Apr 2023 22:32:20 -0700 (PDT) X-Google-Smtp-Source: AKy350ZpTJi/YoQxYB3Ld2Y9JcQW79gFv4VFVpkID6THJaeI4qqXrQYVSY/h4yC8JHKnOfmXs2fR X-Received: by 2002:a05:6a20:c413:b0:bf:8a97:6e48 with SMTP id en19-20020a056a20c41300b000bf8a976e48mr1650962pzb.37.1680845540291; Thu, 06 Apr 2023 22:32:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680845540; cv=none; d=google.com; s=arc-20160816; b=ZeZKTgu6kOaLbJ/aUXVep6AFQPxtV2rR3qd+m7D6YsgX8l5hKFVYILNPcEK/Gz27LA 6V327loKjuSLaLkKreCAATvo+1Gv2noFPZpiKdqd4tJiU9pktZo30BMDScsUfhVM5xrG c+iYTlM820F0T7kHVPHIJs/Ma++h2yzcUWmtFGyqdLFZHI49LbWCAZ4QNYb98s3dznHL Vb9udLByEtTAx1tlk0X4yieA9FOzgDBAv2XBvr4vcHMjBEkVTv8ITlhjSIxwPxoUKkEL FXiFDk1BAAXniK7IW7wzb64W0fsOPwF0AVemCxFPWIa1Hcx7uhosxSpTH2UOa45CfMdn /UXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=cMqta52DfD1K+46DAjpMhlgCzfTfqukGdgezQpfViog=; b=0QB6c9KTpr4JHSs4xz8yePHnE9r7NvTIUgtK7JXwjnLY104GHEARo6rikG2rjbgrco P9JiiO/XyjWe5vAH78p/IcNKx+OZQuiP0nz/ziHPJMqd6V65XYf9WyhC5mX/sT6dn+TT pG3aWCqrsF+Kz8JZJdWN3HdTY8UED3yy//EJW3NC6q5PkfY/eRzoKQR6F2B2ecCLcAAA /1OMWAkMh5+cUNxb7PIIw/bZ163+b9/gLsQlPgVc0eb9opClcqGv4rC4++gO6wgnoZrr YpIWEceTaYicdIOQLHz0qtrEiUkKnFr80DXwU4YP2Gi+VFJokYZLn/X9SqJzvGv9Dyhr nHJA== 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 ay28-20020a056a00301c00b005a8c9293ba3si380549pfb.0.2023.04.06.22.32.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 06 Apr 2023 22:32:20 -0700 (PDT) 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 3375WHqm022975 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 7 Apr 2023 07:32:18 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] isar-apt: Fix copying isar-apt to workdir Date: Fri, 7 Apr 2023 07:32:17 +0200 Message-Id: <20230407053217.25921-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 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: mqIVdAjeBsdi Using hardlinks (cp -l) for "dists" may lead to a broken isar-apt repo state when some parallel process changes files in original isar-apt directory and this is reflected in local isar-apt copy in WORKDIR. This patch keeps hardlinks only for "pool" and uses copy for "dists". 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 a70f12ff..e3412c82 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -191,9 +191,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