[oe-commits] [openembedded-core] 17/19: kernel-devicetree: Corrected normalize_dtb

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 1f574c424ea89c0d8cff840f88815c3fdfa6386d
Author: Paulo Neves <ptsneves at gmail.com>
AuthorDate: Mon Jul 2 17:03:44 2018 +0200

    kernel-devicetree: Corrected normalize_dtb
    
    The normalize_dtb function was buggy because
    it only converted from .dts suffix to .dtb
    suffix if the user passed a full source path to
    KERNEL_DEVICETREE containing the /dts/ path.
    The problem is that if the user did that there
    would be a warning.
    
    On the othet hand if user just set the variable
    KERNEL_DEVICETREE="file.dts" the bbclass translation
    to the respective .dtb target did not occur and
    make would fail saying it has no rule to make target
    file.dts
    
    This patch decouples the logic of having /dts/ in the
    path from the target translation.
    
    Signed-off-by: Paulo Neves <ptsneves at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/kernel-devicetree.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass
index 4f80cc6..9866d84 100644
--- a/meta/classes/kernel-devicetree.bbclass
+++ b/meta/classes/kernel-devicetree.bbclass
@@ -13,8 +13,8 @@ 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
+	DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
 	echo "${DTB}"
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.