From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6876081984106397696 X-Received: by 2002:a1c:7918:: with SMTP id l24mr5576897wme.46.1600962594420; Thu, 24 Sep 2020 08:49:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:c2c1:: with SMTP id s184ls1769501wmf.2.canary-gmail; Thu, 24 Sep 2020 08:49:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwuXcNq+VbalGXtX7hyXdLxvU/3255nos8fud0qDrFDPGg5n5vDSmJAmDptPpBWKWMi2ODr X-Received: by 2002:a1c:4885:: with SMTP id v127mr5716236wma.129.1600962593372; Thu, 24 Sep 2020 08:49:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600962593; cv=none; d=google.com; s=arc-20160816; b=bKGtbHrjAAYma+IdlvR3sZTmDoX4iKVudABnozdZ+otjDv11/RKTzXWwnNw5sIkunQ l7j8O6EFenxHsaeM8RXFZZbvbU56bwOHrRxkPdPd3EQjE27YR2+2+y5CHy4HPsP+0ZUk VKZSUUji7THT8xPR803UFQSnRrixPPrPm5vZv/8zFVUf9TYyUm3gaWGZr4Ogfs5H6bRy 0OFKwM4He/I8+R8iRxZfULw1gEZto4h58qqcY36RqNyHNrPjxuBHdvzSm54DloemBsAN gaFOEV+8UZQiE7x4hD74tafiAmjXLC2cHZnQSfb71pIWdL+7q+jPYw8sY+jRioXL7mDQ FSvw== 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=pIGDQLJdkmTSuQuNo2AC3ztncQOgrUkY6PZQXZ2om+rDo54UmiOypkPtuG+Meupv6N h3236Y611lJdEQOWvMwvPOwwuLi9jUICsCM5AEev5OYe/riRVwgpFDGPOOey5FUkoeoB Ir88BhrND6aIVfLwPvpF9fEdmGF7sg5yi7P5KN1xv7sF6k6IQQrKn/fMGYpaHm/EOi5T LjxE2IPC1EGkW389qlWeA/JSXX2dGLGz9tuIks/mbu2nmAN2Ixt/on/8kgXxPVzoT3Tt Yp6o2V3GfECX4uoN3mP2AIHPOvgebeD7y7h7SI8YWiqq07lNphfzuRXu5gL4AR482/p8 hm8Q== 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 d19si97518wmd.0.2020.09.24.08.49.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2020 08:49:53 -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 08OFnqEQ010723 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 24 Sep 2020 17:49:52 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.1.32]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08OFnpBL012465 for ; Thu, 24 Sep 2020 17:49:52 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 4/5] dpkg: Account for changes in mk-build-deps in bullseye Date: Thu, 24 Sep 2020 17:49:50 +0200 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: qSO+C+4gfrmM 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