From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6609939533494484992 X-Received: by 2002:a5d:4a0a:: with SMTP id m10-v6mr2032341wrq.27.1538996478234; Mon, 08 Oct 2018 04:01:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:8683:: with SMTP id i125-v6ls57020wmd.7.canary-gmail; Mon, 08 Oct 2018 04:01:17 -0700 (PDT) X-Google-Smtp-Source: ACcGV62BzbuVkgq8oGjkaxlBdpD6oVV/IoIi28kiDzOjEVvQaeB79P/IHn1eIZts7qPTCDFFy3mR X-Received: by 2002:a1c:f60a:: with SMTP id w10-v6mr2195797wmc.19.1538996477737; Mon, 08 Oct 2018 04:01:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538996477; cv=none; d=google.com; s=arc-20160816; b=wUkuJQnjjpj+hUbXvCtkcESWscSLwqVd3aDfqtN+/7jwwBRQk0nfXVYcw8gA6j/tmE +GAg9QwPy9iYA2ehnkQbQ6gMYgieoNwirk9G9JBrjJMa1GLhcgOgKD/fBtgtVJrufV0E bexdTT69iTQawVD7YQDY7HY/2R813UlWS7oNprQfAwMWqh6tymKSduHbr4rdr+MlIdK2 x4Dqe9Z5L+otaSP2LMNIr4eC1bIsQuSpE0QS9fvV1p5FSoK0Q75slcwziLZ/uQTtnFE1 mxp8ezt8YvOYiLbZ7vXMNcPAybrY+l3FxN5a/toxtj4y6VzmeGSZ7rsQab5wEfvfIS7S ScoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=PFNGfuvBeRE/0k7quGOLQgSb4eWvefqWaMoSEAAmScw=; b=KBU0Fp3XIkLhG/aoZSXc0skkR7e8Bx6JLAr6zTX2SrDo0p8DZEjmsp3COFWWeoN8P7 iwKc3ahHghBslxQJRiDOjp7aRrRl1FgNjnLxDR8+lPnCk8h2BCKvADMTlejDQVSYfOw+ AOBJA8gmH5rGCQ5TblyqavPPLBGL75g22B+n7NVOlEZwCDEmtsQJxs8oHILgvw3uQjr6 SjIbKTgkgYFHBhXGKtFAKfTqK8ezj/PXzECCBPvJObRk06TUuUZRlF2BVP+4c3vRRvp9 x+hVeGacngXGBCgL90yVCqdtwlUPvXCVMxaYs8/U1dUW1XbVQk5IsvsbZin4LSif6IoN 4awQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id 191-v6si683471wmv.0.2018.10.08.04.01.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Oct 2018 04:01:17 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w98B1HJp018166 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 8 Oct 2018 13:01:17 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.48.216]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id w98B1ExP014631 for ; Mon, 8 Oct 2018 13:01:16 +0200 From: Jan Kiszka To: isar-users 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 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: fu9OWRyEDFwB From: Jan Kiszka Use the new central search implementation. Signed-off-by: Jan Kiszka --- 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