diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-08-07 12:04:06 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-11 10:53:11 +0100 |
commit | d74e7d3fa693eb7037a57dfbd0c47bc53255316f (patch) | |
tree | 21a01a1f82c164f27391c807df716d1ed21d39f1 /scripts/lib/mic/conf.py | |
parent | 554feeebe07cd47c58a960e6d8193f085427d53a (diff) | |
download | poky-d74e7d3fa693eb7037a57dfbd0c47bc53255316f.tar.gz |
wic: Remove unused conf support
Also fix up users such as imager functions.
(From OE-Core rev: eb77b9c11bd9b8dc90aacfbd5b5bc5568a233525)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/mic/conf.py')
-rw-r--r-- | scripts/lib/mic/conf.py | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/scripts/lib/mic/conf.py b/scripts/lib/mic/conf.py index 1fe6edd724..a686e9caa7 100644 --- a/scripts/lib/mic/conf.py +++ b/scripts/lib/mic/conf.py | |||
@@ -31,45 +31,18 @@ def get_siteconf(): | |||
31 | return scripts_path + "/lib/image/config/wic.conf" | 31 | return scripts_path + "/lib/image/config/wic.conf" |
32 | 32 | ||
33 | class ConfigMgr(object): | 33 | class ConfigMgr(object): |
34 | prefer_backends = ["zypp", "yum"] | ||
35 | |||
36 | DEFAULTS = {'common': { | 34 | DEFAULTS = {'common': { |
37 | "distro_name": "Default Distribution", | 35 | "distro_name": "Default Distribution", |
38 | "plugin_dir": "/usr/lib/wic/plugins", # TODO use prefix also? | 36 | "plugin_dir": "/usr/lib/wic/plugins", # TODO use prefix also? |
39 | }, | 37 | }, |
40 | 'create': { | 38 | 'create': { |
41 | "tmpdir": '/var/tmp/wic', | 39 | "tmpdir": '/var/tmp/wic', |
42 | "cachedir": '/var/tmp/wic/cache', | ||
43 | "outdir": './wic-output', | 40 | "outdir": './wic-output', |
44 | 41 | ||
45 | "arch": None, # None means auto-detect | ||
46 | "pkgmgr": "auto", | ||
47 | "name": "output", | ||
48 | "ksfile": None, | ||
49 | "ks": None, | ||
50 | "repomd": None, | ||
51 | "local_pkgs_path": None, | ||
52 | "release": None, | 42 | "release": None, |
53 | "logfile": None, | 43 | "logfile": None, |
54 | "record_pkgs": [], | ||
55 | "pack_to": None, | ||
56 | "name_prefix": None, | 44 | "name_prefix": None, |
57 | "name_suffix": None, | 45 | "name_suffix": None, |
58 | "copy_kernel": False, | ||
59 | "install_pkgs": None, | ||
60 | "repourl": {}, | ||
61 | "localrepos": [], # save localrepos | ||
62 | "runtime": "bootstrap", | ||
63 | }, | ||
64 | 'chroot': { | ||
65 | "saveto": None, | ||
66 | }, | ||
67 | 'convert': { | ||
68 | "shell": False, | ||
69 | }, | ||
70 | 'bootstrap': { | ||
71 | "rootdir": '/var/tmp/wic-bootstrap', | ||
72 | "packages": [], | ||
73 | }, | 46 | }, |
74 | } | 47 | } |
75 | 48 | ||
@@ -116,10 +89,6 @@ class ConfigMgr(object): | |||
116 | if not ksconf: | 89 | if not ksconf: |
117 | return | 90 | return |
118 | 91 | ||
119 | ksconf = misc.normalize_ksfile(ksconf, | ||
120 | self.create['release'], | ||
121 | self.create['arch']) | ||
122 | |||
123 | ks = kickstart.read_kickstart(ksconf) | 92 | ks = kickstart.read_kickstart(ksconf) |
124 | 93 | ||
125 | self.create['ks'] = ks | 94 | self.create['ks'] = ks |
@@ -130,12 +99,4 @@ class ConfigMgr(object): | |||
130 | self.create['name_prefix'], | 99 | self.create['name_prefix'], |
131 | self.create['name_suffix']) | 100 | self.create['name_suffix']) |
132 | 101 | ||
133 | def set_runtime(self, runtime): | ||
134 | if runtime not in ("bootstrap", "native"): | ||
135 | msger.error("Invalid runtime mode: %s" % runtime) | ||
136 | |||
137 | if misc.get_distro()[0] in ("tizen", "Tizen"): | ||
138 | runtime = "native" | ||
139 | self.create['runtime'] = runtime | ||
140 | |||
141 | configmgr = ConfigMgr() | 102 | configmgr = ConfigMgr() |