From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6880878174534631424 X-Received: by 2002:a17:906:7f8d:: with SMTP id f13mr3306339ejr.540.1602079295608; 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-Google-Smtp-Source: ABdhPJw4OKc7ykFWwHU2pgPNlAQhkl+1Dc9WPEZMMiU8tiZTRp4Ug7Gepp3bAi2VcPUVXPNnKqyg 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 Return-Path: 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; 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 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 Content-Transfer-Encoding: 8bit X-TUID: WThhB8m4PZdk 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 -- 2.26.2