diff options
24 files changed, 109 insertions, 109 deletions
diff --git a/linaro_image_tools/cmd_runner.py b/linaro_image_tools/cmd_runner.py index d940671..8a4c833 100644 --- a/linaro_image_tools/cmd_runner.py +++ b/linaro_image_tools/cmd_runner.py @@ -3,7 +3,7 @@ # Author: Guilherme Salgado <guilherme.salgado@linaro.org> # # This file is part of Linaro Image Tools. -# +# # Linaro Image Tools is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or diff --git a/linaro_image_tools/hwpack/__init__.py b/linaro_image_tools/hwpack/__init__.py index aa8eddf..9c9cef6 100644 --- a/linaro_image_tools/hwpack/__init__.py +++ b/linaro_image_tools/hwpack/__init__.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/hwpack/better_tarfile.py b/linaro_image_tools/hwpack/better_tarfile.py index feebab9..5a92658 100644 --- a/linaro_image_tools/hwpack/better_tarfile.py +++ b/linaro_image_tools/hwpack/better_tarfile.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/hwpack/builder.py b/linaro_image_tools/hwpack/builder.py index f0cf2aa..3e42959 100644 --- a/linaro_image_tools/hwpack/builder.py +++ b/linaro_image_tools/hwpack/builder.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/hwpack/config.py b/linaro_image_tools/hwpack/config.py index 0ec0551..9a766ea 100644 --- a/linaro_image_tools/hwpack/config.py +++ b/linaro_image_tools/hwpack/config.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, @@ -238,7 +238,7 @@ class Config(object): @property def serial_tty(self): - """/dev device name of the serial console for this kernel + """/dev device name of the serial console for this kernel A str. """ @@ -279,7 +279,7 @@ class Config(object): @property def kernel_addr(self): - """address where u-boot should load the kernel + """address where u-boot should load the kernel An int. """ @@ -287,7 +287,7 @@ class Config(object): @property def initrd_addr(self): - """address where u-boot should load the kernel + """address where u-boot should load the kernel An int. """ @@ -327,9 +327,9 @@ class Config(object): @property def partition_layout(self): - """bootfs16_rootfs, bootfs_rootfs and reserved_bootfs_rootfs; - controls what kind of SD card partition layout we should use when - writing images + """bootfs16_rootfs, bootfs_rootfs and reserved_bootfs_rootfs; + controls what kind of SD card partition layout we should use when + writing images A str. """ @@ -337,7 +337,7 @@ class Config(object): @property def mmc_id(self): - """which MMC drive contains the boot filesystem + """which MMC drive contains the boot filesystem An int. """ diff --git a/linaro_image_tools/hwpack/hardwarepack.py b/linaro_image_tools/hwpack/hardwarepack.py index 1f58d5e..58dd272 100644 --- a/linaro_image_tools/hwpack/hardwarepack.py +++ b/linaro_image_tools/hwpack/hardwarepack.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/hwpack/hardwarepack_format.py b/linaro_image_tools/hwpack/hardwarepack_format.py index 7dfaf56..3632308 100644 --- a/linaro_image_tools/hwpack/hardwarepack_format.py +++ b/linaro_image_tools/hwpack/hardwarepack_format.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/hwpack/packages.py b/linaro_image_tools/hwpack/packages.py index b57a343..345793b 100644 --- a/linaro_image_tools/hwpack/packages.py +++ b/linaro_image_tools/hwpack/packages.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/hwpack/tarfile_matchers.py b/linaro_image_tools/hwpack/tarfile_matchers.py index 195aa39..d33f881 100644 --- a/linaro_image_tools/hwpack/tarfile_matchers.py +++ b/linaro_image_tools/hwpack/tarfile_matchers.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/hwpack/testing.py b/linaro_image_tools/hwpack/testing.py index ea86170..689acfc 100644 --- a/linaro_image_tools/hwpack/testing.py +++ b/linaro_image_tools/hwpack/testing.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/hwpack/tests/__init__.py b/linaro_image_tools/hwpack/tests/__init__.py index 288c7ae..f91d986 100644 --- a/linaro_image_tools/hwpack/tests/__init__.py +++ b/linaro_image_tools/hwpack/tests/__init__.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/hwpack/tests/test_better_tarfile.py b/linaro_image_tools/hwpack/tests/test_better_tarfile.py index c2bd737..f9ecddc 100644 --- a/linaro_image_tools/hwpack/tests/test_better_tarfile.py +++ b/linaro_image_tools/hwpack/tests/test_better_tarfile.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/hwpack/tests/test_builder.py b/linaro_image_tools/hwpack/tests/test_builder.py index d2b91ce..92fc139 100644 --- a/linaro_image_tools/hwpack/tests/test_builder.py +++ b/linaro_image_tools/hwpack/tests/test_builder.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, @@ -117,7 +117,7 @@ class HardwarePackBuilderTests(TestCaseWithFixtures): self.useFixture(ChdirToTempdirFixture()) self.extra_config = {'format': '2.0', 'u-boot-package': 'wanted-package', - 'u-boot-file': 'wanted-file', + 'u-boot-file': 'wanted-file', 'partition_layout': 'bootfs_rootfs', 'x_loader_package': 'x-loader-omap4-panda', 'x_loader_file': 'usr/lib/x-loader/omap4430panda/MLO', diff --git a/linaro_image_tools/hwpack/tests/test_config.py b/linaro_image_tools/hwpack/tests/test_config.py index 63dbd58..538c136 100644 --- a/linaro_image_tools/hwpack/tests/test_config.py +++ b/linaro_image_tools/hwpack/tests/test_config.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, @@ -203,13 +203,13 @@ class ConfigTests(TestCase): config) def test_validate_invalid_u_boot_file(self): - config = self.get_config(self.valid_start_v2 + + config = self.get_config(self.valid_start_v2 + "u_boot_package = u-boot-linaro-s5pv310\n" \ "u_boot_file = ~~\n") self.assertValidationError("Invalid path: ~~", config) def test_validate_invalid_kernel_file(self): - config = self.get_config(self.valid_start_v2 + + config = self.get_config(self.valid_start_v2 + "u-boot-package = u-boot-linaro-s5pv310\n" \ "u-boot-file = u-boot.bin\n" \ "partition_layout = bootfs_rootfs\n"\ @@ -217,7 +217,7 @@ class ConfigTests(TestCase): self.assertValidationError("Invalid path: ~~", config) def test_validate_empty_kernel_file(self): - config = self.get_config(self.valid_start_v2 + + config = self.get_config(self.valid_start_v2 + "u-boot-package = u-boot-linaro-s5pv310\n" \ "u-boot-file = u-boot.bin\n" "partition_layout = bootfs_rootfs\n"\ @@ -225,7 +225,7 @@ class ConfigTests(TestCase): self.assertValidationError("No kernel_file in the [hwpack] section", config) def test_validate_invalid_initrd_file(self): - config = self.get_config(self.valid_start_v2 + + config = self.get_config(self.valid_start_v2 + "u-boot-package = u-boot-linaro-s5pv310\n" \ "u-boot-file = u-boot.bin\n" \ "partition_layout = bootfs_rootfs\n"\ @@ -234,7 +234,7 @@ class ConfigTests(TestCase): self.assertValidationError("Invalid path: ~~", config) def test_validate_empty_initrd_file(self): - config = self.get_config(self.valid_start_v2 + + config = self.get_config(self.valid_start_v2 + "u-boot-package = u-boot-linaro-s5pv310\n" \ "u-boot-file = u-boot.bin\n" "partition_layout = bootfs_rootfs\n"\ @@ -243,7 +243,7 @@ class ConfigTests(TestCase): self.assertValidationError("No initrd_file in the [hwpack] section", config) def test_validate_invalid_boot_script(self): - config = self.get_config(self.valid_start_v2 + + config = self.get_config(self.valid_start_v2 + "u-boot-package = u-boot-linaro-s5pv310\n" \ "mmc_id = 0:1\n"\ "u-boot-file = u-boot.bin\n" \ @@ -255,7 +255,7 @@ class ConfigTests(TestCase): self.assertValidationError("Invalid path: ~~", config) def test_validate_invalid_dtb_file(self): - config = self.get_config(self.valid_start_v2 + + config = self.get_config(self.valid_start_v2 + "u-boot-package = u-boot-linaro-s5pv310\n" \ "u-boot-file = u-boot.bin\n" \ "partition_layout = bootfs_rootfs\n"\ @@ -279,7 +279,7 @@ class ConfigTests(TestCase): config) def test_validate_invalid_spl_file(self): - config = self.get_config(self.valid_start_v2 + + config = self.get_config(self.valid_start_v2 + "u-boot-package = u-boot-linaro-s5pv310\n" \ "u-boot-file = usr/bin/version/MLO\n" \ "partition_layout = bootfs_rootfs\n" \ @@ -306,7 +306,7 @@ class ConfigTests(TestCase): self.assertTrue("XXX What is an invalid interface name?") def test_validate_u_boot_in_boot_part(self): - config = self.get_config(self.valid_start_v2 + + config = self.get_config(self.valid_start_v2 + "u-boot-package = u-boot-linaro-s5pv310\n" \ "u-boot-file = u-boot.bin\n" \ "partition_layout = bootfs_rootfs\n"\ @@ -318,7 +318,7 @@ class ConfigTests(TestCase): self.assertValidationError("Invalid value for u_boot_in_boot_part: Nope", config) def test_validate_u_boot_in_boot_part_bool(self): - config = self.get_config(self.valid_start_v2 + + config = self.get_config(self.valid_start_v2 + "u-boot-package = u-boot-linaro-s5pv310\n" \ "u-boot-file = u-boot.bin\n" \ "partition_layout = bootfs_rootfs\n"\ @@ -341,89 +341,89 @@ class ConfigTests(TestCase): self.assertValidationError("Invalid serial tty: ttxSAC1", config) def test_validate_mmc_id(self): - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "mmc_id = x\n") self.assertValidationError("Invalid mmc_id x", config) def test_validate_boot_min_size(self): - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "boot_min_size = x\n") self.assertValidationError("Invalid boot min size x", config) def test_validate_root_min_size(self): - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "root_min_size = x\n") self.assertValidationError("Invalid root min size x", config) def test_validate_loader_min_size(self): - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "loader_min_size = x\n") self.assertValidationError("Invalid loader min size x", config) def test_validate_kernel_addr(self): - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "kernel_addr = 0x8000000\n") self.assertValidationError("Invalid kernel address: 0x8000000", config) - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "kernel_addr = 0x8000000x\n") self.assertValidationError("Invalid kernel address: 0x8000000x", config) - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "kernel_addr = 80000000\n") self.assertValidationError("Invalid kernel address: 80000000", config) def test_validate_initrd_addr(self): - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "initrd_addr = 0x8000000\n") self.assertValidationError("Invalid initrd address: 0x8000000", config) - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "initrd_addr = 0x8000000x\n") self.assertValidationError("Invalid initrd address: 0x8000000x", config) - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "initrd_addr = 80000000\n") self.assertValidationError("Invalid initrd address: 80000000", config) def test_validate_load_addr(self): - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "load_addr = 0x8000000\n") self.assertValidationError("Invalid load address: 0x8000000", config) - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "load_addr = 0x8000000x\n") self.assertValidationError("Invalid load address: 0x8000000x", config) - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "load_addr = 80000000\n") self.assertValidationError("Invalid load address: 80000000", config) def test_validate_dtb_addr(self): - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "dtb_addr = 0x8000000\n") self.assertValidationError("Invalid dtb address: 0x8000000", config) - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "dtb_addr = 0x8000000x\n") self.assertValidationError("Invalid dtb address: 0x8000000x", config) - config = self.get_config(self.valid_complete_v2 + + config = self.get_config(self.valid_complete_v2 + "dtb_addr = 80000000\n") self.assertValidationError("Invalid dtb address: 80000000", config) def test_wired_interfaces(self): - config = self.get_config(self.valid_complete_v2 + - "wired_interfaces = eth0\n" + + config = self.get_config(self.valid_complete_v2 + + "wired_interfaces = eth0\n" + self.valid_end) config.validate() self.assertEqual(["eth0"], config.wired_interfaces) - config = self.get_config(self.valid_complete_v2 + - "wired_interfaces = eth0 eth1 usb2\n" + + config = self.get_config(self.valid_complete_v2 + + "wired_interfaces = eth0 eth1 usb2\n" + self.valid_end) config.validate() self.assertEqual(["eth0", "eth1", "usb2"], config.wired_interfaces) def test_wireless_interfaces(self): - config = self.get_config(self.valid_complete_v2 + - "wireless_interfaces = wlan0\n" + + config = self.get_config(self.valid_complete_v2 + + "wireless_interfaces = wlan0\n" + self.valid_end) config.validate() self.assertEqual(["wlan0"], config.wireless_interfaces) - config = self.get_config(self.valid_complete_v2 + - "wireless_interfaces = wlan0 wl1 usb2\n" + + config = self.get_config(self.valid_complete_v2 + + "wireless_interfaces = wlan0 wl1 usb2\n" + self.valid_end) config.validate() self.assertEqual(["wlan0", "wl1", "usb2"], config.wireless_interfaces) @@ -506,77 +506,77 @@ class ConfigTests(TestCase): self.assertEqual("ttySAC1", config.serial_tty) def test_mmc_id(self): - config = self.get_config(self.valid_complete_v2 + - "mmc_id = 0:1\n" + + config = self.get_config(self.valid_complete_v2 + + "mmc_id = 0:1\n" + self.valid_end) config.validate() self.assertEqual("0:1", config.mmc_id) def test_boot_min_size(self): - config = self.get_config(self.valid_complete_v2 + - "boot_min_size = 50\n" + + config = self.get_config(self.valid_complete_v2 + + "boot_min_size = 50\n" + self.valid_end) config.validate() self.assertEqual("50", config.boot_min_size) def test_root_min_size(self): - config = self.get_config(self.valid_complete_v2 + - "root_min_size = 50\n" + + config = self.get_config(self.valid_complete_v2 + + "root_min_size = 50\n" + self.valid_end) config.validate() self.assertEqual("50", config.root_min_size) def test_loader_min_size(self): - config = self.get_config(self.valid_complete_v2 + - "loader_min_size = 2\n" + + config = self.get_config(self.valid_complete_v2 + + "loader_min_size = 2\n" + self.valid_end) config.validate() self.assertEqual("2", config.loader_min_size) def test_kernel_addr(self): - config = self.get_config(self.valid_complete_v2 + - "kernel_addr = 0x80000000\n" + + config = self.get_config(self.valid_complete_v2 + + "kernel_addr = 0x80000000\n" + self.valid_end) config.validate() self.assertEqual("0x80000000", config.kernel_addr) - config = self.get_config(self.valid_complete_v2 + - "kernel_addr = 0x8aBcdEFf\n" + + config = self.get_config(self.valid_complete_v2 + + "kernel_addr = 0x8aBcdEFf\n" + self.valid_end) config.validate() self.assertEqual("0x8aBcdEFf", config.kernel_addr) def test_initrd_addr(self): - config = self.get_config(self.valid_complete_v2 + - "initrd_addr = 0x80000000\n" + + config = self.get_config(self.valid_complete_v2 + + "initrd_addr = 0x80000000\n" + self.valid_end) config.validate() self.assertEqual("0x80000000", config.initrd_addr) - config = self.get_config(self.valid_complete_v2 + - "initrd_addr = 0x8aBcdEFf\n" + + config = self.get_config(self.valid_complete_v2 + + "initrd_addr = 0x8aBcdEFf\n" + self.valid_end) config.validate() self.assertEqual("0x8aBcdEFf", config.initrd_addr) def test_load_addr(self): - config = self.get_config(self.valid_complete_v2 + - "load_addr = 0x80000000\n" + + config = self.get_config(self.valid_complete_v2 + + "load_addr = 0x80000000\n" + self.valid_end) config.validate() self.assertEqual("0x80000000", config.load_addr) - config = self.get_config(self.valid_complete_v2 + - "load_addr = 0x8aBcdEFf\n" + + config = self.get_config(self.valid_complete_v2 + + "load_addr = 0x8aBcdEFf\n" + self.valid_end) config.validate() self.assertEqual("0x8aBcdEFf", config.load_addr) def test_dtb_addr(self): - config = self.get_config(self.valid_complete_v2 + - "dtb_addr = 0x80000000\n" + + config = self.get_config(self.valid_complete_v2 + + "dtb_addr = 0x80000000\n" + self.valid_end) config.validate() self.assertEqual("0x80000000", config.dtb_addr) - config = self.get_config(self.valid_complete_v2 + - "dtb_addr = 0x8aBcdEFf\n" + + config = self.get_config(self.valid_complete_v2 + + "dtb_addr = 0x8aBcdEFf\n" + self.valid_end) config.validate() self.assertEqual("0x8aBcdEFf", config.dtb_addr) diff --git a/linaro_image_tools/hwpack/tests/test_hardwarepack.py b/linaro_image_tools/hwpack/tests/test_hardwarepack.py index 906b7b2..95eec61 100644 --- a/linaro_image_tools/hwpack/tests/test_hardwarepack.py +++ b/linaro_image_tools/hwpack/tests/test_hardwarepack.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/hwpack/tests/test_packages.py b/linaro_image_tools/hwpack/tests/test_packages.py index 31f8e17..d5062bc 100644 --- a/linaro_image_tools/hwpack/tests/test_packages.py +++ b/linaro_image_tools/hwpack/tests/test_packages.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/hwpack/tests/test_script.py b/linaro_image_tools/hwpack/tests/test_script.py index 37ab3bc..8ecc5bb 100644 --- a/linaro_image_tools/hwpack/tests/test_script.py +++ b/linaro_image_tools/hwpack/tests/test_script.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/hwpack/tests/test_tarfile_matchers.py b/linaro_image_tools/hwpack/tests/test_tarfile_matchers.py index 6db0be0..6bae56b 100644 --- a/linaro_image_tools/hwpack/tests/test_tarfile_matchers.py +++ b/linaro_image_tools/hwpack/tests/test_tarfile_matchers.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/hwpack/tests/test_testing.py b/linaro_image_tools/hwpack/tests/test_testing.py index c4714ae..fd5b567 100644 --- a/linaro_image_tools/hwpack/tests/test_testing.py +++ b/linaro_image_tools/hwpack/tests/test_testing.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, diff --git a/linaro_image_tools/media_create/__init__.py b/linaro_image_tools/media_create/__init__.py index 30fe57f..918a5f2 100644 --- a/linaro_image_tools/media_create/__init__.py +++ b/linaro_image_tools/media_create/__init__.py @@ -3,7 +3,7 @@ # Author: Guilherme Salgado <guilherme.salgado@linaro.org> # # This file is part of Linaro Image Tools. -# +# # Linaro Image Tools is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or diff --git a/linaro_image_tools/media_create/android_boards.py b/linaro_image_tools/media_create/android_boards.py index 1f1da16..4e2b1c7 100644 --- a/linaro_image_tools/media_create/android_boards.py +++ b/linaro_image_tools/media_create/android_boards.py @@ -248,7 +248,7 @@ class AndroidSnowballEmmcConfig(AndroidBoardConfig, SnowballEmmcConfig): media, boot_dir) @classmethod - def snowball_config(cls, chroot_dir): + def snowball_config(cls, chroot_dir): # The user is expected to have unpacked the startupfiles to this subdir # of their working dir. return os.path.join('.', 'startupfiles') diff --git a/linaro_image_tools/media_create/boards.py b/linaro_image_tools/media_create/boards.py index 595a3a2..7422244 100644 --- a/linaro_image_tools/media_create/boards.py +++ b/linaro_image_tools/media_create/boards.py @@ -1113,7 +1113,7 @@ class SnowballEmmcConfig(SnowballSdConfig): cls.snowball_startup_files_config)) @classmethod - def snowball_config(cls, chroot_dir): + def snowball_config(cls, chroot_dir): # We will find the startupfiles in the target boot partition. return os.path.join(chroot_dir, 'boot') diff --git a/linaro_image_tools/media_create/check_device.py b/linaro_image_tools/media_create/check_device.py index 7bffae0..669306d 100644 --- a/linaro_image_tools/media_create/check_device.py +++ b/linaro_image_tools/media_create/check_device.py @@ -3,7 +3,7 @@ # Author: Guilherme Salgado <guilherme.salgado@linaro.org> # # This file is part of Linaro Image Tools. -# +# # Linaro Image Tools is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or diff --git a/linaro_image_tools/testing.py b/linaro_image_tools/testing.py index 80cf9f2..25bf401 100644 --- a/linaro_image_tools/testing.py +++ b/linaro_image_tools/testing.py @@ -8,12 +8,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # Linaro Image Tools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Linaro Image Tools; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, |