From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6672285328798121984 X-Received: by 2002:adf:e510:: with SMTP id j16mr17131833wrm.259.1553577932524; Mon, 25 Mar 2019 22:25:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:307:: with SMTP id 7ls851521wmd.8.gmail; Mon, 25 Mar 2019 22:25:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqzT5PzJ0hn9tKJikFzvAYeRidide2xr/F7xajmvFLgdHWRP4fiR+rW27kfMuwJ4KbftqmA4 X-Received: by 2002:a1c:9e89:: with SMTP id h131mr14279921wme.41.1553577932084; Mon, 25 Mar 2019 22:25:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553577932; cv=none; d=google.com; s=arc-20160816; b=Yx14Hsfg1CRzatTtvLbN0MFPCi1ml3YXhK/Qw/O5rWDvugLygQY0a/ZJoN+9/1fjmu Tn7NOGfaP5X0ANqs7pvQLXbyzxrM/uuW8rhoWf4z4zyr3hpNLtgzaV6oDGoBMElyb0qg jai99+/36uRtZK+PumjHDdAvXuBpVaoS+0DycfB6I+wGi68w2VjSR/jyXaH88vtDwIrZ 9sgdao7wqefPPz6av3Nd5AHYM9GUpYUHvlNid/hGz1s4lIDM8VVgytPllPzIHAdVScpV yzzSM2wDMb6QD2dvXTNRerY/eYzodXN0mF7Q0RICIa7JJEijlyjLBIsj44Mytv88lQ41 LxlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:organization:references:to:from:subject; bh=NN1LjFjaJkWpQ3FKsOXlFHSTemR3mGZdY9rtd/2+oQg=; b=FEj+qXIa5lEquwB4LWqnrUJOjwLOCzaitYp90tZAlJNLWHKzaA+J46wWMt0yfL/3QU czwpdUHbDFyD0qHyZe/sYzrXTDAf+G0Jo9+CjD+MmKF6ByqL0dWYocSKNnXSJ1+8kHOr 3X4OPOuqrrZWCVtJvKORj+x7oG7A2Wmoj8CX49aDQTNW2HhKo+wCyvMnXEh37MdCS5dI sGIx5oi4tc3DJsShYFev1Zi3KGmTcBpIh0hv4pPyf6J2NEe4vXoUfKVN79oc1uwzqXh7 +qCpc74H3O70X92DRkW9QaNG8PqJlDz0hZkirUu7uzDl8pluy3pnBhAdQ6KtZTLVfbiG 8j7A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id n13si119842wmh.1.2019.03.25.22.25.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2019 22:25:32 -0700 (PDT) Received-SPF: pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.50.164] (d51A48A80.access.telenet.be [81.164.138.128]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x2Q5PS0w022633 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 26 Mar 2019 06:25:30 +0100 Subject: Re: [PATCH] template: Remove MACHINE from default TEMPLATE_VARS From: "Maxim Yu. Osipov" To: Jan Kiszka , isar-users , Claudius Heine References: <28bc18bf-0f28-3470-3253-41cb5069b1d1@web.de> <271de745-1ffc-acb3-43fc-921c6207472b@ilbers.de> Organization: ilbers GmbH Message-ID: Date: Tue, 26 Mar 2019 06:25:28 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <271de745-1ffc-acb3-43fc-921c6207472b@ilbers.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: xPA9noV+uRlJ On 3/25/19 8:08 PM, Maxim Yu. Osipov wrote: > On 3/25/19 12:14 PM, Jan Kiszka wrote: >> 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. > > Applied to the 'next'. Applied in the 'master' too ('master' is merged with 'next' branch). Regards, Maxim. > Thanks, > Maxim. > >> Fixes: 43b4c21aa185 ("meta: added do_transform_template task as >> templating system and switch") >> Signed-off-by: Jan Kiszka >> --- >>   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 >> --- a/meta/classes/template.bbclass >> +++ b/meta/classes/template.bbclass >> @@ -4,8 +4,7 @@ >>   # SPDX-License-Identifier: MIT >> >>   TEMPLATE_FILES ?= "" >> -TEMPLATE_VARS ?= "PN PV DESCRIPTION HOMEPAGE MAINTAINER KERNEL_NAME >> MACHINE \ >> -                   DISTRO_ARCH" >> +TEMPLATE_VARS ?= "PN PV DESCRIPTION HOMEPAGE MAINTAINER KERNEL_NAME >> DISTRO_ARCH" >> >>   do_transform_template[vardeps] = "TEMPLATE_FILES ${TEMPLATE_VARS}" >>   do_transform_template[stamp-extra-info] = "${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 >> --- 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 ?= "bc, bison, flex, >> device-tree-compiler, git" >> >>   TEMPLATE_FILES = "debian/changelog.tmpl \ >>                     debian/control.tmpl" >> -TEMPLATE_VARS += "BUILD_DEPENDS" >> +TEMPLATE_VARS += "MACHINE BUILD_DEPENDS" >> >>   do_prepare_build() { >>       cp -r ${WORKDIR}/debian ${S}/ >> -- >> 2.16.4 >> > > -- Maxim Osipov ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn Germany +49 (151) 6517 6917 mosipov@ilbers.de http://ilbers.de/ Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov