[OE-core] [PATCH 2/7] linux-dtb.inc: fix file ending detection

Stefan Christ s.christ at phytec.de
Mon Oct 19 08:15:36 UTC 2015


Only search for 'dts' at the end of the filename. Don't trigger the
warning when the device tree name only contains 'dts'. The sed command
already replaces the string 'dts' only at the end.

Signed-off-by: Stefan Christ <s.christ at phytec.de>
---
 meta/recipes-kernel/linux/linux-dtb.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
index db2afb8..d73792a 100644
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/meta/recipes-kernel/linux/linux-dtb.inc
@@ -8,7 +8,7 @@ python __anonymous () {
 do_compile_append() {
 	if test -n "${KERNEL_DEVICETREE}"; then
 		for DTB in ${KERNEL_DEVICETREE}; do
-			if echo ${DTB} | grep -q 'dts'; then
+			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
@@ -20,7 +20,7 @@ do_compile_append() {
 do_install_append() {
 	if test -n "${KERNEL_DEVICETREE}"; then
 		for DTB in ${KERNEL_DEVICETREE}; do
-			if echo ${DTB} | grep -q 'dts'; then
+			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
@@ -38,7 +38,7 @@ do_install_append() {
 do_deploy_append() {
 	if test -n "${KERNEL_DEVICETREE}"; then
 		for DTB in ${KERNEL_DEVICETREE}; do
-			if echo ${DTB} | grep -q 'dts'; then
+			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
-- 
1.9.1




More information about the Openembedded-core mailing list