diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-30 23:23:00 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-02 17:37:44 +0000 |
commit | 65a99448a4b044ccde005247d54de6172ee25172 (patch) | |
tree | 941aefc256190c7f020a9839ea86b10666a186a2 /scripts | |
parent | d3c6c10de478b21c8f82898c0c1ec114dbfe33c3 (diff) | |
download | poky-65a99448a4b044ccde005247d54de6172ee25172.tar.gz |
wic: creator: stop using config manager
This is a preparation to removing conf.py and config/wic.conf
from the codebase.
confmgr object is complicated for no reason and almost
useless as all configuration info comes from command line and
bitbake variables. It's used it creator.py to store information
about output directory, logs and some never used functionality
like tmpfs for future use, which doesn't actually happen.
[YOCTO #10619]
(From OE-Core rev: 702ee7a1fe30d87d55ba9528ae89abff4e294fd9)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/wic/creator.py | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/scripts/lib/wic/creator.py b/scripts/lib/wic/creator.py index 8f7d1503f5..74db83cd30 100644 --- a/scripts/lib/wic/creator.py +++ b/scripts/lib/wic/creator.py | |||
@@ -20,10 +20,8 @@ from optparse import OptionParser, SUPPRESS_HELP | |||
20 | 20 | ||
21 | from wic import msger | 21 | from wic import msger |
22 | from wic.utils import errors | 22 | from wic.utils import errors |
23 | from wic.conf import configmgr | ||
24 | from wic.plugin import pluginmgr | 23 | from wic.plugin import pluginmgr |
25 | 24 | ||
26 | |||
27 | class Creator(): | 25 | class Creator(): |
28 | """${name}: create an image | 26 | """${name}: create an image |
29 | 27 | ||
@@ -89,23 +87,6 @@ class Creator(): | |||
89 | os.makedirs(os.path.dirname(logfile_abs_path)) | 87 | os.makedirs(os.path.dirname(logfile_abs_path)) |
90 | msger.set_interactive(False) | 88 | msger.set_interactive(False) |
91 | msger.set_logfile(logfile_abs_path) | 89 | msger.set_logfile(logfile_abs_path) |
92 | configmgr.create['logfile'] = options.logfile | ||
93 | |||
94 | if options.config: | ||
95 | configmgr.reset() | ||
96 | configmgr._siteconf = options.config | ||
97 | |||
98 | if options.outdir is not None: | ||
99 | configmgr.create['outdir'] = abspath(options.outdir) | ||
100 | |||
101 | cdir = 'outdir' | ||
102 | if os.path.exists(configmgr.create[cdir]) \ | ||
103 | and not os.path.isdir(configmgr.create[cdir]): | ||
104 | msger.error('Invalid directory specified: %s' \ | ||
105 | % configmgr.create[cdir]) | ||
106 | |||
107 | if options.enabletmpfs: | ||
108 | configmgr.create['enabletmpfs'] = options.enabletmpfs | ||
109 | 90 | ||
110 | def main(self, argv=None): | 91 | def main(self, argv=None): |
111 | if argv is None: | 92 | if argv is None: |