From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6876081984106397696 X-Received: by 2002:a05:600c:410e:: with SMTP id j14mr1548541wmi.13.1601017376955; Fri, 25 Sep 2020 00:02:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:e3c3:: with SMTP id k3ls2114486wrm.1.gmail; Fri, 25 Sep 2020 00:02:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxETbeQkqLQ4Iqeb5TvZriVAMSps0Rv+R+xS97b9WrEc9ay0VT+alcSn/cHf9QvMOcOajLR X-Received: by 2002:adf:f04c:: with SMTP id t12mr2847287wro.121.1601017375910; Fri, 25 Sep 2020 00:02:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601017375; cv=none; d=google.com; s=arc-20160816; b=dvESHr6sJBFqld2o25JyhGX0CpiZH3p86dkWe0bLAGixPbcAXQP3bxIffNgTR05eqR yQqTLD/PgpPvCwpKeXCf7Yzb3tQleL2rKS1PIVK3VulZdilAS1ONO0uzi/AKA9bn9ZuG bNVIA9ZU66d7pdNcqQqH4ft4i/77HjcWyCnmx7d2NmLL/T/y460d5qXRCP8YCxgoADLF n0KmlwKhHTSx1VB91PrqF+5zrKf9stx5VxQNGN+r9OCIliTrQiEcZUFYi4JEYuUUTVHD SZdF3JZdgU8+CguTR/4uvaDIKQhxHAO41V2iPD/X7sCfc9v8rEZdG76XSXiZMG+oKCc+ qPWg== 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=KbH0CFX6W+JkvnrntDRNgDGRRrhrM/qugEvoxVNCXyY=; b=IqMGn37DEN2Hld2eb+xbGJwz5HU/sNBbr7/HFglh48HJbqY7KReby2rmUA/pFjuUcJ p9f9O4JoyimXsB1VfW3vfngR+sSLylCn4RAtnilV5eiQ3J9EY5Qu4Hk0Ug4+HAQbaVCT DqYcXEGsgkATrlF/58GsB+yGUo/wH4ZRSTqJ1bc5kYH9d+pnrGxHOPjugrpdf151erfN sHCXu52BvhSwfQTg0kSd46/NxrNhe9DsYM2PX78O/r9fGZWV1klZO62P4fC96GSb2LE2 F2uTIjWl7NImPerdo7s+eGeuq82jymtc0qdNYUyOClS3fR/9eW/mta9JKcgu62lWs1f3 lq9g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id w2si44484wrr.5.2020.09.25.00.02.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Sep 2020 00:02:55 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 08P72tjF006469 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 25 Sep 2020 09:02:55 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.40.113]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 08P72tea024574; Fri, 25 Sep 2020 09:02:55 +0200 Date: Fri, 25 Sep 2020 09:02:51 +0200 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH 4/5] dpkg: Account for changes in mk-build-deps in bullseye Message-ID: <20200925090251.150002b5@md1za8fc.ad001.siemens.net> In-Reply-To: <77ff1957-bfa0-fe22-a967-bcdf17160a3b@siemens.com> References: <20200924233209.3c808a50@md1za8fc.ad001.siemens.net> <77ff1957-bfa0-fe22-a967-bcdf17160a3b@siemens.com> 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: DUgE1vKu6Rs2 On Fri, 25 Sep 2020 08:21:25 +0200 Jan Kiszka wrote: > On 24.09.20 23:32, Henning Schild wrote: > > 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? > > The latter was my first thought as well (or some switch to suppress > it), but I found nothing in the mk-build-deps manual. Well whatever these logs say, we probably want them somewhere under WORKDIR for debugging outside of the chroot. > The former depends on a good suggestion for a path. Would possibly > mean refactoring the interface of this script, passing in ${PP} and > ${PPS} separately. Would that be better? I do not feel strong about it and it can probably stay the way it is. We are covered by conventions and from S (PPS) .. means WORKDIR (PP). Henning > Jan > > > > > 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 > > > >