summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2018-02-20 15:53:29 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-24 10:31:48 +0000
commit4e3d3c122f95dd0a5735b3238a4d2072749d0d97 (patch)
tree6be6e65ec1b6c2d103048f774e4a45563eac425c
parente15ce3ff0aa3ca2384031ff69b55ed1c828141df (diff)
downloadpoky-4e3d3c122f95dd0a5735b3238a4d2072749d0d97.tar.gz
logging.bbclass: Enclose the tr string in quotes
On some linux hosts image recipes will fail to build as follows: ERROR: build-essential-0.3-r0 do_image_ext3: Usage: bbdebug [123] "message" ERROR: build-essential-0.3-r0 do_image_ext3: Function failed: do_image_ext3 (log file is located at /opt/build/tmp/work/intel_corei7_64-wrs-linux/build-essential/0.3-r0/temp/log.do_image_ext3.43744) ERROR: Logfile of failure stored in: /opt/build/tmp/work/intel_corei7_64-wrs-linux/build-essential/0.3-r0/temp/log.do_image_ext3.43744 ERROR: Task (/opt/layers/meta-overc/meta-build/recipes-core/images/build-essential_0.3.bb:do_image_ext3) failed with exit code '1' Running with bitbake -v -v -v -D we get in the log file: + bbdebug 1 Executing 'dd if=/dev/zero of=/opt/build/tmp/work/intel_corei7_64-wrs-linux/build-essential/0.3-r0/deploy-build-essential-image-complete/build-essential-intel-corei7-64-20180220190510.rootfs.ext3 seek=484486 count=0 bs=1024' + USAGE='Usage: bbdebug [123] "message"' + '[' 3 -lt 2 ']' + DBGLVL=1 + shift ++ echo 1 ++ echo 1 ++ tr -d t ++ tr -d t + NONDIGITS=1 + '[' 1 ']' + bbfatal 'Usage: bbdebug [123] "message"' The debug output tells us that the NONDIGITS check failed to remove the digits using the tr expression. Enclosing the expression in quotes causes it to work properly. (From OE-Core rev: 9e6d283aa9c77685f55a62fa220226d9149ecd7a) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/logging.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/logging.bbclass b/meta/classes/logging.bbclass
index 06c7c31c3e..a0c94e98c7 100644
--- a/meta/classes/logging.bbclass
+++ b/meta/classes/logging.bbclass
@@ -86,7 +86,7 @@ bbdebug() {
86 86
87 # Strip off the debug level and ensure it is an integer 87 # Strip off the debug level and ensure it is an integer
88 DBGLVL=$1; shift 88 DBGLVL=$1; shift
89 NONDIGITS=$(echo "$DBGLVL" | tr -d [:digit:]) 89 NONDIGITS=$(echo "$DBGLVL" | tr -d "[:digit:]")
90 if [ "$NONDIGITS" ]; then 90 if [ "$NONDIGITS" ]; then
91 bbfatal "$USAGE" 91 bbfatal "$USAGE"
92 fi 92 fi