From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6876081984106397696 X-Received: by 2002:a19:87d6:: with SMTP id j205mr290677lfd.271.1600983134936; Thu, 24 Sep 2020 14:32:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9ed2:: with SMTP id h18ls75966ljk.0.gmail; Thu, 24 Sep 2020 14:32:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPUYKHXV/l7niIsNGYxEcGcRjmHuoXVYHTSPmaF5Gy1SZqx0dT6RCyPxtAY1vLURO429PL X-Received: by 2002:a2e:9bc5:: with SMTP id w5mr289809ljj.454.1600983133886; Thu, 24 Sep 2020 14:32:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600983133; cv=none; d=google.com; s=arc-20160816; b=zZH/J/7Yoi02F2Wtj9iqe7s0pAeANHPjsUAbxCX6dT+N2a1yv17t/ymadf1B1PFK8a DVDu84AqZbcGjHiiAuIkHljsGsCeUSvlkGfsoAqdAOS9YcR9j/7HpiRcL0AaWA7dN4C9 WzAq597BkM8NfhMkXoLv2Ak2fSz8cJq8huQZPT6lgs0DAQr8WAKYq79u8uRMz1JSQzOL i1AJrByOMjHvGXvPm8A8DyWxQpuCspNILNXoRmCwF3hMAxT/66ZVJBofJdj2k4FbhXkp 7iI9EBeTxT6DTh0HQIgdrFYQ7kZVACB51B1rHHxF9DIzZXrLikxe2t/hoVW5EaNg3+UD q3tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=rAhRlVQBQenp6ZX+H0UTixRMp0FZhtqaWs6hqlQJta8=; b=NDa5SJJvXTJQLN+XtuKWISVbFHRGVzdFXqZUP1+uvdOth+jnodgH0I3mgQdkLqheQ7 6S9kLzEFSJ+YnOVxwu+SWByH/ZvitdDmoNWw5Pw+UPItF2rimZ7Wls1aN7t4abVbPvUX AmApJR2iK/vb/8Wt+JfwPyIJ+9ACmZnrbuc7IllGjxlbwbOwXDnXrvYwq68k4X2i18q3 qii+gM7SdlqfSUWAZsZO3SsiStKHiJWYrMCJ9h10n2IJ/yb+09IN5h4m1QQRfRfbMItM 3Xpp3NhIT/BCP3Wlg7du0We+juc5cy//T5gGAzYrNIk/FGGebDof8TnhN8Vht13AYKkF ZmyQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id x74si14448lff.12.2020.09.24.14.32.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2020 14:32:13 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 08OLWD6m002360 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 24 Sep 2020 23:32:13 +0200 Received: from md1za8fc.ad001.siemens.net ([139.22.41.43]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 08OLWCCX006785; Thu, 24 Sep 2020 23:32:12 +0200 Date: Thu, 24 Sep 2020 23:32:09 +0200 From: Henning Schild To: "[ext] Jan Kiszka" Cc: isar-users Subject: Re: [PATCH 4/5] dpkg: Account for changes in mk-build-deps in bullseye Message-ID: <20200924233209.3c808a50@md1za8fc.ad001.siemens.net> In-Reply-To: References: X-Mailer: Claws Mail 3.17.6 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: zkHfjiLq2aQo On Thu, 24 Sep 2020 17:49:50 +0200 "[ext] Jan Kiszka" wrote: > From: Jan Kiszka > > In bullseye, mk-build-deps now emits two log files. When rebuilding > debian packages, those files end up in ${S} and will be recognized by > the package build as deviation from the source file. Avoid this > failure by stepping out of ${S} before calling mk-build-deps. > > Signed-off-by: Jan Kiszka > --- > meta/recipes-devtools/buildchroot/files/deps.sh | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-devtools/buildchroot/files/deps.sh > b/meta/recipes-devtools/buildchroot/files/deps.sh index > 93bc9cf5..1d617bc8 100644 --- > a/meta/recipes-devtools/buildchroot/files/deps.sh +++ > b/meta/recipes-devtools/buildchroot/files/deps.sh @@ -33,17 +33,20 @@ > if ! grep "^Architecture:" debian/control | grep -qv "all"; then > set_arch="" fi > > +control_file=$(pwd)/debian/control > +cd .. Would it be a good idea to make this absolute instead of relative? Or maybe we can make mk-build-deps place those temporary files somewhere else? Changing the working directory somewhere inbetween can be pretty confusing when extending later. Henning > + > # Install all build deps > if [ "$3" = "--download-only" ]; then > # this will not return 0 even when it worked > - mk-build-deps $set_arch -t "${install_cmd}" -i -r debian/control > &> \ > + mk-build-deps $set_arch -t "${install_cmd}" -i -r $control_file > &> \ mk-build-deps.output || true > cat mk-build-deps.output > # we assume success when we find this > grep "mk-build-deps: Unable to install all build-dep packages" > mk-build-deps.output rm -f mk-build-deps.output > else > - mk-build-deps $set_arch -t "${install_cmd}" -i -r debian/control > + mk-build-deps $set_arch -t "${install_cmd}" -i -r $control_file > > # Upgrade any already installed packages in case we are > partially rebuilding apt-get upgrade -y --allow-downgrades