From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6635840914193383424 X-Received: by 2002:a2e:5bdc:: with SMTP id m89-v6mr1766450lje.14.1545219800754; Wed, 19 Dec 2018 03:43:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:5d9d:: with SMTP id v29-v6ls2449293lje.12.gmail; Wed, 19 Dec 2018 03:43:20 -0800 (PST) X-Google-Smtp-Source: AFSGD/XIw8iVD8dB3YT3D4omc1/Sacb7zvyNI20GUdySUbRaNDxXaNzNcAp7Ap106kwYjP+SEx6X X-Received: by 2002:a2e:98cd:: with SMTP id s13-v6mr1668286ljj.30.1545219800214; Wed, 19 Dec 2018 03:43:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545219800; cv=none; d=google.com; s=arc-20160816; b=fHhP/j+EOc3mFzWnlrsiod/CsEuIn+w4kfo019gYGUQTWw6XKsQOb+mw8cJDPWlUci dwpVas7FgmypJ2iIaVKjyRW/R3es2N569PXt6UV0TKE3Jz0CPL1rriSTyh+6a4xoDiQj IpUVYOtInygfkEVD8rWXQdzbPobllxLXLZDCIDPBpGGdYRhIQCW2EkGZfYzPZKJraXeq Y6w9HWn5FxlmaFtrzjVIs55Gp4Ex0nsrF5fiP2KmLphFD/HYHHkEkmV2CpHZyege2Ztt 6nUR6NX2sZNOqfJA0OX62LVq8lYZlTv7QIb2yoBEAn7gT4x+LpdtThGrcfMiRjXRgVAq p4Ww== 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:from:references:to:subject; bh=JJiwIEWCOJZqkUszuhTCDmoGxtM/2+LKnTJmLlV2Lp4=; b=Pz+/6zmm8sz2tTpnFmuZsti29VC6nOUNzO7l9BWnHGBdByoTRCe5LHKpkDLixh+DxF C7ToGQbY5EEZ5b4v4qZGViGuvkhuFvmwo9Y3e5HXsFwS6zCHwWhCKlHxtZsaXg/DIUN2 1Cn+JLX0bjgMgK3Dxc1GA8W2XEpGojxvSn+wlcfj+PhDOBzDGl3gAus6RvsSvy5p0LRt d28oOrK3IA/s5A4zeChSsg7QUzavZh/qwiVJ3MNQDq6wHyIRTUu/syH6yG1rK5FHhFXm FXlDJtRdi9k4hEgpAtfIjMJjlxELwRYkG3UR7gNKNFXOqsM3I0Iet0sUltbqnVlFTegc FRkA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id n189si703357lfa.4.2018.12.19.03.43.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Dec 2018 03:43:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.50.180] (nat-ppp-217.71.235.199-satnet-spb.ru [217.71.235.199] (may be forged)) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id wBJBhHUM010467 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Wed, 19 Dec 2018 12:43:18 +0100 Subject: Re: [PATCH] Replace include statements with require To: Jan Kiszka , isar-users References: From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: <530e1405-dc26-86aa-7111-b18e746542e1@ilbers.de> Date: Wed, 19 Dec 2018 14:43:12 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 27OWLAiUl3+2 On 12/17/18 9:11 AM, Jan Kiszka wrote: > None of them express optional inclusions. This change is primarily to > document correct use. Applied to the 'next', Thanks, Maxim. > Signed-off-by: Jan Kiszka > --- > meta-isar/recipes-core/images/isar-image-debug.bb | 2 +- > meta-isar/recipes-kernel/example-module/example-module.bb | 2 +- > meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb | 2 +- > meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb | 2 +- > meta/recipes-devtools/buildchroot/buildchroot-host.bb | 2 +- > meta/recipes-devtools/buildchroot/buildchroot-target.bb | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/meta-isar/recipes-core/images/isar-image-debug.bb b/meta-isar/recipes-core/images/isar-image-debug.bb > index 2b49d9e..791d623 100644 > --- a/meta-isar/recipes-core/images/isar-image-debug.bb > +++ b/meta-isar/recipes-core/images/isar-image-debug.bb > @@ -3,7 +3,7 @@ > # This software is a part of ISAR. > # Copyright (C) 2015-2016 ilbers GmbH > > -include recipes-core/images/isar-image-base.bb > +require recipes-core/images/isar-image-base.bb > > IMAGE_PREINSTALL += "gdb \ > strace" > diff --git a/meta-isar/recipes-kernel/example-module/example-module.bb b/meta-isar/recipes-kernel/example-module/example-module.bb > index d9d6eb1..b725416 100644 > --- a/meta-isar/recipes-kernel/example-module/example-module.bb > +++ b/meta-isar/recipes-kernel/example-module/example-module.bb > @@ -15,7 +15,7 @@ python() { > d.setVar('ISAR_CROSS_COMPILE', '0') > } > > -include recipes-kernel/linux-module/module.inc > +require recipes-kernel/linux-module/module.inc > > SRC_URI += "file://src" > > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb > index 19b60dc..b71ce77 100644 > --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb > +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb > @@ -11,7 +11,7 @@ WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${HOST_DISTRO}-${HOST_A > DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}" > ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}.lock" > > -include isar-bootstrap.inc > +require isar-bootstrap.inc > inherit isar-bootstrap-helper > > do_generate_keyring[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb > index 3631506..e827129 100644 > --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb > +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb > @@ -11,7 +11,7 @@ WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" > DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${DISTRO}-${DISTRO_ARCH}" > ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_BOOTSTRAP}/${DISTRO}-${DISTRO_ARCH}.lock" > > -include isar-bootstrap.inc > +require isar-bootstrap.inc > > do_generate_keyring[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > > diff --git a/meta/recipes-devtools/buildchroot/buildchroot-host.bb b/meta/recipes-devtools/buildchroot/buildchroot-host.bb > index 01d426d..f6e95ed 100644 > --- a/meta/recipes-devtools/buildchroot/buildchroot-host.bb > +++ b/meta/recipes-devtools/buildchroot/buildchroot-host.bb > @@ -5,7 +5,7 @@ > > DESCRIPTION = "Isar development filesystem for host" > > -include buildchroot.inc > +require buildchroot.inc > > BUILDCHROOT_PREINSTALL ?= "make \ > debhelper \ > diff --git a/meta/recipes-devtools/buildchroot/buildchroot-target.bb b/meta/recipes-devtools/buildchroot/buildchroot-target.bb > index c342625..ce6bd93 100644 > --- a/meta/recipes-devtools/buildchroot/buildchroot-target.bb > +++ b/meta/recipes-devtools/buildchroot/buildchroot-target.bb > @@ -5,7 +5,7 @@ > > DESCRIPTION = "Isar development filesystem for target" > > -include buildchroot.inc > +require buildchroot.inc > > BUILDCHROOT_PREINSTALL ?= "gcc \ > make \ > -- 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