From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH 05/10] u-boot-script: Switch to wks-file class for WKS_FILE search
Date: Mon, 8 Oct 2018 13:01:09 +0200 [thread overview]
Message-ID: <ce659a6cc004f73c270a76cdf08eb45df58b2f47.1538996473.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1538996473.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1538996473.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
Use the new central search implementation.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb b/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb
index 8d1ad25..768a94f 100644
--- a/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb
+++ b/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb
@@ -6,6 +6,9 @@
# SPDX-License-Identifier: MIT
inherit dpkg-raw
+inherit wks-file
+
+WKS_FULL_PATH = "${@get_wks_full_path(d)}"
DESCRIPTION = "Boot script generator for U-Boot"
@@ -61,17 +64,7 @@ init_config_from_wks() {
}
do_install() {
- # Find WKS_FILE specified for the current target.
- WKS_DIRS=$(dirname $(which wic))/lib/wic/canned-wks
- for LAYER in ${BBLAYERS}; do
- WKS_DIRS="${WKS_DIRS} ${LAYER}/scripts/lib/wic/canned-wks"
- done
- for DIR in ${WKS_DIRS}; do
- if [ -f ${DIR}/${WKS_FILE}.wks ]; then
- init_config_from_wks ${DIR}/${WKS_FILE}.wks
- break
- fi
- done
+ [ -n ${WKS_FULL_PATH} ] && init_config_from_wks "${WKS_FULL_PATH}"
sudo rm -rf ${D}/etc ${D}/usr
--
2.16.4
next prev parent reply other threads:[~2018-10-08 11:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-08 11:01 [PATCH 00/10] Pending queue: various fixes, improve rebuilds on dependency changes Jan Kiszka
2018-10-08 11:01 ` [PATCH 01/10] u-boot-custom: Fix parallel build Jan Kiszka
2018-10-08 11:01 ` [PATCH 02/10] u-boot-custom: Fix comment Jan Kiszka
2018-10-08 11:01 ` [PATCH 03/10] u-boot-custom: Allow to extend or replace U-Boot build dependencies Jan Kiszka
2018-10-08 11:01 ` [PATCH 04/10] meta: Add bbclass to retrieve selected WKS file Jan Kiszka
2018-10-08 11:01 ` Jan Kiszka [this message]
2018-10-13 6:05 ` [PATCH 05/10] u-boot-script: Switch to wks-file class for WKS_FILE search chombourger
2018-10-13 13:53 ` Jan Kiszka
2018-10-13 14:49 ` Cedric Hombourger
2018-10-08 11:01 ` [PATCH 06/10] wic-img: Use wks-file class for WKS_FILE lookup Jan Kiszka
2018-10-08 11:01 ` [PATCH 07/10] wic-img: Add WKS_FILE to wic_image task checksum Jan Kiszka
2018-10-08 11:01 ` [PATCH 08/10] base: Improve detection of dependency changes Jan Kiszka
2018-10-08 11:01 ` [PATCH 09/10] linux-custom: Fix typo in KERNEL_NAME_PROVIDED variable Jan Kiszka
2018-10-08 11:01 ` [PATCH 10/10] wic-img: Fix image copy-out in do_wic_image Jan Kiszka
2018-10-10 13:27 ` [PATCH 00/10] Pending queue: various fixes, improve rebuilds on dependency changes 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=ce659a6cc004f73c270a76cdf08eb45df58b2f47.1538996473.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