From: "Maxim Yu. Osipov" <mosipov@ilbers.de>
To: Jan Kiszka <jan.kiszka@siemens.com>,
isar-users <isar-users@googlegroups.com>
Subject: Re: [PATCH] Replace include statements with require
Date: Wed, 19 Dec 2018 14:43:12 +0300 [thread overview]
Message-ID: <530e1405-dc26-86aa-7111-b18e746542e1@ilbers.de> (raw)
In-Reply-To: <a68318e0-f259-1d15-901c-9c3cca60534c@siemens.com>
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 <jan.kiszka@siemens.com>
> ---
> 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
prev parent reply other threads:[~2018-12-19 11:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-17 6:11 Jan Kiszka
2018-12-19 11:43 ` Maxim Yu. Osipov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=530e1405-dc26-86aa-7111-b18e746542e1@ilbers.de \
--to=mosipov@ilbers.de \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox