[U-Boot,v6,13/13] Revert "buildman: Extract environment as part of each build"

Message ID 20180613023728.202173-14-sjg@chromium.org
State Superseded
Delegated to: Simon Glass
Headers show
Series
  • efi: Enable basic sandbox support for EFI loader
Related show

Commit Message

Simon Glass June 13, 2018, 2:37 a.m.
This reverts commit 0ddc510ea37aa578b8cb197840a5125409978bec.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 tools/buildman/builderthread.py | 10 ----------
 tools/buildman/func_test.py     |  5 -----
 2 files changed, 15 deletions(-)

Comments

Simon Glass June 13, 2018, 2:41 a.m. | #1
Hi,

On 12 June 2018 at 20:37, Simon Glass <sjg@chromium.org> wrote:
> This reverts commit 0ddc510ea37aa578b8cb197840a5125409978bec.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>

Sorry, please ignore this patch. I am trying to track down a buildman
issue and put this commit on top just before sending :-(

Regards,
Simon

Patch

diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py
index c84ba6acf1..0efe80d945 100644
--- a/tools/buildman/builderthread.py
+++ b/tools/buildman/builderthread.py
@@ -351,16 +351,6 @@  class BuilderThread(threading.Thread):
                     lines.append(size_result.stdout.splitlines()[1] + ' ' +
                                  rodata_size)
 
-            # Extract the environment from U-Boot and dump it out
-            cmd = ['%sobjcopy' % self.toolchain.cross, '-O', 'binary',
-                   '-j', '.rodata.default_environment',
-                   'env/built-in.o', 'uboot.env']
-            command.RunPipe([cmd], capture=True,
-                            capture_stderr=True, cwd=result.out_dir,
-                            raise_on_error=False, env=env)
-            ubootenv = os.path.join(result.out_dir, 'uboot.env')
-            self.CopyFiles(result.out_dir, build_dir, '', ['uboot.env'])
-
             # Write out the image sizes file. This is similar to the output
             # of binutil's 'size' utility, but it omits the header line and
             # adds an additional hex value at the end of each line for the
diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py
index 363db9d8ce..9206fb299d 100644
--- a/tools/buildman/func_test.py
+++ b/tools/buildman/func_test.py
@@ -327,9 +327,6 @@  class TestFunctional(unittest.TestCase):
     def _HandleCommandObjdump(self, args):
         return command.CommandResult(return_code=0)
 
-    def _HandleCommandObjcopy(self, args):
-        return command.CommandResult(return_code=0)
-
     def _HandleCommandSize(self, args):
         return command.CommandResult(return_code=0)
 
@@ -362,8 +359,6 @@  class TestFunctional(unittest.TestCase):
             return self._HandleCommandNm(args)
         elif cmd.endswith('objdump'):
             return self._HandleCommandObjdump(args)
-        elif cmd.endswith('objcopy'):
-            return self._HandleCommandObjcopy(args)
         elif cmd.endswith( 'size'):
             return self._HandleCommandSize(args)