From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7194774660571987968 X-Received: by 2002:a17:902:c94e:b0:193:91b:980d with SMTP id i14-20020a170902c94e00b00193091b980dmr5423518pla.25.1676274283279; Sun, 12 Feb 2023 23:44:43 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:fa49:b0:233:e65f:ffb9 with SMTP id dt9-20020a17090afa4900b00233e65fffb9ls3214201pjb.3.-pod-canary-gmail; Sun, 12 Feb 2023 23:44:42 -0800 (PST) X-Google-Smtp-Source: AK7set9OaZVaaovw+tirBSbfuMMftPSOZOj4uXl02Aw+bjpVCS3bnoXmbu+/PBgvD7SZLCCZSN3H X-Received: by 2002:a17:903:24c:b0:198:a715:d26d with SMTP id j12-20020a170903024c00b00198a715d26dmr25862362plh.8.1676274282355; Sun, 12 Feb 2023 23:44:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676274282; cv=none; d=google.com; s=arc-20160816; b=QQC5/RWpAugxZzbtaIgwD73NxMacDp2UW2vdAA+YSDLWd2xUkeqjxCFOlOTUK9m7Fh 27Y8je60ZB6RJodwKPInF8ogTOtVYyJ20bAKDiCkhEwJAYWSuTFgOFwHEvFeaK889PJM yKAmXXU4U2tx4e3mhoJg7P0vGeEPZ1NBggEqr5ad871WkEpGR9GKp3xxtItR268qnoOu RZxNvENBtqnYwctkuxAgSx0N/Cb5EfzbVyrPlp5QOwIqVga5vAfO6mobjNGY5kWgIv2e a1iBYnhCyjs9MnKI59laRO9AsSp5m5pmzIONsCK9nkrjdgJgUqdRj9VGchuVdZV15cvp ONSg== 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=4HEoQFG2icGJ8O+cejiUvz1/ig4VTfJkKO92g/JcOnE=; b=T4YA+yGFxSnlNS4sfMLV2Q/hbcBbAxU6pCPJXUYKVCeUBBQWcz/xtQ9H/AiTZ/HR8F V4EOG5AGydoNsgu1HVpgnvrSlgBktGGBoZ2flxhfyjuvQwH9Xo9RTfSlAetn1hMzJBrb 4l6V6V/p61GLdHnF+wSC+4k9ZumKvyOSEU/3StnANH0BaBGaFc8FS+zswQH5XwXVs9Qp UBWJyuaRykMd5HcvUPy3jhjyG02erBbs7pxwp85ZqiMS0D9i+3SiMhmEyEPT/qiPERdB 7AxCIr20T2H7XrEdm5k19BuVaxuCAfN65xRHFNeCRwxdxHP75fSAeamqsuEI04yqJs1p PGfw== 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 n10-20020a170902f60a00b001990cb9ce78si743078plg.1.2023.02.12.23.44.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 12 Feb 2023 23:44:42 -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 31D7idfR003647 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 13 Feb 2023 08:44:39 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3] deb-dl-dir: Fallback to copying when import-export Date: Mon, 13 Feb 2023 08:44:39 +0100 Message-Id: <20230213074439.23410-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: hoC/9YemTdlN By default, hardlinks are used when doing DL_DIR import and export. This fails if DL_DIR's filesystem differs from TMPDIR's one. Fallback to file copying (with lower performance and huge disk usage) in this case. Also rework sudo using when import/export by preferring "sudo/while" approach instead of "while/sudo" (less spam in system logs). Signed-off-by: Uladzimir Bely --- meta/classes/deb-dl-dir.bbclass | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) Changes since v2: - Reworked sudo usage approach from "while/sudo" to "sudo/while". Changes since v1: - Try create handrlink first and then copy if failed. It should better handle hardlink issues that may happen even on the same partition. diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 7db25251..ca2a1ee2 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -81,20 +81,24 @@ deb_dl_dir_import() { export rootfs="${1}" sudo mkdir -p "${rootfs}"/var/cache/apt/archives/ [ ! -d "${pc}" ] && return 0 - flock -s "${pc}".lock -c ' + flock -s "${pc}".lock sudo -Es << 'EOSUDO' set -e printenv | grep -q BB_VERBOSE_LOGS && set -x - sudo find "${pc}" -type f -iname "*\.deb" -exec \ - ln -Pf -t "${rootfs}"/var/cache/apt/archives/ {} + - ' + find "${pc}" -type f -iname "*\.deb" |\ + while read p; do + ln -Pf -t "${rootfs}"/var/cache/apt/archives/ "$p" 2>/dev/null || + cp -n --no-preserve=owner -t "${rootfs}"/var/cache/apt/archives/ "$p" + done +EOSUDO } deb_dl_dir_export() { export pc="${DEBDIR}/${2}" export rootfs="${1}" + export owner=$(id -u):$(id -g) mkdir -p "${pc}" - flock "${pc}".lock -c ' + flock "${pc}".lock sudo -Es << 'EOSUDO' set -e printenv | grep -q BB_VERBOSE_LOGS && set -x @@ -109,8 +113,9 @@ deb_dl_dir_export() { if [ -n "$package" ]; then cmp --silent "$package" "$p" && continue fi - sudo ln -Pf "${p}" "${pc}" + ln -Pf "${p}" "${pc}" 2>/dev/null || + cp -n "${p}" "${pc}" done - sudo chown -R $(id -u):$(id -g) "${pc}" - ' + chown -R ${owner} "${pc}" +EOSUDO } -- 2.20.1