From patchwork Wed Oct 7 05:01:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 117 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441869ooj; Wed, 7 Oct 2020 07:01:36 -0700 (PDT) X-Received: by 2002:a17:906:7e42:: with SMTP id z2mr3470772ejr.206.1602079295997; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079295; cv=pass; d=google.com; s=arc-20160816; b=iuJ0AJaLGts4MKpJf18hlnlbyT87U0AhNUMcuZ+pFIP4eTjj289R1sK3mK1UGpjw39 FCetak2YYWEs9semFk8tFYsFM+KbLY3X6gzrkvTbydS8Qg1x/tmRPtxn8A1/HuKxmH7k vcJ/Vei7IGxNr6tSrAfSbiO8Ft01rAzQ01MP9lGzYUuexNHn/RL9gYFo/CWbsBqaEqbN 0UuC0nKmM2ZpT3uYXLmsKrbYUU14CYUa+6WVuv0QxfVLGY7l2uVAltuZHs1+nFqSY6pW o1skqTXojDrDp5Dgmlx9p6G7Ixo8rNVEY6zrQ1ENTe0IzUD+t0B5Nf07DNVfx1M+jfup 8l6w== ARC-Message-Signature: i=3; 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=goptvhRrG7OvhecqjsbjZQ5MP99ZZqxOHAZUtGpd9xI=; b=f7oenluWz3mDHaW6ZK7rpvWkpXG5gL0T4SfCW3c5ZXd7m6g1iQhf+nu/fqus34+Vm3 1MjPwu+H6lF8arZ8ObnVXWFpVAnRQHoCcxOocPoRMR4LBdq+YLwvuO5q0hz2+Rohdhv+ /erQ0gy4w0CJ3t5On1q3cNjfEQakEZQiHaXrqGh2xvfC39+2qqbUlEYQPgPj4Nav2lmV tBDPf5jVqOq3g/oZYDA93I3gDMNVghCdM/N9cRSyyjSBmfg6QplaDwV1TSZHCfaAO7iv r2P+pqoNMFVMKZL7I0UkSWFCYRClRR/piaHcWFeBJVsB7pbfuA93B8GZenJ6mbl+ctYw U8sA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=SEZj8Er1; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBP4U675QKGQE7NRXXDQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id w7sor1308575eja.55.2020.10.07.07.01.35 (Google Transport Security); Wed, 07 Oct 2020 07:01:35 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=SEZj8Er1; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBP4U675QKGQE7NRXXDQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079295; cv=pass; d=google.com; s=arc-20160816; b=SfiU+0sv3qOHHdVYJ7bZeDwysvk5khpi0RzzG2Y4qnPv57zcJ6jnQ2ozk2ZUO+Ktsh AU1IqUcJFVBiHHgPLkFySKTGCjtxa94IiGWL41dhUnXmZmekp5EJQncm8BW/Om5pKC7C pyBbSW8KhS0HREA9pN5e0HfQZHTI9FsusR1HCxriEBTjTD4GxMAR18q/JQ5rep1/SYgK qpmt7NpbIUbGOKxseaNKphI6Zwj+3nvi0Fk70Gk9QdeJuG4lbmH3kilaGkWN9zoK6opc 760M5P0WRTnAEqOknMl6az3vJtx8bPLFpr6TYCyALQWtwkjHdJa8C2MGLgv1naU4PC+l 8xYg== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=goptvhRrG7OvhecqjsbjZQ5MP99ZZqxOHAZUtGpd9xI=; b=bEUaBv0h6zRc9eo5udGFcDtUrGTPq2ZDJDoemVRW36kuu8zPy/2RQt2V2z8stjZbDc Vbhn14uYKGoULPYgx/2frJLgMvuxuW988bs92+BxK3Qztflks+dQXGAoRk5JpnJIjLl4 LwDJ4y/fgsLK4wkbIH1uWAgG4RPkaDJBq3G351VjMEb4lAIgClmbCZX6UJ3aPxnFkA3r Zpgjndt1FkLKC9Y85pzjPG/UsUM4aaLOkKrRpj5Lo6lMII8rxidsbQM0NK1WbzpG5D5M bNx+b1tsoywY8auQr75uuJZabs+xJeCUkbh+AnWGVNKDR0tZd0r7THAt0RjgQrkEbe0T ncqg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=goptvhRrG7OvhecqjsbjZQ5MP99ZZqxOHAZUtGpd9xI=; b=SEZj8Er1Mb35Fs0c/+MAGAS7x8eXKdyBzHXjIvHABTnw8pNNCf6oeCI9xxjQQImkGN 4LgNFEo/4DwOqh6KM4gOWNjP5SzTNREgnavy3VVlHLr/MsSJPAYgN6Pxl8TMGZ/Hte63 /pczrKgVOZkWU85NzAsYPWupgyFWTGhl2e7l7IM3guYtFmCQEX8HzJzZIRo9yJu/gt1R AeuxmZwGK+RqHkxany08hq0oW3eqhZXodc8B+FIugVSeRI98hSixeR2v2YQ0dk0lBDFE wc4LtaJhtgSHYaNq/iHqTU9nMdvD+VLVN/mlUMnLK7i/xDL8cqElCrJTZuMRmfhb4yip c2+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=goptvhRrG7OvhecqjsbjZQ5MP99ZZqxOHAZUtGpd9xI=; b=Gj49mCcbFJA8D39gzjVjqdNcKEu66/A/7ytfUAEN5xlhbdAot5BcgzGaieYDZqULcQ 0Iknt5PvDBnNrDqaJfRvmkw+4tgXwB7nl66jkyjFEdGVZuHT7nNVf5cM9c7p1ECHVSF/ yWWIhT6o122NL2IZ+VVTfd/0glzv9VEDTM/TI1CkMzARcvs4ZQjPreel1rewZG6TA3Tn sDeqqiAbSZ6kreZeRE9FJoKK3fTTusw6p3MugUbkTV/s083Q+aE1ZfOQJIEB5awb7v5e 2XwLMEwTEmFp2d4IXxLA1T7RIQSOd4+XkyenWlVunHT9Kt8VI0NNgdPFycM7cMPjd/3i jFtA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531hJc27x7IIGiFpbkR/lvpY9AHDlSrRnKEYFi7UfLEuV1MYVCjo 0q+w9pdlXmnSPmelTeNrwY4= X-Google-Smtp-Source: ABdhPJy0WrKBQjDzrEJSuyxtygn/sjP0ngS6ysexW2xzWVwEjqwBwo0rtjeGoQaNdOKXr1ABvyOeAw== X-Received: by 2002:a17:906:d159:: with SMTP id br25mr3631363ejb.155.1602079295567; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:1d3c:: with SMTP id dh28ls2645712edb.0.gmail; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) X-Received: by 2002:a05:6402:31b3:: with SMTP id dj19mr3882447edb.210.1602079294703; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079294; cv=none; d=google.com; s=arc-20160816; b=set2MY7MKMFVxncKRKqc3LmqaReJ8D7Me8MW+8ETIFCmapWbG7j7YLSlQ9XFfpNbIf ijakDfA06qaJzhoVUnYWOIHakU5jHcUEtblY0czm3NqJ6ILvIa6E8B3jg82BzkMY24xj K1Coj0p5aBLnPBsN4e1UTf7KpqRQb3yhtnoZ97bqEeJrAYirIlZ20OpZkDyYf8J4NxJc lowTMKYdVTf+j2Gr5INMZ4A+Gjwjhs4HVzGCXfTZEo4PekA7IhXpB1y8mBXq6pb3/TVL GFBtSocKQ8MiVBrlqeKHGtEtEgqPVxhGUw0idH5DUSqvBVoDCXK2KTq9wjmzO+LsNSXh D0wg== 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:date:subject:to:from; bh=lt2wFXzD5h4Kt8SUmVGioEmH8wYD1tR+YCVtExb45eY=; b=Inb0I+4a/3WmKoCTYtyuqTqAC+R31jqw9NfNf+FBZHPOG027IXne54SUxmR1k2JEEf AHFe5LdZIOE6CREFMHzJTWiV99Zj5z9TrIAdVx6Ty52e4Y3zgyFrYK5mMMfI3w8bMi6+ aQdrixJvbwwMaVnWplj5TWc0rjjLcjDNVoxicfgMabVk2g7kzMSdljyw9SpJQHei8Z++ 4Kr2bdqct6l5TjqvTEucv2nGBWFWBLIZhmxh6p3KYCGY5efGZW5RwbxuAYfVEjIo1wiw i6I1kTKRLoOtsIDDWw2fEcfBXSEDXxROrfoNtKSURsoBuBIq092vWJZ5cE4pL2LFt1kJ DPEg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id u13si37971edb.0.2020.10.07.07.01.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:34 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 097E1Yf5001454 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:34 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1UkE019880 for ; Wed, 7 Oct 2020 16:01:34 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 11/13] dpkg: Account for changes in mk-build-deps in bullseye Date: Wed, 7 Oct 2020 16:01:28 +0200 Message-Id: <59a66d0edcac96380074741c548d41c13d310064.1602079290.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901899784380403?= X-GMAIL-MSGID: =?utf-8?q?1679901899784380403?= 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 .. + # 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