From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7326913682852544512 X-Received: by 2002:a05:6122:1823:b0:4b6:c9fb:b185 with SMTP id ay35-20020a056122182300b004b6c9fbb185mr1603901vkb.23.1705930030340; 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-Google-Smtp-Source: AGHT+IE19G+yeYbNW+WxvTv3wSs6r47SX+cOalElbm/as0bdmMI0CqUnN7QD9WrT2UUPCJDmkSbG 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 Return-Path: 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; 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 Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 20240122132708f0d2e9aa1c1af08a9b for ; Mon, 22 Jan 2024 14:27:08 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=DsJKOBTVe2BUXf4a+ZfAwM1AbSJiciyCCeRkYY4HFI8=; b=lOhr5dMBlSf+O93DHwIYM5+3/ByWyE2mRwtO74T/EvoctP4VEASdzD5dPdtcI3f51ZDIGu Xy4QtafcfW+U+Nez8bnrwu4MRCz96AKWaMlhsrCuVt6afjmHBuAz9HpODphFycuk9S1wSpVV YKSy85hd+M01zbZ9YbSFVUp1lsnu4=; From: Felix Moessbauer 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1321639:519-21489:flowmailer X-TUID: c7N6Dw3tCsxr 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} -- 2.39.2