summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorcajun-rat <phil@advancedtelematic.com>2018-02-02 15:09:54 +0100
committerGitHub <noreply@github.com>2018-02-02 15:09:54 +0100
commit51173110ef607a90d3fe699a7f53b6fbe6c76385 (patch)
treed92477a7b4eb371f1f057e13059bd2e692fbf51e /scripts/lib
parent1ea77e2a98e77956d687cfa6c445518938a5e809 (diff)
parent296497365ed9fa11c752d51d1e71b25a054cd5d4 (diff)
downloadmeta-updater-51173110ef607a90d3fe699a7f53b6fbe6c76385.tar.gz
Merge pull request #248 from advancedtelematic/feat/mergerocko
Merge our current progress from Rocko to master
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/wic/plugins/source/otaimage.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/plugins/source/otaimage.py b/scripts/lib/wic/plugins/source/otaimage.py
index 26cfb10..ee8088b 100644
--- a/scripts/lib/wic/plugins/source/otaimage.py
+++ b/scripts/lib/wic/plugins/source/otaimage.py
@@ -20,7 +20,7 @@ import os
20import sys 20import sys
21 21
22from wic.plugins.source.rawcopy import RawCopyPlugin 22from wic.plugins.source.rawcopy import RawCopyPlugin
23from wic.utils.misc import get_bitbake_var 23from wic.misc import get_bitbake_var
24 24
25logger = logging.getLogger('wic') 25logger = logging.getLogger('wic')
26 26