From patchwork Thu Sep 24 07:49:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 89 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp466943ooj; Thu, 24 Sep 2020 08:49:54 -0700 (PDT) X-Received: by 2002:a5d:510d:: with SMTP id s13mr411874wrt.177.1600962594694; Thu, 24 Sep 2020 08:49:54 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600962594; cv=pass; d=google.com; s=arc-20160816; b=h5Sgaq6HgPnejkJUVXIBC4UUX7H2PPNe7LWZqazB318/rtsER6f2MNL3H5JZNB5KtW FBOhutqGTB2HhAwZxOGc6odXumK41ZEXkKhZOg/Y9AMBuqO+vkj8vyYGk2eWT+WcKTgN dbkM87fvlh4DXdjRSvs7J2csZG53cp9vx/k2GNFUO7cGWpwEbbwjY3qYXDg/UIn1WspA LrwUk/lMTeWdBGQfAkuRlx/jVfZkLApAKt2wFUimM0Ggmiey3bcB4/gTApLugxYJRmDN AVemX+n/+Yi0hXfyqOBlGBUb0K9PbdraBz0ZsIjjsY2Vh78kcKIOdE11FSp7DrA0vmhm +1Iw== 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=UPDvhv8cfy9BqyE/vmx5BXDD/1MgomSwjL5PJrOjefw=; b=SvzpMZ2JvktbLJcLjRqJ0i4UBMdOmTyc0UJ/+2jb7/LRyQYKyHa0kGX3VdA1VjOEAm hoh7gM04o3bC0GoVsRenTn+/28MZgM2SSF6U16vFYjN/Affy+TML0oQAkwLg1VfmAJh8 z7RSNoNDwARXm1m24/NOgZE21p5i7BD5MVh81rv9ENs+gJ0moQ5zQuxJni5dIeUYL8Ev lIi900VULZjh8oPeqX40466FK4l22Bp/tNdUP4AFO4TZmFKQLGsIYWzHJ0Bv4DxQcPB4 A1fqf5Y/P7Iw7WunR3vgYV57e7Rkb7CUmOw9lUQ+JQzzzxSj4KqEvOfv717YwulpzRDM bLvw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=iiEnmsd0; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbiuawp5qkgqeto2nivi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBIUAWP5QKGQETO2NIVI@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 d7sor2024723wmf.17.2020.09.24.08.49.54 (Google Transport Security); Thu, 24 Sep 2020 08:49:54 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbiuawp5qkgqeto2nivi@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=iiEnmsd0; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbiuawp5qkgqeto2nivi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBIUAWP5QKGQETO2NIVI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600962594; cv=pass; d=google.com; s=arc-20160816; b=PvMmaTQTQ74DppEj5lny7JeSxZ0RpIBKAwpmjYjP4gLbdpSTWdkw6DaPpRQu1KVTxN ewYnR6LH6WWJ5U/gEvOK6Iq3kTgxjqabjZPoSQA0y8KEEbPtdCOXUfeIJnRsp8xDogqC Rqau0wnKbAWUT21rurPOtkiryEH2nOMLjylqhcYK4KTfDZkTodgsvV0VXpE24ohQnA+s qehcdyx0OLpEWOrkdCuEIZWrqBKsW5kF0e4fpDPWV0H+Ol9w7LhoMpqSvU7GjcWFvsTf oCipvVPClWt5M1yf5rMgMEcqPptuEOT58rC4JR/ce326OjurJXg3xDcSmqpXbBvJ1BCZ SdMg== 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=UPDvhv8cfy9BqyE/vmx5BXDD/1MgomSwjL5PJrOjefw=; b=hjZS+2sZSo6PaGG9GeCo2TuBpaWylVP8/xYUez3VHCFUdlmPMOi8fy5spNnGAXozmb 7aam5fBD20ElKM0t0EmWuR45FU5+YUK5kZUepTrEB0nEIIoq6U4STz3J3ifoWwl6dbkJ EQJbETWk7VD1vKhfnIX7Y5kziCKqZil/U4obaR8TSnFsQ2DS/YNIgzdte12vQw/cM3n0 xCkVvN0gLfUlzQWPElf4TurzimgxhuQ5bQ3xXflFnJRLI3qklN4pvppuGahy4dGj0xY4 pOrcS9sitWihb6mVbhcBVQFBPYzdAzBM2uhmljC4BjxCRqiFjnpY0jTiYHMe4lmGnK72 Z6gA== 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=UPDvhv8cfy9BqyE/vmx5BXDD/1MgomSwjL5PJrOjefw=; b=iiEnmsd0Y1oNi6GrdW9Qn/ynQOMa6QHRKFzfOXDTQJjz8qBOSgduByvrSO1oMXe0Cv fTN1LE1FFfiEGy0niS1f9F2duZg2D1c5YmhQuQpEC4En0J7E8Arg33AoJcf6nMWHNE5V XK6Cifa+DhM4OsP6DPpjmoGQMl7iszJPHGe8VpV2CoHr4QZjoRApp9NJ01bzB0JuXMaV isxzWtqWWNsJbVxb1Jt7iDqvIt0euwFWwTaxXIuB4SUo9i0OU+VJCjdaeEtUCxe9gaEN MjwfyXuraS4a2kOhvGbqnQaB6Jqga4XwXAvVzintGKqFxAy6jaEVLe1EsTKv6IOl0HgM d1YQ== 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=UPDvhv8cfy9BqyE/vmx5BXDD/1MgomSwjL5PJrOjefw=; b=s1PgE/I9PJAf8VVNdzIICfdGl2U9Qc7OSBTUU3B/MfRLnOZwKH4/rjK0/EwIvMojXH GbfJY6HqSjyugvhW09hbPG13ltQ1yWSpsHt6b1dZ73Ayd12LMQfLjfaDAHYdx6lUHECO jvX44t/g0w4ZWBjtb+uv4PL50CCRAYL+wuQMjRP59cgP6y8jeFTqzYS3XrYXycYTJwjg qmqe60Jm0e11bkrnj8ngDNYzNQRhuM1P/6owMFw/TcZgqZa1Oc+TAAzxLXoaOwFv4XDD 80v8oTJu4Lwg+Mg2tP+5kC+DZQIPCbdDQ9ZzKwP/6h1qFFIYEDozyC0dHAcOeM6jQYUC +uFw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533t1Vryh1blXYX5ei0h2QdDtRDwfIOGh0HT/ya/EYglEmQH1y4g RmH+Q0+sxsAhe6TmlAgvXHU= X-Google-Smtp-Source: ABdhPJwiuvLgDSpYv9D4HVCC2Tu2Sz1CEygt+ZaP27FDL3V6BBuedJ3Y0m4MTObtHshuKAL3Ym8/jQ== X-Received: by 2002:a1c:2905:: with SMTP id p5mr5595632wmp.187.1600962594324; 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-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 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; 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 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?1678730953325164606?= X-GMAIL-MSGID: =?utf-8?q?1678730953325164606?= 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