From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6635840914193383424 X-Received: by 2002:a2e:86ce:: with SMTP id n14-v6mr852750ljj.21.1545027111327; Sun, 16 Dec 2018 22:11:51 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:f65:: with SMTP id e98ls1064225lfi.4.gmail; Sun, 16 Dec 2018 22:11:50 -0800 (PST) X-Google-Smtp-Source: AFSGD/XkNBvMA/qB29a7sbvEL/LbpzKY8I6oebMqLhAWBqY4kNOM0KFgob2VCaxxwNtcKfJHWgqa X-Received: by 2002:a19:a245:: with SMTP id l66mr817165lfe.0.1545027110672; Sun, 16 Dec 2018 22:11:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545027110; cv=none; d=google.com; s=arc-20160816; b=YzkxekPOPuONj0YXim+SeML8p0RiYGMgr8P+M8qanDymGRI8Qh8oJowjs8aFnKnsie fMrhvNRodMLL0Dk3HRjfr/QuDrBqopH5AxsCcevs9jKTCQ2qa/9DQgoomZc5fWnrPHcb NRTGYiBkPwDjnCdxCh4rzgiiNxux3hCDorUQdkiGUNj8EQmxECotG9bLqRBYjMXR+ZO/ 3fh6vTY5kK/WHi8Wne6ZxlEU0oy35P3YBlEL2WGLuNBQ7JAdfRKP6cdWeJ+uCwVshygT 7ckNKCe5RmwqnuiC/5Wd++wcAwHNWkaIdOsKAs7gzhp7wuMi38rI4U1vnRop92Z8sKyc uJQQ== 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; bh=zdw7guemLSeExu7mekEHSjh/RjZUC0Bd/4j8kK3ZUnc=; b=Gq7BXEECHDxkHWG2JN+WnqIkvvN+GD42EDh9EvuSmUj/WjVxX1SBY89/e1KxeEDi64 +ZWQV8jTgSm21AV9oGcv1RQ9lAT9Scihhk8GjVlG5gnCvakM4VYbG9SB1GogquuJAtCt dQbKsBUJlo3i34aIs+3qC4spodDtrRP4O5FmvAJAk9RQy9XqCOD4GqlgRxIQ1sF215a0 ccwM9ueZjnmopUZneD5iF5gXUbK7aUEoWsmV+K8DMD0JV6BwgNIRo7kJtAp8OzwUshcY u/RX/KeS+97XoTqoxv0+dHBKI5EkthbU9JBsfYa+zHq+91PUoIusqrcC8m/wn8Dcpn94 Acgw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id q10-v6si665821lji.4.2018.12.16.22.11.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Dec 2018 22:11:50 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id wBH6Bn8w015342 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 17 Dec 2018 07:11:49 +0100 Received: from [167.87.36.50] ([167.87.36.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id wBH6BnNL024837 for ; Mon, 17 Dec 2018 07:11:49 +0100 To: isar-users From: Jan Kiszka Subject: [PATCH] Replace include statements with require Message-ID: Date: Mon, 17 Dec 2018 07:11:49 +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: 7bit X-TUID: GUlC97+NoYPB None of them express optional inclusions. This change is primarily to document correct use. 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 \ -- 2.16.4