From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6439520564055900160 X-Received: by 10.28.63.11 with SMTP id m11mr1228553wma.17.1499317717429; Wed, 05 Jul 2017 22:08:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.181.141 with SMTP id g13ls65289lfk.5.gmail; Wed, 05 Jul 2017 22:08:37 -0700 (PDT) X-Received: by 10.46.80.87 with SMTP id v23mr270142ljd.6.1499317717050; Wed, 05 Jul 2017 22:08:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499317716; cv=none; d=google.com; s=arc-20160816; b=ZCqkmNDCTTYd/SBr6aDDXDZv4qURMjwmfFkeqM7NLgXoD+5j0xHGPWELI8idDGSHTk AVSRuzav8S6mrhclI8VHDNF4M21+jhbXidyoIC9U5Aywje9advy3pNKcpcREuHR/CNPw aCV0tvZcnhjHlfMRWDMZqQr3Zrhnk/t4gQXiIV3wvUJ5c/9RWKrMdRyMk9+4NiF3ML0e djBnoUkgPoW/CkUFPf+KVXeaM62rutZT1bqOokZmIR02ksj7FSRB4wX0qaG0LSrrSobZ zkaaArtKw5LV0mRz+BpZMmlIH8uIqa9aby4F6mQ6X/Fjk+/ZpR07F5PGozj+GQvDlBgc kDVA== 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:arc-authentication-results; bh=ORrcRwYw5h9nGmjNjGaEeycxGwXiNIPUatxsrY0W1XY=; b=qB9/aZpdx6gaKczPD88lPNCxltZzxqYZ629BShpx41RZrMQVWmRxWAhB1OUzgKyaY/ cBCLFUZtZ+SS0bpd0745E/xt8HyjlxhHjY9PLa2rVvShCRzASdEnIP/h9vHCyHybad+6 6NONTYXorBvD9CRpFnrNFR/tDMIEUrzPiR36iBGxUxal7y/ccqdvVo1VCoMJPKM9sadM gKGeRfsaZFEZPKKpKlcNzHeTd1tg98REnOYAQhh82B4LjhxbKEiccAEpgzhKy8xLhqmC AtzkHHvaCBxnGS4v7HbW+kUm65Rl2P6u1ptWwfwLwrsC5HCrhIqOOCLYrJyPkKxMdur1 Ij4Q== 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 k68si684296wmg.4.2017.07.05.22.08.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 22:08:36 -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 mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id v6658aUO010456 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 6 Jul 2017 07:08:36 +0200 Received: from md1f2u6c.ww002.siemens.net ([146.254.78.9]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id v6658aJ4019979 for ; Thu, 6 Jul 2017 07:08:36 +0200 To: isar-users From: Jan Kiszka Subject: [PATCH] meta-isar: Allow to include isar-image-base from external layers Message-ID: Date: Thu, 6 Jul 2017 07:08:36 +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 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: Nx1pd8U+Bq42 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 -- 2.12.3