From patchwork Mon Jan 22 13:26:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 3310 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 22 Jan 2024 14:27:17 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f62.google.com (mail-oo1-f62.google.com [209.85.161.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40MDRGKl028665 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 22 Jan 2024 14:27:16 +0100 Received: by mail-oo1-f62.google.com with SMTP id 006d021491bc7-598dfff253bsf2903190eaf.2 for ; Mon, 22 Jan 2024 05:27:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705930030; cv=pass; d=google.com; s=arc-20160816; b=uRrLYL4RE6cyNvK0cigQ2MTsMj4OhvQekTRoCUVda7hQMavdBP17FGoL0jAhE2czUX lBU8cOR/LAuh8IY2LQHhSxnTag5BO+8ONITLyi3dGJeapFcm1BvRfRH+8lquwdQD2zyH WOasEOAQJ5NyHihouvNk+AtgCbg9kd98+Kkc+HqsGCLTCgWNkoVd/oMxudF1moAB6BKT ZoShNu+E7inMTilJEmG4hR18QLGew7ZV2Gh8nrKsBSomzEsnr+Qa/mzTj+OXs1pn5rdK tr76kTsQD1PUcSNR1vI+REvycwmAg4OicSKnCV4Sy/1eaJaPBnIMcYnNLMyzV/USd8xh BR1w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Kw7vUg/S2EYdF9hEAzq+TO+PqBl5vP0pB+mV2iDBhBo=; fh=puFkLcq8xxjet3iYA60Ig9ba7OyZp4soDT3DSsFDuAU=; b=SGYkuRCFL925T21T9KkPOf0qD0bofmkhbmQRtRthr2irUXAgC/svkhKdmd60SfOhHt Jn6WpzdEZH1dtHURW0KUJk3qbIhZB7NYA2jy41mNeveYtlqeUHQ3f6mbWJl6GXAPemFc AVb9GHm9L7PZJUndJO5buj27HJ28WMesHeHFukCsN2gjSaDHx7K4kyO4dnaH5XTKe+wN Sf/GGpnGyogVvY08+Yb1MoD73faHujPQK3rBsgK7l6+5NAzmksf0f6Wph3FYG8xu6MIo W4dJFyYSksPZ00JMb53oVKGXVyoGemwRdW28k3vqIgbi2Jp22rSQ5UuWRofn1yAkG6FK 2Y0g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=lOhr5dMB; spf=pass (google.com: domain of fm-1321639-20240122132708f0d2e9aa1c1af08a9b-ynnn0_@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1321639-20240122132708f0d2e9aa1c1af08a9b-YnnN0_@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1705930030; x=1706534830; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Kw7vUg/S2EYdF9hEAzq+TO+PqBl5vP0pB+mV2iDBhBo=; b=pkta7yUtlajWeqWgTraZZXtwDIaqyv3HllsnPzPNV8Vgp/kxqBBOh2KGRq7VneCPT7 ryFKyi69a5oF48/z/SeIbLIMvv3TXkCEAh1nAEe/wxWxHuV12FY51PbSAss5PXsO2nRL vBbKVOtjVnYSb9Mb5cJ5Zg3JQnlIhWZLaEU8hHwjSlog+6gaMiruT5XbE2cQtuPpvCqb QKeyNSjQb8pj9e/SYQnvuQiC/C37XobmWHT61oehkVQa/ZF1WcP79Ti9cvoxdicoFWGp BAhmOVYFqIOAW3JHmQsNxI06fs4vu+94Wd06rRKW+q01OSqLCK9QxyhmUiWlMgiF7rrh FyXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705930030; x=1706534830; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Kw7vUg/S2EYdF9hEAzq+TO+PqBl5vP0pB+mV2iDBhBo=; b=fWsfM7XUiR9jOQYcbtX5hP0n4fXI3DM4mE7WkWErZQ/vf6bFa1Bs45UXUc9TQIhHeu nvrStkcj/R/Ff2H84fMTGQIzdjjJrvvRx1e8LiT45ILrFcRi2iqM12LLqKvt7mRryfKe mIDcRZu0WltJ27Lf9f7Eh/97DL7jrqaXqwRPpHZCBGZOnkxygS3+yEDo/Nx9dCFvZNZm tEOG9rMcViMpwR1rDyVaMEMjrbpzFgdovQ5EUN9PrINFFEt0dufHbQRsmbMhOuOBu2hP RxCH/3HSUqGBsp71zljTBi4ypbjP6yivSUi8WVo57YrKXH9L5sQyaU9O59Ygsz6byH3+ JbTQ== X-Gm-Message-State: AOJu0YzHnZV79zLi5aGY8a9vOQ0sw0Uuj8sQEohjg6CgRcHNjYdzBqOU 9iMOlPwytaX5TFbCGSNQ+AxbGQrgBiXO0XYe+ApN72ZPFT1LJ1QR X-Google-Smtp-Source: AGHT+IEJqG9sIEeMrm4GtzANRwDq42s8QRD00HZH+rQRb7A/QadKZjLWcJFBw4lCC9nZiJAu+n05Pg== X-Received: by 2002:a05:6358:7f18:b0:175:6b96:95d1 with SMTP id p24-20020a0563587f1800b001756b9695d1mr1780923rwn.47.1705930030227; Mon, 22 Jan 2024 05:27:10 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a0c:b345:0:b0:681:55ad:8a2e with SMTP id a5-20020a0cb345000000b0068155ad8a2els396447qvf.2.-pod-prod-02-us; Mon, 22 Jan 2024 05:27:09 -0800 (PST) X-Received: by 2002:a05:6102:225a:b0:468:1629:6beb with SMTP id e26-20020a056102225a00b0046816296bebmr1519322vsb.17.1705930029356; Mon, 22 Jan 2024 05:27:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705930029; cv=none; d=google.com; s=arc-20160816; b=ED40OKOkBrQkd4FmnJaXKqjyWM8rVptQC4XKnXXZabDZiKJeyXUa83AUTpi+Gxm3al lNeVFeN9swkKcq0m7Loc5QDvV8ZCSnV+0ckbHNDr1bv33QsdbiVS175z+HTNpF8GWQn0 5ivVAdgkpievj/tZSbhDlQyK6t+tCurmevTP3G7p89YxTdZ14QsvD41qIgy6L+orqccR HFBLpyAa9iLXL3is7x94afGWzRmMrKEfUdJpNrVi1vCER2CfLPEhfkn/f9p4PXSV08th BABIXDsqLE2rVqxm0Lx5QxFrmRF4Dv8MV1guDOq2YT9mkKKo2xeWRtQEggeRTUlmq3Xu fFdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=DsJKOBTVe2BUXf4a+ZfAwM1AbSJiciyCCeRkYY4HFI8=; fh=puFkLcq8xxjet3iYA60Ig9ba7OyZp4soDT3DSsFDuAU=; b=YKS8SEg5H8ZMp/xszkbDxu0aAE1cDGX9MGMhM8JxkBiBWZVNpLsNr9PlaQ6qAtOZkX sEy6bg5Drx9lu8gpaoVyaBjS/p4i7Q2S7MLNS1S3NgyB5Jw2ZLzcD74gluqgeOv547sc xIf3f+Bjh9est7mMtAHVN4qRUKxTSNIHVAUZwTV5dNRwkA4YJFX7qp7mPN42r0xWRB8U h0ILD3W8biCm44KB4jhRoeqopwOHyVit3QbnBd/sc9JMFtGel0y4dJJSNIXiCQg5fh01 edDWi9tQv75qLrusC2D75vSY1uMik6usjvX4wLTHAeq7mgJlrDbc5EexSMtuaHgIh24/ dCXw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=lOhr5dMB; spf=pass (google.com: domain of fm-1321639-20240122132708f0d2e9aa1c1af08a9b-ynnn0_@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1321639-20240122132708f0d2e9aa1c1af08a9b-YnnN0_@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-228.siemens.flowmailer.net (mta-65-228.siemens.flowmailer.net. [185.136.65.228]) by gmr-mx.google.com with ESMTPS id cz15-20020a056214088f00b0068564a8ca69si394095qvb.5.2024.01.22.05.27.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2024 05:27:09 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1321639-20240122132708f0d2e9aa1c1af08a9b-ynnn0_@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) client-ip=185.136.65.228; Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 20240122132708f0d2e9aa1c1af08a9b for ; Mon, 22 Jan 2024 14:27:08 +0100 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: "MOESSBAUER, Felix" To: isar-users@googlegroups.com Cc: amikan@ilbers.de, jan.kiszka@siemens.com, quirin.gylstorff@siemens.com, Felix Moessbauer Subject: [PATCH 1/1] fix copy out of apt cache after sbuild Date: Mon, 22 Jan 2024 14:26:47 +0100 Message-Id: <20240122132647.779902-2-felix.moessbauer@siemens.com> In-Reply-To: <20240122132647.779902-1-felix.moessbauer@siemens.com> References: <20240122132647.779902-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1321639:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=lOhr5dMB; spf=pass (google.com: domain of fm-1321639-20240122132708f0d2e9aa1c1af08a9b-ynnn0_@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1321639-20240122132708f0d2e9aa1c1af08a9b-YnnN0_@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= During the setup of the sbuild chroot, all packages from the global apt cache are symlinked into the sbuild chroot. After the build, the newly downloaded packages should be copied out from the local cache to the global apt cache. However, the current logic tried to copy out all packages, including the symlinks. This does not work, as the symlinks might point to non-existing locations. This is now fixed by only copying out the newly downloaded debs (the ones which are not a symlink). Signed-off-by: Felix Moessbauer --- meta/classes/dpkg.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index c699a84d..3057329f 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -121,7 +121,7 @@ dpkg_runbuild() { --chroot-setup-commands="mkdir -p ${deb_dir}" \ --chroot-setup-commands="ln -sf ${ext_deb_dir}/*.deb -t ${deb_dir}/" \ --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \ - --finished-build-commands="[ -z \"\$(find ${deb_dir} -maxdepth 1 -name '*.deb' -print -quit)\" ] || cp ${CP_FLAGS} ${deb_dir}/*.deb -t ${ext_deb_dir}/" \ + --finished-build-commands="find ${deb_dir} -maxdepth 1 -type f -name '*.deb' -print -exec cp ${CP_FLAGS} -t ${ext_deb_dir}/ {} \;" \ --finished-build-commands="cp /var/log/dpkg.log ${ext_root}/dpkg_partial.log" \ --debbuildopts="--source-option=-I" \ --build-dir=${WORKDIR} --dist="isar" ${DSC_FILE}