From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH 2/3] Remove last reference from meta to meta-isar
Date: Fri, 18 Jan 2019 17:24:39 +0100 [thread overview]
Message-ID: <94b7e82fedd8a772e0ac7046358a8b14773a5022.1547828680.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1547828680.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1547828680.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
No that we can specify the DISTRO_CONFIG_SCRIPT also by absolute path,
we can drop the hack of adding meta-isar to isar-image's FILESPATH.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta-isar/conf/distro/raspbian-jessie.conf | 2 +-
meta/classes/isar-image.bbclass | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta-isar/conf/distro/raspbian-jessie.conf b/meta-isar/conf/distro/raspbian-jessie.conf
index 4ebf523..5e907e5 100644
--- a/meta-isar/conf/distro/raspbian-jessie.conf
+++ b/meta-isar/conf/distro/raspbian-jessie.conf
@@ -8,5 +8,5 @@ BASE_DISTRO_CODENAME = "jessie"
DISTRO_APT_SOURCES += "conf/distro/raspbian-jessie.list"
DISTRO_APT_KEYS += "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de"
-DISTRO_CONFIG_SCRIPT ?= "raspbian-configscript.sh"
+DISTRO_CONFIG_SCRIPT ?= "${LAYERDIR_isar}/conf/distro/raspbian-configscript.sh"
DISTRO_KERNELS ?= "rpi rpi2 rpi-rpfv rpi2-rpfv"
diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass
index 237e2cb..e2bae58 100644
--- a/meta/classes/isar-image.bbclass
+++ b/meta/classes/isar-image.bbclass
@@ -12,7 +12,6 @@ def cfg_script(d):
return 'file://' + cf
return ''
-FILESPATH =. "${LAYERDIR_isar}/conf/distro:"
FILESPATH =. "${LAYERDIR_core}/conf/distro:"
SRC_URI += "${@ cfg_script(d) }"
--
2.16.4
next prev parent reply other threads:[~2019-01-18 16:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-18 16:24 [PATCH 0/3] Follow-up fixes to meta/meta-isar reorganisation Jan Kiszka
2019-01-18 16:24 ` [PATCH 1/3] isar-image: Allow paths in DISTRO_CONFIG_SCRIPT Jan Kiszka
2019-01-18 16:24 ` Jan Kiszka [this message]
2019-01-18 16:24 ` [PATCH 3/3] doc: Fix licenses path in user manual Jan Kiszka
2019-01-23 13:41 ` [PATCH 0/3] Follow-up fixes to meta/meta-isar reorganisation Maxim Yu. Osipov
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=94b7e82fedd8a772e0ac7046358a8b14773a5022.1547828680.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=isar-users@googlegroups.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