From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6876081984106397696 X-Received: by 2002:a19:992:: with SMTP id 140mr751132lfj.273.1601014887939; Thu, 24 Sep 2020 23:21:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a556:: with SMTP id e22ls199082ljn.9.gmail; Thu, 24 Sep 2020 23:21:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0dqNlNee5zNsAyEEfvEi+I9OM1svACQ4WhvZLeBL9bcGtcxbpIOuoR4M3gDOKDaxg6UvY X-Received: by 2002:a05:651c:1128:: with SMTP id e8mr876236ljo.436.1601014886584; Thu, 24 Sep 2020 23:21:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601014886; cv=none; d=google.com; s=arc-20160816; b=nLmvoKKXp0StNHQXhsQOCtBPn1cE/BHptiAglOfd966+YNSgbFIsFD7g/fH51LrYYm 6huca4+Ep/MJ5Z60GFtJTMt2b2+K8LpVIzrwVsfTTkRkGPnDx/wdiYHdCSIoV1TvBoO/ wVCFcNMn4tSy8XsFoLaEYS/Jo6K+wzkiLC5tZySC7eztjOFaFrskXqJV/w8CIAlqXWdB 0L6La4w21tiPOTkZp4iQAIBF82T/kRe7YXUnvKLL4WCPkyIfm66/kjZXU26SRkc6cdl6 UK+MWuoD0KZP4iPWl+IN6UytWsezf7/JmFvuDepKqFGgP0MuiIPdCx4eND8O+JeVDMx3 VgBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=+rnmPE5PGL7yimkniJKB5q961jy8nXpU7bOuNiZwVH0=; b=xjrJiZJdTaWEeTibNYbvuxIvnPXiVDHKOojb8yDsuBQkeXrTPjm8W97+VzGKLqg7N0 gh8IIuuwkFsSObl4UkGhYfzuynnhstXTdevE8FsODN4v2Dkn9XE8w5qih34LOtmvUf2B fYGpPooy0TFQGkjZhIKN5OmazBdbvmXwyATmpxgZveU1EVqR9Mqf5TLMBoBvj6Snf4Q+ gy6GxdcFTl1RLF/eoWFem5AhF83MyxN6RjGJ7bSk462v8+JlG4kqN5VALHjDesRYUZ2I OokH1/griHNZk3qb7HX7tCjp6HyLxmMdfb5PFGpHov8bzmqit7bfKFjVx0tvQ2MUSTgO Q0EA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id r13si47926ljm.3.2020.09.24.23.21.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2020 23:21:26 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 08P6LPC7010725 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 25 Sep 2020 08:21:25 +0200 Received: from [139.22.133.254] ([139.22.133.254]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08P6LOke014733; Fri, 25 Sep 2020 08:21:25 +0200 Subject: Re: [PATCH 4/5] dpkg: Account for changes in mk-build-deps in bullseye To: Henning Schild Cc: isar-users References: <20200924233209.3c808a50@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: <77ff1957-bfa0-fe22-a967-bcdf17160a3b@siemens.com> Date: Fri, 25 Sep 2020 08:21:25 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20200924233209.3c808a50@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: FP2HO9/FwM9d 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. 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? 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 > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux