From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6439520564055900160 X-Received: by 10.25.219.67 with SMTP id s64mr326691lfg.27.1499318777456; Wed, 05 Jul 2017 22:26:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.225.76 with SMTP id y73ls59113lfg.17.gmail; Wed, 05 Jul 2017 22:26:17 -0700 (PDT) X-Received: by 10.46.5.72 with SMTP id 69mr306687ljf.12.1499318777042; Wed, 05 Jul 2017 22:26:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499318776; cv=none; d=google.com; s=arc-20160816; b=gyFRz2+cfTp9TQbgGWeXWLs29eLugmmOQZ2k08X/ExXuGwV15vAu6ZvAQp/EYE/eyd Yf+aG5ZgAs9h3ULJKP2QaPNZdYTCrnSEkb0MFTYWJHZdS2zdeqqmfAncwhZPipRUWCdT Yu/+Iam1voRMNlEVwQwM4YjZ9/bslsav60D+7JqyjIQxBqYJOvDLruA82UmEXohAEc5R JWjRGO/2K69v3McDOrQiylwl9eVoV/xiVVXqFOMdDP+or1ayWNOVP9PIGtAK2iY6PSCr 7Xyg7U7gqI61z9Dd3SciGKyxrfa3rJ58BEP/Iep5FRheyrIZpr4aLYfKiQJCQEFr/BBB HHoA== 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:references:to:from:subject :arc-authentication-results; bh=FvBYNRpHUYg7tuOFTnhc+WlZjHXXDjoDoJsAENsg3l4=; b=rMspQB+XdPzSnRMY98NU6KcxbiiX/u8MXeJ5txheoG1Vk0gjLFvskRAmsCtHn2Vui3 hOEv2qTx03wyWqFB8qPLmW/VAG+g0+BmAyPO/n9yhWv3q3YhnGfdJEiT76jNv0lViZEv byzpL9whTQ6wa3I77FHEhgM3LF/jpNWH1oQHuuYmc+1hwDsOxp2oZqCWRR9GKrKqPFE1 7Yfj1Xp5LJV5ejka/ev3Zo/wQEwmG0Whtixdf+XUa+vJ9qgt+XgCbL3r1MzlUyUhuvgP FmcugfLpcfSPOlZIrDym7xRoZCtYTGnBZy8ETD7PcIYLfBCoWb+LvmR9FIKK/VYSkxI9 yzJA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of jan.kiszka@siemens.com) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id m89si167317wmi.0.2017.07.05.22.26.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 22:26:16 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of jan.kiszka@siemens.com) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of jan.kiszka@siemens.com) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id v665QGpj028479 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 6 Jul 2017 07:26:16 +0200 Received: from md1f2u6c.ww002.siemens.net ([146.254.78.9]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v665QGF9009695 for ; Thu, 6 Jul 2017 07:26:16 +0200 Subject: Re: [PATCH] meta-isar: Allow to include isar-image-base from external layers From: Jan Kiszka To: isar-users References: Message-ID: Date: Thu, 6 Jul 2017 07:26:16 +0200 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 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: YBXH8KI7B2hm On 2017-07-06 07:08, [ext] Jan Kiszka wrote: > From: Jan Kiszka > > THISDIR is expanded immediately which makes the including file define > the path rather than the file that contains this variable. Use > FILE_DIRNAME instead which has the required late evaluation property. > > This allows to "require recipes-core/images/isar-image-base.bb" from > out-of-tree layers in order to derive an image from the base version. > > Signed-off-by: Jan Kiszka > --- > meta-isar/recipes-core/images/isar-image-base.bb | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb > index 66d3cb9..f36fdc4 100644 > --- a/meta-isar/recipes-core/images/isar-image-base.bb > +++ b/meta-isar/recipes-core/images/isar-image-base.bb > @@ -27,10 +27,10 @@ do_rootfs() { > install -d -m 755 ${WORKDIR}/hooks_multistrap > > # Copy config file > - install -m 644 ${THISDIR}/files/multistrap.conf.in ${WORKDIR}/multistrap.conf > - install -m 755 ${THISDIR}/files/${DISTRO_CONFIG_SCRIPT} ${WORKDIR}/configscript.sh > - install -m 755 ${THISDIR}/files/setup.sh ${WORKDIR} > - install -m 755 ${THISDIR}/files/download_dev-random ${WORKDIR}/hooks_multistrap/ > + install -m 644 ${FILE_DIRNAME}/files/multistrap.conf.in ${WORKDIR}/multistrap.conf > + install -m 755 ${FILE_DIRNAME}/files/${DISTRO_CONFIG_SCRIPT} ${WORKDIR}/configscript.sh > + install -m 755 ${FILE_DIRNAME}/files/setup.sh ${WORKDIR} > + install -m 755 ${FILE_DIRNAME}/files/download_dev-random ${WORKDIR}/hooks_multistrap/ > > # Adjust multistrap config > sed -i 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|' ${WORKDIR}/multistrap.conf > Forget this, I was testing the wrong version. We need to define COREBASE and derive the path from that. Jan -- Siemens AG, Corporate Technology, CT RDA ITP SES-DE Corporate Competence Center Embedded Linux