From patchwork Mon Feb 26 09:55:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cedric Hombourger X-Patchwork-Id: 3372 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 26 Feb 2024 10:55:31 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oa1-f63.google.com (mail-oa1-f63.google.com [209.85.160.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 41Q9tT9o025023 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 26 Feb 2024 10:55:30 +0100 Received: by mail-oa1-f63.google.com with SMTP id 586e51a60fabf-21ff3a07718sf1302543fac.0 for ; Mon, 26 Feb 2024 01:55:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708941324; cv=pass; d=google.com; s=arc-20160816; b=yRbcxvdTp7uLy7TdhX0S4Ogus+lGWCT/ROco3VGH2cezKxCZwFqIbD966O4VfvoXQx MkitIHpD2sPZ+55ik/PDQRmr+Unu0Muc7GhFPtAqT/EmwTFxExCG+0QQtIgjBdgKHHdP 5MpjlBwEuC1woStfRgzzmfUF79BmdkrjUoVBOSux3wrGqCjM12Q5h+qL2FiGb8AFdnoK Nf5sLSFl7OuZ+3CsexfDn0MxjD5TsijEJ43Y6FTmCl7NFEmFqsNBnspBaFSgT9gFkrZq BJ6PXtaVWY2YqlmkUie2LgZpfKiKTscbWzD/9jPV+CRfCNLQ9B/yx+/e6J1Hidvmv+BT diqA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=CoHxJ6dgXNELrzUvg18kHixp8zsyDgJP110qFNnFv20=; fh=dxqFiNc3NOZXGE7wARMprsvqakrUcdhNOOffd3VvBw8=; b=vfdzflYNnmX7R4klrxxrbal8KPeiA6duTLTPjpiTB8X/EhDsyCNbY+J2hWCNZYeBBu bqh5PWJC9WsX7crvMgFamCIrw76ckMAJ/Jzt6egJm/LFY+jYMuVhxeX253RSvZLq/fzd 881Zt8Z1v3OjZsFmPysWjDHycvpLVntQ3HJeuIZO3tGvTMoirKnarQU8WIqZdbjIv3BH iHbBRIafV8lHEFAca5pqN8Xk5KG0prgZqVkmTwQjbKSYSJ33m3jwiFgdX8hSyVCWDo1s XSy3xyuMNpkxtfg0eL8tEPj10v1RbygrQ3m8O4xlEcoZXPUUGmqIOhf9btAItWW7D2KY AcBQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=pg3bOjqF; spf=pass (google.com: domain of fm-1212295-20240226095521d56493bf429e7db2e4-mwhxpg@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1212295-20240226095521d56493bf429e7db2e4-mwHxPg@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=1708941324; x=1709546124; 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:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=CoHxJ6dgXNELrzUvg18kHixp8zsyDgJP110qFNnFv20=; b=A2or/MLQ0RmyuYxL7iY0namS3v0dPkDJtBuch4X1fbDUEVXSJa7iqOj2ughx2ToGlB gMv1kcnZ2+1vTkQCy8grxyHlQZh9vQLSYN6laL/bRsm+TCKXjhRfSsEb199YmOoDwCJS H8GA5tkkao7KVG3c59QsVpCgQRx+/x36OYOTCzh2V+tK10EwuSRmsD2HHV/8XtDdQZRj DWBZ0FareTv0OcgyjRDXt4AVpXbItYvrr6Oukw5aOU7F1tKffFsuh9SbJbcZJXGJg+sf sC0iZPh1Ghqm75x3F8FPGuuriD6iwWPf+IooKrRZ5xOcla3rcRg0H0FAnbXIqHuDDL6x fi6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708941324; x=1709546124; 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:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CoHxJ6dgXNELrzUvg18kHixp8zsyDgJP110qFNnFv20=; b=DukhrQpJK5BhGaH6Uhnhs8XYybDm+Yck4mDBXd2Zaj3qYXZh6E3PzBWg0DLKuMBLQ/ B80cjvnbZNkwXNSCxU1YIXNWB9vh7qGeKUZZZqJOCdWJwvW1HpSeRb4EZBTeEBR6BXIf BN7Mhk7rcTBKbRQxbUIhu3x7kWmHdn7dc8A8CFqji4uXgy3hFJVjtddVzwkAlPFaOx+V Nv39BEgA0fpEwT+zNqM33fZzMJvlYxk7i3qiQqYzbDnxJlQbj96LmF7FZlapLCicxHxr mzbu9ceVo1SgBODG4nyGcTZCZdfM7zyGcIxa32i5MrkOyk/Mp5YGtokVOTwfsMBDRQbX p3Qw== X-Forwarded-Encrypted: i=2; AJvYcCUdyFKZDglv5823cEOI8WiX8HsHM7A+Vz881xKO35/0Yq4U7onfTby9aNYgE6eVdnHus3KhxaxooJIVNjIPklb6lXVIrzk= X-Gm-Message-State: AOJu0Ywg8gSi1xYUSLqp7W08wy0dUbhmTgwew01gIqqJhO4I5Aqe9k2r YmhCMnDB5/F196KuF7t0/8ScvWlVtF+GgFnt1hAifyYtsuBViwQE X-Google-Smtp-Source: AGHT+IHDkZCoeqORShtFrpzz6BgmjYh6fPzPk6CMILIKnObbmdIQw/zeLTHd7Hwud/oLZRZwZpmilA== X-Received: by 2002:a05:6871:e026:b0:21f:2010:3651 with SMTP id by38-20020a056871e02600b0021f20103651mr7181470oac.48.1708941324303; Mon, 26 Feb 2024 01:55:24 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:ce4c:b0:21f:a0f8:8272 with SMTP id xd12-20020a056870ce4c00b0021fa0f88272ls2997727oab.2.-pod-prod-02-us; Mon, 26 Feb 2024 01:55:23 -0800 (PST) X-Received: by 2002:a05:6808:1a08:b0:3c1:a8c5:7679 with SMTP id bk8-20020a0568081a0800b003c1a8c57679mr326511oib.7.1708941323635; Mon, 26 Feb 2024 01:55:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708941323; cv=none; d=google.com; s=arc-20160816; b=Ume9LZIAnDe00eAKDZwF92bXb2KpUuOhYhOhsVDblzCjvpeN8r68OwfaPZt6melngB j6BiUVRSjYhmFofqZDSDe+NCNFSPl7QSyRGJIZoWFn5B0QfWq0yBS2ArSWMAHGnpOWTA oex50FbGYxpBAPu6y8b2MRns9QhDtL6ckPtzhSsPiVwac5Jew0CdZ9f41oM02DXyS+l5 dLA7lAgTKgsStysTwAyjR2rdsyap4CblpZfQdb6ncgnpDIpEKow0lvLAJOZz0nj3/+Qh MY5QSh7NDJT4LQInkadYS51Wf9bi5XQgAEQJa65DcFpBNIgOioaYeSFEDZlBdtUVer58 SAAQ== 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:message-id:date :subject:cc:to:from:dkim-signature; bh=VDpA3HJw4CXn4+Z0v6avVks9KeCJIjYyVKQuyMYbpWo=; fh=1z37pEVhqwMLlkT4FDzOga7XBsM6Rzv6sXOq0pipxqo=; b=qiKy5NhMI+rOZc6SvJpyjfulvZ99N++vAzJpeXVFjIGXWVHUCDHM7/UfYnHtr/Lg43 UYacjWAUgGX/fBfmeeUJ+xSXDopxmMcC1KDTtW1hdP84qLshhDzY7xDsZcnl85Q0vSI9 nenag1cSfXMi03bnBpEhjmPqGpWW3+ZJdvcN1phUuch7gA1UukXLQqEush7olDVtf/pn T0DkkoRZU5+m1NsWJayhviHG5RhK+a9A5pgqh5Hk4jxI/uN886xmkUwO2oNjlHANNkZD RRIzmJTL8wHtDrKiwMSD1ErfyEMKhumOlnQv0crJ2fER9gD3IEUuqFxHyQsOXEFwKq0T ltjA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=pg3bOjqF; spf=pass (google.com: domain of fm-1212295-20240226095521d56493bf429e7db2e4-mwhxpg@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1212295-20240226095521d56493bf429e7db2e4-mwHxPg@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id y15-20020a056808130f00b003c176bd214csi398108oiv.5.2024.02.26.01.55.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Feb 2024 01:55:23 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1212295-20240226095521d56493bf429e7db2e4-mwhxpg@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20240226095521d56493bf429e7db2e4 for ; Mon, 26 Feb 2024 10:55:21 +0100 X-Patchwork-Original-From: "'Cedric Hombourger' via isar-users" From: Cedric Hombourger To: isar-users@googlegroups.com Cc: Cedric Hombourger Subject: [PATCH] dpkg: use find to create symlinks to downloaded .deb files vs ln -sf wildcard Date: Mon, 26 Feb 2024 10:55:17 +0100 Message-Id: <20240226095517.66032-1-cedric.hombourger@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1212295:519-21489:flowmailer X-Original-Sender: cedric.hombourger@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=pg3bOjqF; spf=pass (google.com: domain of fm-1212295-20240226095521d56493bf429e7db2e4-mwhxpg@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1212295-20240226095521d56493bf429e7db2e4-mwHxPg@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Cedric Hombourger Reply-To: Cedric Hombourger 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_H2,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?= If no .deb files were downloaded from remote feeds, use of "ln -sf *.deb" will create a dangling symlink named "*.deb" in the target directory and will be a broken link and make the cp command used in the finished-build-commands fail. Use "find -exec ln -t -sf {} +" to create symlinks instead of "ln -sf wildcard". For consistency and optimization, the find command used to copy newly downloaded .deb files from the sbuild env back to the build env is also changed to use the "{} +" -exec flavor (instead of "{} ;" which spawns one cp command for each single match). The issue of a dangling symlink named "*.deb" was found while building against file:// sources and no remote feeds. Signed-off-by: Cedric Hombourger --- meta/classes/dpkg.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 0578977d..3fa9f604 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -120,10 +120,10 @@ dpkg_runbuild() { --chroot-setup-commands="echo \"APT::Get::allow-downgrades 1;\" > /etc/apt/apt.conf.d/50isar-apt" \ --chroot-setup-commands="rm -f /var/log/dpkg.log" \ --chroot-setup-commands="mkdir -p ${deb_dir}" \ - --chroot-setup-commands="ln -sf ${ext_deb_dir}/*.deb -t ${deb_dir}/" \ + --chroot-setup-commands="find ${ext_deb_dir} -maxdepth 1 -name '*.deb' -exec ln -t ${deb_dir}/ -sf {} +" \ --chroot-setup-commands="apt-get update -o Dir::Etc::SourceList=\"sources.list.d/isar-apt.list\" -o Dir::Etc::SourceParts=\"-\" -o APT::Get::List-Cleanup=\"0\"" \ --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \ - --finished-build-commands="find ${deb_dir} -maxdepth 1 -type f -name '*.deb' -print -exec cp ${CP_FLAGS} -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}