summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/__init__.py20
-rw-r--r--scripts/lib/wic/engine.py2
-rw-r--r--scripts/lib/wic/errors.py29
-rw-r--r--scripts/lib/wic/partition.py2
-rw-r--r--scripts/lib/wic/plugin.py3
-rw-r--r--scripts/lib/wic/plugins/imager/direct.py2
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py2
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-partition.py2
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py2
-rw-r--r--scripts/lib/wic/plugins/source/fsimage.py2
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py2
-rw-r--r--scripts/lib/wic/plugins/source/rawcopy.py2
-rw-r--r--scripts/lib/wic/plugins/source/rootfs.py2
-rw-r--r--scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py2
-rw-r--r--scripts/lib/wic/utils/misc.py2
-rw-r--r--scripts/lib/wic/utils/runner.py2
-rwxr-xr-xscripts/wic2
17 files changed, 35 insertions, 45 deletions
diff --git a/scripts/lib/wic/__init__.py b/scripts/lib/wic/__init__.py
index e69de29bb2..85876b138c 100644
--- a/scripts/lib/wic/__init__.py
+++ b/scripts/lib/wic/__init__.py
@@ -0,0 +1,20 @@
1#!/usr/bin/env python -tt
2#
3# Copyright (c) 2007 Red Hat, Inc.
4# Copyright (c) 2011 Intel, Inc.
5#
6# This program is free software; you can redistribute it and/or modify it
7# under the terms of the GNU General Public License as published by the Free
8# Software Foundation; version 2 of the License
9#
10# This program is distributed in the hope that it will be useful, but
11# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13# for more details.
14#
15# You should have received a copy of the GNU General Public License along
16# with this program; if not, write to the Free Software Foundation, Inc., 59
17# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18
19class WicError(Exception):
20 pass
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 38a68ed340..c29924b781 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -31,7 +31,7 @@
31import logging 31import logging
32import os 32import os
33 33
34from wic.errors import WicError 34from wic import WicError
35from wic.plugin import pluginmgr 35from wic.plugin import pluginmgr
36from wic.utils.misc import get_bitbake_var 36from wic.utils.misc import get_bitbake_var
37 37
diff --git a/scripts/lib/wic/errors.py b/scripts/lib/wic/errors.py
deleted file mode 100644
index d1b514dd9d..0000000000
--- a/scripts/lib/wic/errors.py
+++ /dev/null
@@ -1,29 +0,0 @@
1#!/usr/bin/env python -tt
2#
3# Copyright (c) 2007 Red Hat, Inc.
4# Copyright (c) 2011 Intel, Inc.
5#
6# This program is free software; you can redistribute it and/or modify it
7# under the terms of the GNU General Public License as published by the Free
8# Software Foundation; version 2 of the License
9#
10# This program is distributed in the hope that it will be useful, but
11# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13# for more details.
14#
15# You should have received a copy of the GNU General Public License along
16# with this program; if not, write to the Free Software Foundation, Inc., 59
17# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18
19class WicError(Exception):
20 pass
21
22class CreatorError(WicError):
23 pass
24
25class Usage(WicError):
26 pass
27
28class ImageError(WicError):
29 pass
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index e100377933..8e531e4dcc 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -28,7 +28,7 @@ import logging
28import os 28import os
29import tempfile 29import tempfile
30 30
31from wic.errors import WicError 31from wic import WicError
32from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var 32from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var
33from wic.plugin import pluginmgr 33from wic.plugin import pluginmgr
34 34
diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py
index 0e98da5c7a..ac55ecf545 100644
--- a/scripts/lib/wic/plugin.py
+++ b/scripts/lib/wic/plugin.py
@@ -19,8 +19,7 @@ import os
19import sys 19import sys
20import logging 20import logging
21 21
22from wic.errors import WicError 22from wic import pluginbase, WicError
23from wic import pluginbase
24from wic.utils.misc import get_bitbake_var 23from wic.utils.misc import get_bitbake_var
25 24
26__ALL__ = ['PluginMgr', 'pluginmgr'] 25__ALL__ = ['PluginMgr', 'pluginmgr']
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 5b20ca9c5b..6d1ed8c205 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -32,7 +32,7 @@ import uuid
32 32
33from time import strftime 33from time import strftime
34 34
35from wic.errors import WicError 35from wic import WicError
36from wic.filemap import sparse_copy 36from wic.filemap import sparse_copy
37from wic.ksparser import KickStart, KickStartError 37from wic.ksparser import KickStart, KickStartError
38from wic.plugin import pluginmgr 38from wic.plugin import pluginmgr
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 1f018fabf4..2d793a5cb7 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -28,7 +28,7 @@ import logging
28import os 28import os
29import shutil 29import shutil
30 30
31from wic.errors import WicError 31from wic import WicError
32from wic.engine import get_custom_config 32from wic.engine import get_custom_config
33from wic.pluginbase import SourcePlugin 33from wic.pluginbase import SourcePlugin
34from wic.utils.misc import (exec_cmd, exec_native_cmd, get_bitbake_var, 34from wic.utils.misc import (exec_cmd, exec_native_cmd, get_bitbake_var,
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py
index e9724a63a3..373e8d8f75 100644
--- a/scripts/lib/wic/plugins/source/bootimg-partition.py
+++ b/scripts/lib/wic/plugins/source/bootimg-partition.py
@@ -29,7 +29,7 @@ import re
29 29
30from glob import glob 30from glob import glob
31 31
32from wic.errors import WicError 32from wic import WicError
33from wic.pluginbase import SourcePlugin 33from wic.pluginbase import SourcePlugin
34from wic.utils.misc import exec_cmd, get_bitbake_var 34from wic.utils.misc import exec_cmd, get_bitbake_var
35 35
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index c3a0e4eb42..74c75a054e 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -27,8 +27,8 @@
27import logging 27import logging
28import os 28import os
29 29
30from wic import WicError
30from wic.engine import get_custom_config 31from wic.engine import get_custom_config
31from wic.errors import WicError
32from wic.utils import runner 32from wic.utils import runner
33from wic.pluginbase import SourcePlugin 33from wic.pluginbase import SourcePlugin
34from wic.utils.misc import (exec_cmd, exec_native_cmd, 34from wic.utils.misc import (exec_cmd, exec_native_cmd,
diff --git a/scripts/lib/wic/plugins/source/fsimage.py b/scripts/lib/wic/plugins/source/fsimage.py
index 67fc6d1b04..8fbe44d975 100644
--- a/scripts/lib/wic/plugins/source/fsimage.py
+++ b/scripts/lib/wic/plugins/source/fsimage.py
@@ -18,7 +18,7 @@
18import logging 18import logging
19import os 19import os
20 20
21from wic.errors import WicError 21from wic import WicError
22from wic.pluginbase import SourcePlugin 22from wic.pluginbase import SourcePlugin
23from wic.utils.misc import get_bitbake_var 23from wic.utils.misc import get_bitbake_var
24 24
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index df86acc0e0..1ceba62be0 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -26,7 +26,7 @@ import os
26import re 26import re
27import shutil 27import shutil
28 28
29from wic.errors import WicError 29from wic import WicError
30from wic.engine import get_custom_config 30from wic.engine import get_custom_config
31from wic.pluginbase import SourcePlugin 31from wic.pluginbase import SourcePlugin
32from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var 32from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var
diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py
index 561280977a..12348ae35e 100644
--- a/scripts/lib/wic/plugins/source/rawcopy.py
+++ b/scripts/lib/wic/plugins/source/rawcopy.py
@@ -18,7 +18,7 @@
18import logging 18import logging
19import os 19import os
20 20
21from wic.errors import WicError 21from wic import WicError
22from wic.pluginbase import SourcePlugin 22from wic.pluginbase import SourcePlugin
23from wic.utils.misc import exec_cmd, get_bitbake_var 23from wic.utils.misc import exec_cmd, get_bitbake_var
24from wic.filemap import sparse_copy 24from wic.filemap import sparse_copy
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
index f7ca569604..f2e2ca8a2b 100644
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -31,7 +31,7 @@ import shutil
31 31
32from oe.path import copyhardlinktree 32from oe.path import copyhardlinktree
33 33
34from wic.errors import WicError 34from wic import WicError
35from wic.pluginbase import SourcePlugin 35from wic.pluginbase import SourcePlugin
36from wic.utils.misc import get_bitbake_var, exec_cmd 36from wic.utils.misc import get_bitbake_var, exec_cmd
37 37
diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
index cf0eec2fe3..94f80d07ae 100644
--- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
+++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
@@ -22,7 +22,7 @@ import logging
22import os 22import os
23import re 23import re
24 24
25from wic.errors import WicError 25from wic import WicError
26from wic.utils import runner 26from wic.utils import runner
27from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd 27from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
28from wic.pluginbase import SourcePlugin 28from wic.pluginbase import SourcePlugin
diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py
index 94fdab2669..4b822f0eee 100644
--- a/scripts/lib/wic/utils/misc.py
+++ b/scripts/lib/wic/utils/misc.py
@@ -33,7 +33,7 @@ import re
33from collections import defaultdict 33from collections import defaultdict
34from distutils import spawn 34from distutils import spawn
35 35
36from wic.errors import WicError 36from wic import WicError
37from wic.utils import runner 37from wic.utils import runner
38 38
39logger = logging.getLogger('wic') 39logger = logging.getLogger('wic')
diff --git a/scripts/lib/wic/utils/runner.py b/scripts/lib/wic/utils/runner.py
index 5ede1929a3..56d7ea3adf 100644
--- a/scripts/lib/wic/utils/runner.py
+++ b/scripts/lib/wic/utils/runner.py
@@ -19,7 +19,7 @@ import logging
19import os 19import os
20import subprocess 20import subprocess
21 21
22from wic.errors import WicError 22from wic import WicError
23 23
24logger = logging.getLogger('wic') 24logger = logging.getLogger('wic')
25 25
diff --git a/scripts/wic b/scripts/wic
index 97af72b104..f32cb19b34 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -53,7 +53,7 @@ if bitbake_exe:
53else: 53else:
54 bitbake_main = None 54 bitbake_main = None
55 55
56from wic.errors import WicError 56from wic import WicError
57from wic.utils.misc import get_bitbake_var, BB_VARS 57from wic.utils.misc import get_bitbake_var, BB_VARS
58from wic import engine 58from wic import engine
59from wic import help as hlp 59from wic import help as hlp