summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-06-17 14:25:23 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 11:47:32 +0100
commit553f3322650235ff267627504bd49c3d04c1f39c (patch)
treea3a900e4ea82040c5cd0b88d1e733480d13009eb /scripts
parent928621368830aae4423cfcfb1bb3990b6ca83f13 (diff)
downloadpoky-553f3322650235ff267627504bd49c3d04c1f39c.tar.gz
wic: Code cleanup: bad-classmethod-argument
Fixed wrong name for the first argument in class methods. Pylint complains about the issue this way: Class method should have 'cls' as first argument (From OE-Core rev: cd7c72d6d5a5110173d0d3f60f2991b1dc30fc26) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/pluginbase.py8
-rw-r--r--scripts/lib/wic/plugins/imager/direct_plugin.py6
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py12
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-partition.py6
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py6
-rw-r--r--scripts/lib/wic/plugins/source/fsimage.py6
-rw-r--r--scripts/lib/wic/plugins/source/rawcopy.py6
-rw-r--r--scripts/lib/wic/plugins/source/rootfs.py4
8 files changed, 27 insertions, 27 deletions
diff --git a/scripts/lib/wic/pluginbase.py b/scripts/lib/wic/pluginbase.py
index 72bcad2b7a..50e442d61c 100644
--- a/scripts/lib/wic/pluginbase.py
+++ b/scripts/lib/wic/pluginbase.py
@@ -52,7 +52,7 @@ class SourcePlugin(_Plugin):
52 """ 52 """
53 53
54 @classmethod 54 @classmethod
55 def do_install_disk(self, disk, disk_name, cr, workdir, oe_builddir, 55 def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir,
56 bootimg_dir, kernel_dir, native_sysroot): 56 bootimg_dir, kernel_dir, native_sysroot):
57 """ 57 """
58 Called after all partitions have been prepared and assembled into a 58 Called after all partitions have been prepared and assembled into a
@@ -62,7 +62,7 @@ class SourcePlugin(_Plugin):
62 msger.debug("SourcePlugin: do_install_disk: disk: %s" % disk_name) 62 msger.debug("SourcePlugin: do_install_disk: disk: %s" % disk_name)
63 63
64 @classmethod 64 @classmethod
65 def do_stage_partition(self, part, source_params, cr, cr_workdir, 65 def do_stage_partition(cls, part, source_params, cr, cr_workdir,
66 oe_builddir, bootimg_dir, kernel_dir, 66 oe_builddir, bootimg_dir, kernel_dir,
67 native_sysroot): 67 native_sysroot):
68 """ 68 """
@@ -79,7 +79,7 @@ class SourcePlugin(_Plugin):
79 msger.debug("SourcePlugin: do_stage_partition: part: %s" % part) 79 msger.debug("SourcePlugin: do_stage_partition: part: %s" % part)
80 80
81 @classmethod 81 @classmethod
82 def do_configure_partition(self, part, source_params, cr, cr_workdir, 82 def do_configure_partition(cls, part, source_params, cr, cr_workdir,
83 oe_builddir, bootimg_dir, kernel_dir, 83 oe_builddir, bootimg_dir, kernel_dir,
84 native_sysroot): 84 native_sysroot):
85 """ 85 """
@@ -90,7 +90,7 @@ class SourcePlugin(_Plugin):
90 msger.debug("SourcePlugin: do_configure_partition: part: %s" % part) 90 msger.debug("SourcePlugin: do_configure_partition: part: %s" % part)
91 91
92 @classmethod 92 @classmethod
93 def do_prepare_partition(self, part, source_params, cr, cr_workdir, 93 def do_prepare_partition(cls, part, source_params, cr, cr_workdir,
94 oe_builddir, bootimg_dir, kernel_dir, rootfs_dir, 94 oe_builddir, bootimg_dir, kernel_dir, rootfs_dir,
95 native_sysroot): 95 native_sysroot):
96 """ 96 """
diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py b/scripts/lib/wic/plugins/imager/direct_plugin.py
index 17888e971c..1720f7bb20 100644
--- a/scripts/lib/wic/plugins/imager/direct_plugin.py
+++ b/scripts/lib/wic/plugins/imager/direct_plugin.py
@@ -36,7 +36,7 @@ class DirectPlugin(ImagerPlugin):
36 name = 'direct' 36 name = 'direct'
37 37
38 @classmethod 38 @classmethod
39 def __rootfs_dir_to_dict(self, rootfs_dirs): 39 def __rootfs_dir_to_dict(cls, rootfs_dirs):
40 """ 40 """
41 Gets a string that contain 'connection=dir' splitted by 41 Gets a string that contain 'connection=dir' splitted by
42 space and return a dict 42 space and return a dict
@@ -49,7 +49,7 @@ class DirectPlugin(ImagerPlugin):
49 return krootfs_dir 49 return krootfs_dir
50 50
51 @classmethod 51 @classmethod
52 def do_create(self, subcmd, opts, *args): 52 def do_create(cls, subcmd, opts, *args):
53 """ 53 """
54 Create direct image, called from creator as 'direct' cmd 54 Create direct image, called from creator as 'direct' cmd
55 """ 55 """
@@ -67,7 +67,7 @@ class DirectPlugin(ImagerPlugin):
67 image_output_dir = args[5] 67 image_output_dir = args[5]
68 oe_builddir = args[6] 68 oe_builddir = args[6]
69 69
70 krootfs_dir = self.__rootfs_dir_to_dict(rootfs_dir) 70 krootfs_dir = cls.__rootfs_dir_to_dict(rootfs_dir)
71 71
72 configmgr._ksconf = ksconf 72 configmgr._ksconf = ksconf
73 73
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index d3b8468c7b..f50f631313 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -37,7 +37,7 @@ class BootimgEFIPlugin(SourcePlugin):
37 name = 'bootimg-efi' 37 name = 'bootimg-efi'
38 38
39 @classmethod 39 @classmethod
40 def do_configure_grubefi(self, hdddir, cr, cr_workdir): 40 def do_configure_grubefi(cls, hdddir, cr, cr_workdir):
41 """ 41 """
42 Create loader-specific (grub-efi) config 42 Create loader-specific (grub-efi) config
43 """ 43 """
@@ -71,7 +71,7 @@ class BootimgEFIPlugin(SourcePlugin):
71 cfg.close() 71 cfg.close()
72 72
73 @classmethod 73 @classmethod
74 def do_configure_gummiboot(self, hdddir, cr, cr_workdir): 74 def do_configure_gummiboot(cls, hdddir, cr, cr_workdir):
75 """ 75 """
76 Create loader-specific (gummiboot) config 76 Create loader-specific (gummiboot) config
77 """ 77 """
@@ -112,7 +112,7 @@ class BootimgEFIPlugin(SourcePlugin):
112 112
113 113
114 @classmethod 114 @classmethod
115 def do_configure_partition(self, part, source_params, cr, cr_workdir, 115 def do_configure_partition(cls, part, source_params, cr, cr_workdir,
116 oe_builddir, bootimg_dir, kernel_dir, 116 oe_builddir, bootimg_dir, kernel_dir,
117 native_sysroot): 117 native_sysroot):
118 """ 118 """
@@ -127,9 +127,9 @@ class BootimgEFIPlugin(SourcePlugin):
127 127
128 try: 128 try:
129 if source_params['loader'] == 'grub-efi': 129 if source_params['loader'] == 'grub-efi':
130 self.do_configure_grubefi(hdddir, cr, cr_workdir) 130 cls.do_configure_grubefi(hdddir, cr, cr_workdir)
131 elif source_params['loader'] == 'gummiboot': 131 elif source_params['loader'] == 'gummiboot':
132 self.do_configure_gummiboot(hdddir, cr, cr_workdir) 132 cls.do_configure_gummiboot(hdddir, cr, cr_workdir)
133 else: 133 else:
134 msger.error("unrecognized bootimg-efi loader: %s" % source_params['loader']) 134 msger.error("unrecognized bootimg-efi loader: %s" % source_params['loader'])
135 except KeyError: 135 except KeyError:
@@ -137,7 +137,7 @@ class BootimgEFIPlugin(SourcePlugin):
137 137
138 138
139 @classmethod 139 @classmethod
140 def do_prepare_partition(self, part, source_params, cr, cr_workdir, 140 def do_prepare_partition(cls, part, source_params, cr, cr_workdir,
141 oe_builddir, bootimg_dir, kernel_dir, 141 oe_builddir, bootimg_dir, kernel_dir,
142 rootfs_dir, native_sysroot): 142 rootfs_dir, native_sysroot):
143 """ 143 """
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py
index 909e59b6e2..2ffce6b3b3 100644
--- a/scripts/lib/wic/plugins/source/bootimg-partition.py
+++ b/scripts/lib/wic/plugins/source/bootimg-partition.py
@@ -35,7 +35,7 @@ class BootimgPartitionPlugin(SourcePlugin):
35 name = 'bootimg-partition' 35 name = 'bootimg-partition'
36 36
37 @classmethod 37 @classmethod
38 def do_install_disk(self, disk, disk_name, cr, workdir, oe_builddir, 38 def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir,
39 bootimg_dir, kernel_dir, native_sysroot): 39 bootimg_dir, kernel_dir, native_sysroot):
40 """ 40 """
41 Called after all partitions have been prepared and assembled into a 41 Called after all partitions have been prepared and assembled into a
@@ -44,7 +44,7 @@ class BootimgPartitionPlugin(SourcePlugin):
44 pass 44 pass
45 45
46 @classmethod 46 @classmethod
47 def do_configure_partition(self, part, source_params, cr, cr_workdir, 47 def do_configure_partition(cls, part, source_params, cr, cr_workdir,
48 oe_builddir, bootimg_dir, kernel_dir, 48 oe_builddir, bootimg_dir, kernel_dir,
49 native_sysroot): 49 native_sysroot):
50 """ 50 """
@@ -55,7 +55,7 @@ class BootimgPartitionPlugin(SourcePlugin):
55 pass 55 pass
56 56
57 @classmethod 57 @classmethod
58 def do_prepare_partition(self, part, source_params, cr, cr_workdir, 58 def do_prepare_partition(cls, part, source_params, cr, cr_workdir,
59 oe_builddir, bootimg_dir, kernel_dir, 59 oe_builddir, bootimg_dir, kernel_dir,
60 rootfs_dir, native_sysroot): 60 rootfs_dir, native_sysroot):
61 """ 61 """
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 5caffbc8e2..ae5fc0ca2a 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -37,7 +37,7 @@ class BootimgPcbiosPlugin(SourcePlugin):
37 name = 'bootimg-pcbios' 37 name = 'bootimg-pcbios'
38 38
39 @classmethod 39 @classmethod
40 def do_install_disk(self, disk, disk_name, cr, workdir, oe_builddir, 40 def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir,
41 bootimg_dir, kernel_dir, native_sysroot): 41 bootimg_dir, kernel_dir, native_sysroot):
42 """ 42 """
43 Called after all partitions have been prepared and assembled into a 43 Called after all partitions have been prepared and assembled into a
@@ -64,7 +64,7 @@ class BootimgPcbiosPlugin(SourcePlugin):
64 raise ImageError("Unable to set MBR to %s" % full_path) 64 raise ImageError("Unable to set MBR to %s" % full_path)
65 65
66 @classmethod 66 @classmethod
67 def do_configure_partition(self, part, source_params, cr, cr_workdir, 67 def do_configure_partition(cls, part, source_params, cr, cr_workdir,
68 oe_builddir, bootimg_dir, kernel_dir, 68 oe_builddir, bootimg_dir, kernel_dir,
69 native_sysroot): 69 native_sysroot):
70 """ 70 """
@@ -113,7 +113,7 @@ class BootimgPcbiosPlugin(SourcePlugin):
113 cfg.close() 113 cfg.close()
114 114
115 @classmethod 115 @classmethod
116 def do_prepare_partition(self, part, source_params, cr, cr_workdir, 116 def do_prepare_partition(cls, part, source_params, cr, cr_workdir,
117 oe_builddir, bootimg_dir, kernel_dir, 117 oe_builddir, bootimg_dir, kernel_dir,
118 rootfs_dir, native_sysroot): 118 rootfs_dir, native_sysroot):
119 """ 119 """
diff --git a/scripts/lib/wic/plugins/source/fsimage.py b/scripts/lib/wic/plugins/source/fsimage.py
index ef56cf278b..cd59c6e87e 100644
--- a/scripts/lib/wic/plugins/source/fsimage.py
+++ b/scripts/lib/wic/plugins/source/fsimage.py
@@ -25,7 +25,7 @@ class FSImagePlugin(SourcePlugin):
25 name = 'fsimage' 25 name = 'fsimage'
26 26
27 @classmethod 27 @classmethod
28 def do_install_disk(self, disk, disk_name, cr, workdir, oe_builddir, 28 def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir,
29 bootimg_dir, kernel_dir, native_sysroot): 29 bootimg_dir, kernel_dir, native_sysroot):
30 """ 30 """
31 Called after all partitions have been prepared and assembled into a 31 Called after all partitions have been prepared and assembled into a
@@ -34,7 +34,7 @@ class FSImagePlugin(SourcePlugin):
34 pass 34 pass
35 35
36 @classmethod 36 @classmethod
37 def do_configure_partition(self, part, source_params, cr, cr_workdir, 37 def do_configure_partition(cls, part, source_params, cr, cr_workdir,
38 oe_builddir, bootimg_dir, kernel_dir, 38 oe_builddir, bootimg_dir, kernel_dir,
39 native_sysroot): 39 native_sysroot):
40 """ 40 """
@@ -44,7 +44,7 @@ class FSImagePlugin(SourcePlugin):
44 pass 44 pass
45 45
46 @classmethod 46 @classmethod
47 def do_prepare_partition(self, part, source_params, cr, cr_workdir, 47 def do_prepare_partition(cls, part, source_params, cr, cr_workdir,
48 oe_builddir, bootimg_dir, kernel_dir, 48 oe_builddir, bootimg_dir, kernel_dir,
49 rootfs_dir, native_sysroot): 49 rootfs_dir, native_sysroot):
50 """ 50 """
diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py
index 444c0268fb..df07851751 100644
--- a/scripts/lib/wic/plugins/source/rawcopy.py
+++ b/scripts/lib/wic/plugins/source/rawcopy.py
@@ -25,7 +25,7 @@ class RawCopyPlugin(SourcePlugin):
25 name = 'rawcopy' 25 name = 'rawcopy'
26 26
27 @classmethod 27 @classmethod
28 def do_install_disk(self, disk, disk_name, cr, workdir, oe_builddir, 28 def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir,
29 bootimg_dir, kernel_dir, native_sysroot): 29 bootimg_dir, kernel_dir, native_sysroot):
30 """ 30 """
31 Called after all partitions have been prepared and assembled into a 31 Called after all partitions have been prepared and assembled into a
@@ -34,7 +34,7 @@ class RawCopyPlugin(SourcePlugin):
34 pass 34 pass
35 35
36 @classmethod 36 @classmethod
37 def do_configure_partition(self, part, source_params, cr, cr_workdir, 37 def do_configure_partition(cls, part, source_params, cr, cr_workdir,
38 oe_builddir, bootimg_dir, kernel_dir, 38 oe_builddir, bootimg_dir, kernel_dir,
39 native_sysroot): 39 native_sysroot):
40 """ 40 """
@@ -44,7 +44,7 @@ class RawCopyPlugin(SourcePlugin):
44 pass 44 pass
45 45
46 @classmethod 46 @classmethod
47 def do_prepare_partition(self, part, source_params, cr, cr_workdir, 47 def do_prepare_partition(cls, part, source_params, cr, cr_workdir,
48 oe_builddir, bootimg_dir, kernel_dir, 48 oe_builddir, bootimg_dir, kernel_dir,
49 rootfs_dir, native_sysroot): 49 rootfs_dir, native_sysroot):
50 """ 50 """
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
index 7d444301fb..0ee383efb7 100644
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -54,7 +54,7 @@ class RootfsPlugin(SourcePlugin):
54 return image_rootfs_dir 54 return image_rootfs_dir
55 55
56 @classmethod 56 @classmethod
57 def do_prepare_partition(self, part, source_params, cr, cr_workdir, 57 def do_prepare_partition(cls, part, source_params, cr, cr_workdir,
58 oe_builddir, bootimg_dir, kernel_dir, 58 oe_builddir, bootimg_dir, kernel_dir,
59 krootfs_dir, native_sysroot): 59 krootfs_dir, native_sysroot):
60 """ 60 """
@@ -77,7 +77,7 @@ class RootfsPlugin(SourcePlugin):
77 msg += " or it is not a valid path, exiting" 77 msg += " or it is not a valid path, exiting"
78 msger.error(msg % part.rootfs) 78 msger.error(msg % part.rootfs)
79 79
80 real_rootfs_dir = self.__get_rootfs_dir(rootfs_dir) 80 real_rootfs_dir = cls.__get_rootfs_dir(rootfs_dir)
81 81
82 part.set_rootfs(real_rootfs_dir) 82 part.set_rootfs(real_rootfs_dir)
83 part.prepare_rootfs(cr_workdir, oe_builddir, real_rootfs_dir, native_sysroot) 83 part.prepare_rootfs(cr_workdir, oe_builddir, real_rootfs_dir, native_sysroot)