summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2016-09-30 21:53:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-05 00:17:29 +0100
commit7bab454b0bf0075fbb2a5de06286a9da1df2adc6 (patch)
tree23a4e3fccd7f1d334a461f2a573c87e9f6d2eaf1
parent4c3fb7f63aad4a5d1b9720c76091cd0646859c2a (diff)
downloadopenembedded-core-7bab454b0bf0075fbb2a5de06286a9da1df2adc6.tar.gz
openembedded-core-7bab454b0bf0075fbb2a5de06286a9da1df2adc6.tar.bz2
openembedded-core-7bab454b0bf0075fbb2a5de06286a9da1df2adc6.zip
devtool: deploy-target: Avoid unnecessary dependency on awk on the target
Relying on that awk is installed on the target just to extract the fourth column (i.e., the free volume size) from `df -P` is an unnecessary dependency for devtool deploy-target. As it is already using sed to mangle the output from `df -P`, this can easily be modified to only extract the free volume size. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/devtool/deploy.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py
index fb84f2dd08..c4c7bf6c73 100644
--- a/scripts/lib/devtool/deploy.py
+++ b/scripts/lib/devtool/deploy.py
@@ -85,7 +85,7 @@ def _prepare_remote_script(deploy, verbose=False, dryrun=False, undeployall=Fals
lines.append('do')
lines.append(' checkpath=`dirname "$checkpath"`')
lines.append('done')
- lines.append('freespace=`df -P $checkpath | sed "1d" | awk \'{ print $4 }\'`')
+ lines.append(r'freespace=$(df -P $checkpath | sed -nre "s/^(\S+\s+){3}([0-9]+).*/\2/p")')
# First line of the file is the total space
lines.append('total=`head -n1 $3`')
lines.append('if [ $total -gt $freespace ] ; then')