From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from root.phytec.de (mail.microcatalog.org.uk [217.6.246.34]) by mail.openembedded.org (Postfix) with ESMTP id 922D8770DF for ; Mon, 19 Oct 2015 08:17:42 +0000 (UTC) Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by root.phytec.de (Postfix) with ESMTP id DD2ECA00492 for ; Mon, 19 Oct 2015 10:17:53 +0200 (CEST) Received: from augenblix.phytec.de ([172.16.0.56]) by idefix.phytec.de (IBM Domino Release 9.0.1FP2 HF590) with ESMTP id 2015101910173726-42262 ; Mon, 19 Oct 2015 10:17:37 +0200 From: Stefan Christ To: openembedded-core@lists.openembedded.org Date: Mon, 19 Oct 2015 10:15:40 +0200 Message-Id: <1445242541-41638-7-git-send-email-s.christ@phytec.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445242541-41638-1-git-send-email-s.christ@phytec.de> References: <1445242541-41638-1-git-send-email-s.christ@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP2 HF590|December 11, 2014) at 19.10.2015 10:17:37, Serialize by Router on Idefix/Phytec(Release 9.0.1FP2 HF590|December 11, 2014) at 19.10.2015 10:17:37, Serialize complete at 19.10.2015 10:17:37 Subject: [PATCH 6/7] linux-dtb.inc: refactor common code to function normalize_dtb X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 08:17:42 -0000 Signed-off-by: Stefan Christ --- meta/recipes-kernel/linux/linux-dtb.inc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc index 5bfd33b..658a32f 100644 --- a/meta/recipes-kernel/linux/linux-dtb.inc +++ b/meta/recipes-kernel/linux/linux-dtb.inc @@ -5,22 +5,25 @@ python __anonymous () { d.appendVar("PACKAGES", " kernel-devicetree") } +normalize_dtb () { + DTB="$1" + if echo ${DTB} | grep -q '\.dts$'; then + bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." + DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` + fi + echo "${DTB}" +} + do_compile_append() { for DTB in ${KERNEL_DEVICETREE}; do - if echo ${DTB} | grep -q '\.dts$'; then - bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." - DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` - fi + DTB=`normalize_dtb "${DTB}"` oe_runmake ${DTB} done } do_install_append() { for DTB in ${KERNEL_DEVICETREE}; do - if echo ${DTB} | grep -q '\.dts$'; then - bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." - DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` - fi + DTB=`normalize_dtb "${DTB}"` DTB_BASE_NAME=`basename ${DTB} .dtb` DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` DTB_PATH="${B}/arch/${ARCH}/boot/dts/${DTB}" @@ -33,10 +36,7 @@ do_install_append() { do_deploy_append() { for DTB in ${KERNEL_DEVICETREE}; do - if echo ${DTB} | grep -q '\.dts$'; then - bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." - DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` - fi + DTB=`normalize_dtb "${DTB}"` DTB_BASE_NAME=`basename ${DTB} .dtb` DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` -- 1.9.1