From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6439520564055900160 X-Received: by 10.25.233.198 with SMTP id j67mr348918lfk.16.1499320685503; Wed, 05 Jul 2017 22:58:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.181.12 with SMTP id e12ls68046lff.14.gmail; Wed, 05 Jul 2017 22:58:05 -0700 (PDT) X-Received: by 10.25.204.65 with SMTP id c62mr342815lfg.13.1499320685049; Wed, 05 Jul 2017 22:58:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499320684; cv=none; d=google.com; s=arc-20160816; b=m/XZsv1YfDbrlPF2uD9hwMDMpjavMvyZL3ovtVDew1GtB+zpOOjjvmvMXi/wpDh+ri Plfu4/M6SwEKK3cqmuOOyPQEnCGQd9+d+9YtjDjPvflTDuc35WXgd27Q+7/tG4cOfLas VCbccgEhg/mk8S4heyYyolUvF96na12ehJ8GT6BgOui856TFYRLuLNd0bilFRZQvlbG7 9jdYV27K7YEPElyl60+nCbDz20qx/gWd9mcu2vzZSSNdl7eJrbrGruIwytiXVyEV/ZYX ZifznoPPAL35d4mX8nC4KncWiY6nyiiLwm+gxAzmeh91E2eoEUED3ohLKWDzoLHmtHT0 T/qA== 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=CrE6TAAM9E/pAtosN90q/fqmUCZ+tr3q1WH9bQDSLls=; b=xCRQu+7yng5BA3cMAh0GGCIPY6ZcQXF9tVNrG9Mj68MnQxjGRxn4o+hK9jbz2Z5sCa XQYuaxQabYfaPhgOPXCyiBTirkc2lHCoKAaL4JG2I6ao7cSIYjfXmld+OTa8fH+WnS7R cctpPkUq6bkR9xF/85n6gxBtTU4wlRsdE/fwdLnDuFjVwo6+n3k1iel0d8VcNagrHE9O XQKk3CKETZEIPt0Z7AywEcLR+X8SPnxCdYudPmSYTPtfu5GBzxTiP6A5C/ut8ta9Pf3x 6jk4j8/K2Ovnoy94ijCq6CulEQt7FZejEsksLZ+vlqyCugu03uvkNzXDoMBMNsaTdQo8 y5Xg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id k68si709919wmg.4.2017.07.05.22.58.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 22:58:04 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of jan.kiszka@siemens.com) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id v665w4bU028678 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 6 Jul 2017 07:58:04 +0200 Received: from md1f2u6c.ww002.siemens.net ([146.254.78.9]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v665w2Vh008458 for ; Thu, 6 Jul 2017 07:58:04 +0200 To: isar-users From: Jan Kiszka Subject: [PATCH v2] meta-isar: Allow to include isar-image-base from external layers Message-ID: <4d380e5e-96c9-4ee6-7441-0de7aa07a2b4@siemens.com> Date: Thu, 6 Jul 2017 07:58:02 +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: 4dvNTUIfldaJ From: Jan Kiszka THISDIR is expanded in way that the including file defines the path, rather than the file that contains this variable. This prevents including this recipe from an external layer in order to derive an image from it. Define an use the COREBASE variable with points to the Isar core repository, analogously to OE's COREBASE. Signed-off-by: Jan Kiszka --- meta-isar/recipes-core/images/isar-image-base.bb | 10 ++++++---- meta/conf/layer.conf | 3 +++ 2 files changed, 9 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..7ea8c75 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -21,16 +21,18 @@ WORKDIR = "${TMPDIR}/work/${PN}/${MACHINE}" S = "${WORKDIR}/rootfs" IMAGE_ROOTFS = "${S}" +FILESDIR = "${COREBASE}/meta-isar/recipes-core/images/files" + do_rootfs[stamp-extra-info] = "${MACHINE}" 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 ${FILESDIR}/multistrap.conf.in ${WORKDIR}/multistrap.conf + install -m 755 ${FILESDIR}/${DISTRO_CONFIG_SCRIPT} ${WORKDIR}/configscript.sh + install -m 755 ${FILESDIR}/setup.sh ${WORKDIR} + install -m 755 ${FILESDIR}/download_dev-random ${WORKDIR}/hooks_multistrap/ # Adjust multistrap config sed -i 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|' ${WORKDIR}/multistrap.conf diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index ab6ae8e..470e834 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -16,3 +16,6 @@ BBFILE_PRIORITY_core = "5" LAYERVERSION_core = "1" LAYERDIR_core = "${LAYERDIR}" + +# Set a variable to get to the top of the metadata location +COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}' -- 2.12.3