From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6672285328798121984 X-Received: by 2002:adf:ea0b:: with SMTP id q11mr8685254wrm.233.1553512487864; Mon, 25 Mar 2019 04:14:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:5582:: with SMTP id i2ls3592wrv.1.gmail; Mon, 25 Mar 2019 04:14:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqwaDDNOXdwV9Wt5insfjlLbrBW8k1aaaqz5asLhtwnx0cr1QJDjS5RbdLfNQKPF5A4ZPWRV X-Received: by 2002:a5d:5287:: with SMTP id c7mr16028173wrv.127.1553512487448; Mon, 25 Mar 2019 04:14:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553512487; cv=none; d=google.com; s=arc-20160816; b=CQDLvl3F4vGkCkqkTOI1xY3U3Z8H9umBDgeX/NQan536F2EstoPrYFqFMTkkxdmQTW F/A52aFlKREPMGFFsrdSsSh98H/1rJBpVB1Fuy+mYS92zlutlutvzQe7XfClmqHl/wXB Xi7iboZeZB2ggIrbotswmPG8U7O8/aXmKzbxZfjBeTFgb0kNY8DiJ4vCiKPLEjkrRhoW tT4Byot7TY+t8u7yOnUAkBTrfZh/wV5yFEB4P8VjeG4NItWWH+ew4o5QY2Sloa1QZOSQ sIxiEbIkRmbsN+3jPQWnIhhJZbbyyLrOCspOF7sHcPZ2zdh6z/jxc7t2yrWAwZ3mXspc kiTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:to:dkim-signature; bh=XQ/kbQORhwjsNl7M9hCcuMVZf3Hf3wwFbTjnprGLC3U=; b=dWdFfOTuGd2BVs8qD+9ikAAu2hPztLsbB9/5G2TngogUOnsoyJzMpv8i55AuhUXETU DmFMgAPtVuE1yVjqPQmQ0OUBjzO4986n0J/pLWPMKNcq6hO/mal1Ub6ZVk738X2xcv53 MLtNQBVVk9QuF5yLn4XaVBl8KLpYzxMalCMFpoNQoRUxVcSJXmeQU2fWRo0IVJfBMYfI hYJRg9p9iy7thzO54GQiIVMRp7iwhMVuK3N7iFTwS7k5PL+4qUYSY0TGNGsemegGWgNt w0PNlG+59A48Jtppp5lCuxQMwD9jIaCRJMOhk2pfIxGG6uTk4BU0xKo8hEKgktpstnru uSdw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@web.de header.s=dbaedf251592 header.b=pl8nLC5X; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.4 as permitted sender) smtp.mailfrom=jan.kiszka@web.de Return-Path: Received: from mout.web.de (mout.web.de. [212.227.15.4]) by gmr-mx.google.com with ESMTPS id f74si764683wme.2.2019.03.25.04.14.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 04:14:47 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.4 as permitted sender) client-ip=212.227.15.4; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@web.de header.s=dbaedf251592 header.b=pl8nLC5X; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.4 as permitted sender) smtp.mailfrom=jan.kiszka@web.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1553512487; bh=4N7ZnJG+OapJijDsXpBHN5BcJ1psTC7jzejOaCbQ1qQ=; h=X-UI-Sender-Class:To:From:Subject:Date; b=pl8nLC5XC2GnZcW4mp5h935SRHokuT9pUP+Ca4PMCD+50ubG/pYpnWVnr2KJZlSIf Coqgfdclw8Lt93e2KgVoqxaNpO3ApwsGtHGBMY+yn0qimQazHf8FpSt6o0OUVG+W1S uBWhGF1/sZTVkMy9jdsGLbGTUP/VPgBbQnMkXGQs= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.1.10] ([95.157.57.47]) by smtp.web.de (mrweb001 [213.165.67.108]) with ESMTPSA (Nemesis) id 0Mg7Zl-1hN0hn3xUz-00NOCH; Mon, 25 Mar 2019 12:14:47 +0100 To: isar-users , Claudius Heine From: Jan Kiszka Subject: [PATCH] template: Remove MACHINE from default TEMPLATE_VARS Message-ID: <28bc18bf-0f28-3470-3253-41cb5069b1d1@web.de> Date: Mon, 25 Mar 2019 12:14:46 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:ohMtWDHBOGzXS1Vo5us7PRo1AHS2u9tgmuS2Kz/uzWESFSBDM9H CA67gL6lJqv9Pm9OjrX6g8QWubmWMzDI/zHVVNwY+tzaX8HhJQTzQjadUz5XP8QvTlahK/i lBeqsjujrGHeIX0Im7F7/XHZ+uUO7c7gSm1jVru6CjGPzOPnHHR0ddklcJfZNz/akP/FvrP paeXGwcF+BUhjjLpjZiOA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:9NZeeXVW8h4=:VmO2uWuuLrBdMSsT0Qm11A iTFRaSkPGgSwDQdgDL1EObaDwAsRoR/Qzn9SS6UfbDQFSOLYnqp+G2hMfKqQ/PRQZxHWXftIw e8sJP5+OUqgN/FTfhhY4j/4H4AxxP9DOsMGzzrGVphgHgh9KfhQs6MU65tSpmEzuFsfVtO1j4 RdbiqfLr9qj7TesWQDvOat1mfcA97oB+n7Dca+ezJDXy74BgFgj9qSE5J1ZX8zlbKD0MZzHym F/iSI38Ze5KtYpIhFKZ6suAWhH48hEWWNtMxGorXaH67G9BFeyCINQnvuCK0NUf+DZqnqXWZi 7ZDVLfTLtV56mvAa02DNf59iQDrtN8O5KqAF24iiXK0g4ja5lQYMVTa8oO4iatRopnqOT3KDe DYH13poTBeZQKDb4iY+igGRhYq+dIDJERI4j8vrxJwnNPxIdCLdiUbRZmAL1F1XA9wHyOSf69 iOjDvHc8/BGeZOwlt+4SkEBJhOzqtOftc/509QwygQt94G6FO3h9SP7uNGnXoEcdcsSOXQvcb Np3v+iAERk1nuJsvui8vTFhZc6K55WIQyZg53y7FvAXt1xmIC6x79URXf1hgplqd64VHixcpF kx/WCoQR8WFYLJ/8+u3zMNtJg6OV2DuJPsV6jRKhndGILsgZ/GIFg2p350s6qWZsQnCNwHTLu C9Hy3UuqAv4vJm8OzpVhugO/ih1ris94FAs+jRX39exCMkFf3kEh5tbPVjPLuFJcKC6NyHBB1 iKD1aTPjGYFYlL1MlzP205z80x7wgnloGIuqRhPqrG62QYTe1OLVfizFAnFH8kgAm130xeRJl Xa+y+GvBQIrnV+qYjGPsB6iUeCLgFExi8hSY1cO/IOH/slBpvErvYWXPi5vkoKFRUWJVzQSwr Z72gPgOJwFzOZX3aGxZoQWTZL9ND8Pma4nG4AC4040WOI3jGHMlfHMGR6jP81LevSlS4vmjkX 3O+ADQ9E6xg== X-TUID: 5eVdNEhH7fvg From: Jan Kiszka This breaks packages, even those not using templating, when they are pulled via multiconfig by different machines of the same arch. As the MACHINE variable differs, bitbake first builds do_transform_template multiple times, and then everything that follows after, including standard packages like isar-cfg-* or expand-on-first-boot. Those are shared, use only a single workdir, and will quickly break of built concurrently. Fixes: 43b4c21aa185 ("meta: added do_transform_template task as templating= system and switch") Signed-off-by: Jan Kiszka =2D-- meta/classes/template.bbclass | 3 +-- meta/recipes-bsp/u-boot/u-boot-custom.inc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/classes/template.bbclass b/meta/classes/template.bbclass index 324511a..3eb9114 100644 =2D-- a/meta/classes/template.bbclass +++ b/meta/classes/template.bbclass @@ -4,8 +4,7 @@ # SPDX-License-Identifier: MIT TEMPLATE_FILES ?=3D "" -TEMPLATE_VARS ?=3D "PN PV DESCRIPTION HOMEPAGE MAINTAINER KERNEL_NAME MAC= HINE \ - DISTRO_ARCH" +TEMPLATE_VARS ?=3D "PN PV DESCRIPTION HOMEPAGE MAINTAINER KERNEL_NAME DIS= TRO_ARCH" do_transform_template[vardeps] =3D "TEMPLATE_FILES ${TEMPLATE_VARS}" do_transform_template[stamp-extra-info] =3D "${DISTRO}-${DISTRO_ARCH}" diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/= u-boot/u-boot-custom.inc index 1afe430..b3eab46 100644 =2D-- a/meta/recipes-bsp/u-boot/u-boot-custom.inc +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc @@ -19,7 +19,7 @@ BUILD_DEPENDS ?=3D "bc, bison, flex, device-tree-compile= r, git" TEMPLATE_FILES =3D "debian/changelog.tmpl \ debian/control.tmpl" -TEMPLATE_VARS +=3D "BUILD_DEPENDS" +TEMPLATE_VARS +=3D "MACHINE BUILD_DEPENDS" do_prepare_build() { cp -r ${WORKDIR}/debian ${S}/ =2D- 2.16.4