From patchwork Fri Sep 25 01:16:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cedric Hombourger X-Patchwork-Id: 91 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp1082622ooj; Fri, 25 Sep 2020 02:16:53 -0700 (PDT) X-Received: by 2002:a25:5985:: with SMTP id n127mr3983596ybb.53.1601025413878; Fri, 25 Sep 2020 02:16:53 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601025413; cv=pass; d=google.com; s=arc-20160816; b=dlyzYNM+HPcufRpTLP3LfAj7LGtpbYL9IjAnQGDXZOIkNOiMbKO/u0BQ7a9Je+r/I7 KgN2pyIt0ZSrXx6Q2/iNsIVgOeYNQnYotx+h9bohs5YS7oLy69G2uHR/dWzAGZNURtnw fwv+LUgSLvlxk/Qzm4woZ2E4xrGnRwgYkdQFJS5hmU65LcosBri6NKpHkWri5BEWy9IW Hhux3JUtbeI2jODMBSPjz1sqZxMRt3tm7jf+gIMfCuPk1DGYCT41Oyex881tiq4nI5E8 klRlPCArdgK5vhI9T+cCO4QUIEQA8Ukbo0QcVJHy+XtGf1XYIx0XwwFclWq9IFclLGDQ kAkg== 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:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr:sender:dkim-signature; bh=EHf6jwO+K8CWe5ANJ1WH4b7bVzlcPeXuygVdyXW49zg=; b=q21CvpfCLexuQh+o37eO6/ZKOPRsKBoXss+7YyTa1olZpX4dd7LkYG4bWncPuf6Llm 3o8hTeq+2RzscIRIHVglkX7Y4wGY4Ue8YCxlfH6zBEpt6JClZc571XrF9Qc7LOtAsile jLoORwjDdTvLMbUUJNf4LeteiLim8/uNb3XClntFwlCJP8Rbid6KlYZzA+i2tbM6EYO7 ZSUiyCZigk/Bio2tEIKxS4SkXnl5FVysAdWM+HtaT+QKkVRDjvgZ/lIOnhLZeTfl1tmi psgVKkr8qzKzCE9Te60yGa1RsnZm0raGMgplb0VWmc4Dus9hRh1MUdq754DkDSUxTEOU swgg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=UP4+YjM4; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbdq3rtfxvmlbbbplw35qkgqezqpy7zq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDQ3RTFXVMLBBBPLW35QKGQEZQPY7ZQ@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id u41sor565365ybi.192.2020.09.25.02.16.53 (Google Transport Security); Fri, 25 Sep 2020 02:16:53 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbdq3rtfxvmlbbbplw35qkgqezqpy7zq@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=UP4+YjM4; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbdq3rtfxvmlbbbplw35qkgqezqpy7zq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDQ3RTFXVMLBBBPLW35QKGQEZQPY7ZQ@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601025413; cv=pass; d=google.com; s=arc-20160816; b=ngJ1RATt148EqHOHDVsKxFPVJtpttE/dEvwDxyq2jpnT//Af5pG7sjfKM7vPjWh7oA jv2XtYxW3EGf3b2VRy81KZs22Jt9ZpwRSJqMI/jX0LZdDvb7EVbirZH9tHvNNe7p65Zl mUM1JJIbFQQbpUQYpoZ3a6meKCnVddD+Xtu5BXo5HFr5wbxpd9lp5euuChDgaFMyleZr UfEqxDIoNngm+NDg2fhSwaBLoVWku9d6COrTz5Wh8HhfPsLl7+0oHOMcCTKIIlWERdua b5vfBnAPHI0vximZxlq5+wfM+NClNeKSSHiRwbPZ3C6NmG9FaDNKutNYZQmS1WK2eIpB A5Gg== 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:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr:sender:dkim-signature; bh=EHf6jwO+K8CWe5ANJ1WH4b7bVzlcPeXuygVdyXW49zg=; b=XVbXuP4yUySgANHDiHiQdJyYFlGJqmSawzD8AyBlTH3oXVlHGmBK+V98CghsZo2qMi fSq4Yf/oUMzYTwXcofaFANGBMveM6irEuTXl8G+hgi/4CcYrNoPIEOXUmtZ1ql/oZpiB loBUl2wo+NwqtJgDofSFvHPOB8XcuAYVtaUROuSfKt/k8LCbwI607QamLD61STLBalyh NM/ha4Krntj8HXMMKvTpN38xo2yBfv3zgQ0z7SFZPjUS+KHzORxHV0NDGRr10Id6Qcql MDLPz38JZvl0m3A1YK5NmNaju8bDiXCE1wm2WG9kFeRNMiY6qRP9kic3z8BMJ5AjwRYj u0eg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:ironport-sdr:ironport-sdr:from:to:cc:subject:date:message-id :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=EHf6jwO+K8CWe5ANJ1WH4b7bVzlcPeXuygVdyXW49zg=; b=UP4+YjM4V16P9tOjY+Na+IrR3f/Os+W9Bkl89wEP+tX6TlQwHmZvFEm+TCmTq666Md 2fxIT0Jqi5RLRc67e6b8ETmRXvn7bz+T+zfz7KFekKmNWj93gJXoSGLbmlrzCXFr61sF 9032rwSvAYfQe2d9LFpyn/om5iRWElHKJAW/rt5gCbJmPqBR/K4m7b56FgmptUGvfJMj u2k739IsUXjz1J6qj+/t0TP2EtLyb9JMebPZYOyIHWbsEnoLLjPT0O+pcLEswUktqDnY 2FoLKijYYSZhPkBBrwxF8Z9GKnQECIACxBUca/lKIzipCkU+24NTQqhyPO/8L9LuG33Q CV4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:cc :subject:date:message-id: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=EHf6jwO+K8CWe5ANJ1WH4b7bVzlcPeXuygVdyXW49zg=; b=km2CiddVU3hrlEoSJqKfI3JDoAr0kqkspbaL3n6YmJ+MLOS96FeLjfAPymfgkZck9R XHrpHECJl5G2NGzRMwHVdGzdrElaGEpevmgyic2IcepbWzWdHaVS2nlzzHDjz05RJKY0 Nxh1MdeSbg7AP/FkyhZeevV6FL9HgkItANOYM+zapOdJxIOVezfLqgL7Vo4OZj7Y1Cwf cGiMMinTmWCSC5eTyZd+vSdXITa/766KWeCvUY2i7/eCOguKBipaxd6de30TiY2Kpbuj hUCpziYuxd+LbGZk7YqN3yXNG8CjOsik8PEMrhj/b9oHXw3Nr7nHqLHVr7FU9H6k0APT aZSg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532EiyZvsCMtsh7HJCPwcbFR2J4AHSH1XuTZlAlD4j3hTNbMFGZl ceaaQ48Pm9RY4/0o/tUNlOY= X-Google-Smtp-Source: ABdhPJxY5e/sTKk2oJh+Z/c4jZrH7bfyaXDxg+AMgoF9HkpAnhre72HTIeJWYFRYiHXNtt9etFT1XA== X-Received: by 2002:a05:6902:1006:: with SMTP id w6mr4050695ybt.15.1601025413496; Fri, 25 Sep 2020 02:16:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:9005:: with SMTP id s5ls925199ybl.4.gmail; Fri, 25 Sep 2020 02:16:53 -0700 (PDT) X-Received: by 2002:a25:b40a:: with SMTP id n10mr4267065ybj.497.1601025412984; Fri, 25 Sep 2020 02:16:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601025412; cv=none; d=google.com; s=arc-20160816; b=M63dl3AAGnpykaxP1Uu/y4z5KWG0lMTriRloq/UWzRJMlJT03rKaEisfZLC+YPmKyX l1HmuIdyiB7QibiJ3mmD/bNQqErnRQnHLc8eLSlUNC6/k+DS8se4PVAm+LOGdCi1nNUm FpXdH7KSzsEnYZCWh0KaPHZp80gHE6CPU+1nIbV9UN1lgOrUEg70S84zl76yMgMhf0sa yiML2O4YhxlNET5vyDe45DFGTahFc0pyha1LpSqzxoIHi+DVfCWzh5oDYqdNQc90HX3F iZW2jOQmtfHEJzbXNXTGfubGxNLNnBMZxt6Bv1NuHHv6C+sXtnuJSrm1MPFofAIDKx+Q 4xbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:ironport-sdr:ironport-sdr; bh=6vdys7TYUdgQ4KyGwocED3yoEB6feqM9q4wkpn2QnUw=; b=VGl9PCQ8Uun7lw4MP953m1Lnuo/N8Br/wA4B5D591BrWSfKc2ZNJiNQtEcbNZwD4ZS eZ6uo8CYXAw880up+ARP4zYWcRIv67qgh95AvvzVsifdX2m00nE9ZTVHjoYJ6g5o+iOz pGvGx/7OdObGgEz6gpQvw4HjC5WwmgQv77ZdXJlgzSfeLmLEgmh4d8TFc62y+/t/i8b9 oYyW7e3+jsyhNkObOeY+q4UGT28umF4IRYJv426brulxofY5n8rTwrp4K6GGLxMjkSqT H0UUic7UHkETgg9XzRWJWLOSs2+/0XXPRJlJWHQbnawVz+nFawqDTb2mfcJsbpQcI9bY sg+A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id s7si203186ybk.3.2020.09.25.02.16.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Sep 2020 02:16:52 -0700 (PDT) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; IronPort-SDR: FnqT1xJ0fS+F7v/yZvOJynrzDbENpCJ6if51d2v/6Q3q0NXxCs3VoPi679zeJ1b1dW1s+Vs4Cx sbTfeDy3wLv6Ko3WVuW6In8ufaarNj9X2BCF7R3wuryFp7WNyHx/R1ZuWO3cS8JKA8xIgn0Bmg VYImDgjdMKBL1G4TbYrdSht5KeGjo0+Ln7lo5Uyiqh2XtwWUBpQC0CSI4fUd4rFfhZ5XIAUkyD GTltf5adGE8Xe6gYfQQQEH/xxq8L5mT9JJJNKPGIzXIl4b1/Ct0mc/1A1aC55M7+03SkxOmnqJ L7E= X-IronPort-AV: E=Sophos;i="5.77,301,1596528000"; d="scan'208";a="55505475" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 25 Sep 2020 01:16:51 -0800 IronPort-SDR: Np4W0oKrELOV/t3nAxkQDoztCk+cwz6M+nGowdWRCYJJ61PmRP2VihVOWD2gDRcvTykco445EW fhrc5AXJPdrz+Yg7UDSfh0ZDzVFyav959plUcHFu1cu6u9qt0LvYEVvtXH8TlhH1ehn4rSswuE oohWEIhYUjs4vM2Pk/9yCn3ssBOUFG1q5PDvx10cZgn3I5GadoMPKU90wAM6ckK6H/ZUFVHO0L meL8r5ljlUjzoaJBvTmi6Sslz9UcYh41ObepxEcPnVBJg+kmptCv2pxedjXbAN11t1Cxwe2Ef7 tQs= From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH] buildchroot: do not mk-build-deps in ${S} Date: Fri, 25 Sep 2020 14:46:32 +0530 Message-ID: <20200925091632.43333-1-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-07.mgc.mentorg.com (139.181.222.7) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-Original-Sender: cedric_hombourger@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.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?1678796824134906043?= X-GMAIL-MSGID: =?utf-8?q?1678796824134906043?= mk-build-deps may leave .changes and/or .buildinfo files behind despite use of the -r option (which seems to only remove the generated .deb file). Having new files in the source tree causes dh_clean to complain (at least when the package uses quilt to manage patches). This problem was observed while re-building some upstream bullseye packages. Since there are no requirements to execute the mk-build-deps tool from the source tree, create a temporary directory and run it from there. Signed-off-by: Cedric Hombourger --- meta/recipes-devtools/buildchroot/files/deps.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/buildchroot/files/deps.sh b/meta/recipes-devtools/buildchroot/files/deps.sh index 93bc9cf..40d4a1c 100644 --- a/meta/recipes-devtools/buildchroot/files/deps.sh +++ b/meta/recipes-devtools/buildchroot/files/deps.sh @@ -34,17 +34,22 @@ if ! grep "^Architecture:" debian/control | grep -qv "all"; then fi # Install all build deps +srcdir=$(pwd) +tmpdir=$(mktemp -d) +cd ${tmpdir} 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 ${srcdir}/debian/control &> \ 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 ${srcdir}/debian/control # Upgrade any already installed packages in case we are partially rebuilding apt-get upgrade -y --allow-downgrades fi +cd ${srcdir} +rm -rf ${tmpdir}