binary-manager 0.1.2__tar.gz → 0.1.3__tar.gz

{binary_manager-0.1.2 → binary_manager-0.1.3}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: binary-manager
-Version: 0.1.2
+Version: 0.1.3
 Summary: Package firmware binaries into images described by a devicetree
 Author-email: Simon Glass <sjg@chromium.org>
 License-Expression: GPL-2.0-or-later
-Project-URL: Homepage, https://github.com/nxtboot/binman
+Project-URL: Homepage, https://github.com/deinde-dev/binman
 Project-URL: Documentation, https://binman.readthedocs.io/
-Project-URL: Repository, https://github.com/nxtboot/binman
-Project-URL: Bug Tracker, https://github.com/nxtboot/binman/issues
+Project-URL: Repository, https://github.com/deinde-dev/binman
+Project-URL: Bug Tracker, https://github.com/deinde-dev/binman/issues
 Keywords: firmware,image,devicetree,u-boot,fit,cbfs
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
@@ -24,16 +24,21 @@ Requires-Dist: pycryptodomex
 Requires-Dist: jsonschema
 Requires-Dist: PyYAML
 Requires-Dist: yamllint
+Requires-Dist: u-boot-pylib>=0.1.0
 Provides-Extra: test
 Requires-Dist: concurrencytest; extra == "test"
 Requires-Dist: coverage; extra == "test"
 Dynamic: license-file
 
+.. image:: https://raw.githubusercontent.com/deinde-dev/binman/master/logo/binman-logo-primary.png
+   :alt: Binman
+   :width: 400px
+
 Binman firmware packager
 ========================
 
-.. image:: https://github.com/nxtboot/binman/actions/workflows/test.yml/badge.svg
-   :target: https://github.com/nxtboot/binman/actions/workflows/test.yml
+.. image:: https://github.com/deinde-dev/binman/actions/workflows/test.yml/badge.svg
+   :target: https://github.com/deinde-dev/binman/actions/workflows/test.yml
    :alt: Test status
 
 .. image:: https://img.shields.io/pypi/v/binary-manager.svg
@@ -104,6 +109,8 @@ Full documentation is hosted on Read the Docs:
 
     https://binman.readthedocs.io/
 
+There is a short introduction, with a demo, at https://deinde.dev/binman/
+
 Development
 -----------
 
@@ -121,5 +128,6 @@ since the expected output tracks its development; pass ``--toolpath`` to point
 binman at a U-Boot ``tools/`` build directory. ``binman test -T`` checks that
 the tests cover all of the code.
 
-The ``u_boot_pylib`` and ``dtoc`` libraries are vendored from the U-Boot tree,
-so no surrounding U-Boot source is required.
+The ``dtoc`` library is vendored from the U-Boot tree and ``u_boot_pylib`` is
+installed from PyPI as ``u-boot-pylib``, so no surrounding U-Boot source is
+required.

{binary_manager-0.1.2 → binary_manager-0.1.3}/README.rst

@@ -1,8 +1,12 @@
+.. image:: https://raw.githubusercontent.com/deinde-dev/binman/master/logo/binman-logo-primary.png
+   :alt: Binman
+   :width: 400px
+
 Binman firmware packager
 ========================
 
-.. image:: https://github.com/nxtboot/binman/actions/workflows/test.yml/badge.svg
-   :target: https://github.com/nxtboot/binman/actions/workflows/test.yml
+.. image:: https://github.com/deinde-dev/binman/actions/workflows/test.yml/badge.svg
+   :target: https://github.com/deinde-dev/binman/actions/workflows/test.yml
    :alt: Test status
 
 .. image:: https://img.shields.io/pypi/v/binary-manager.svg
@@ -73,6 +77,8 @@ Full documentation is hosted on Read the Docs:
 
     https://binman.readthedocs.io/
 
+There is a short introduction, with a demo, at https://deinde.dev/binman/
+
 Development
 -----------
 
@@ -90,5 +96,6 @@ since the expected output tracks its development; pass ``--toolpath`` to point
 binman at a U-Boot ``tools/`` build directory. ``binman test -T`` checks that
 the tests cover all of the code.
 
-The ``u_boot_pylib`` and ``dtoc`` libraries are vendored from the U-Boot tree,
-so no surrounding U-Boot source is required.
+The ``dtoc`` library is vendored from the U-Boot tree and ``u_boot_pylib`` is
+installed from PyPI as ``u-boot-pylib``, so no surrounding U-Boot source is
+required.

{binary_manager-0.1.2 → binary_manager-0.1.3}/binary_manager.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: binary-manager
-Version: 0.1.2
+Version: 0.1.3
 Summary: Package firmware binaries into images described by a devicetree
 Author-email: Simon Glass <sjg@chromium.org>
 License-Expression: GPL-2.0-or-later
-Project-URL: Homepage, https://github.com/nxtboot/binman
+Project-URL: Homepage, https://github.com/deinde-dev/binman
 Project-URL: Documentation, https://binman.readthedocs.io/
-Project-URL: Repository, https://github.com/nxtboot/binman
-Project-URL: Bug Tracker, https://github.com/nxtboot/binman/issues
+Project-URL: Repository, https://github.com/deinde-dev/binman
+Project-URL: Bug Tracker, https://github.com/deinde-dev/binman/issues
 Keywords: firmware,image,devicetree,u-boot,fit,cbfs
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
@@ -24,16 +24,21 @@ Requires-Dist: pycryptodomex
 Requires-Dist: jsonschema
 Requires-Dist: PyYAML
 Requires-Dist: yamllint
+Requires-Dist: u-boot-pylib>=0.1.0
 Provides-Extra: test
 Requires-Dist: concurrencytest; extra == "test"
 Requires-Dist: coverage; extra == "test"
 Dynamic: license-file
 
+.. image:: https://raw.githubusercontent.com/deinde-dev/binman/master/logo/binman-logo-primary.png
+   :alt: Binman
+   :width: 400px
+
 Binman firmware packager
 ========================
 
-.. image:: https://github.com/nxtboot/binman/actions/workflows/test.yml/badge.svg
-   :target: https://github.com/nxtboot/binman/actions/workflows/test.yml
+.. image:: https://github.com/deinde-dev/binman/actions/workflows/test.yml/badge.svg
+   :target: https://github.com/deinde-dev/binman/actions/workflows/test.yml
    :alt: Test status
 
 .. image:: https://img.shields.io/pypi/v/binary-manager.svg
@@ -104,6 +109,8 @@ Full documentation is hosted on Read the Docs:
 
     https://binman.readthedocs.io/
 
+There is a short introduction, with a demo, at https://deinde.dev/binman/
+
 Development
 -----------
 
@@ -121,5 +128,6 @@ since the expected output tracks its development; pass ``--toolpath`` to point
 binman at a U-Boot ``tools/`` build directory. ``binman test -T`` checks that
 the tests cover all of the code.
 
-The ``u_boot_pylib`` and ``dtoc`` libraries are vendored from the U-Boot tree,
-so no surrounding U-Boot source is required.
+The ``dtoc`` library is vendored from the U-Boot tree and ``u_boot_pylib`` is
+installed from PyPI as ``u-boot-pylib``, so no surrounding U-Boot source is
+required.

{binary_manager-0.1.2 → binary_manager-0.1.3}/binary_manager.egg-info/SOURCES.txt

@@ -38,21 +38,6 @@ binman/state.py
 binman/_vendor/dtoc/__init__.py
 binman/_vendor/dtoc/fdt.py
 binman/_vendor/dtoc/fdt_util.py
-binman/_vendor/u_boot_pylib/__init__.py
-binman/_vendor/u_boot_pylib/__main__.py
-binman/_vendor/u_boot_pylib/claude.py
-binman/_vendor/u_boot_pylib/command.py
-binman/_vendor/u_boot_pylib/cros_subprocess.py
-binman/_vendor/u_boot_pylib/dwarf_lines.py
-binman/_vendor/u_boot_pylib/gitutil.py
-binman/_vendor/u_boot_pylib/terminal.py
-binman/_vendor/u_boot_pylib/test_claude.py
-binman/_vendor/u_boot_pylib/test_command.py
-binman/_vendor/u_boot_pylib/test_dwarf_lines.py
-binman/_vendor/u_boot_pylib/test_gitutil.py
-binman/_vendor/u_boot_pylib/test_util.py
-binman/_vendor/u_boot_pylib/tools.py
-binman/_vendor/u_boot_pylib/tout.py
 binman/blobs/__init__.py
 binman/blobs/_testing.py
 binman/blobs/atf.py
@@ -291,6 +276,7 @@ binman/test/entry/compress_image.dts
 binman/test/entry/compress_image_less.dts
 binman/test/entry/compress_section.dts
 binman/test/entry/compress_section_size.dts
+binman/test/entry/compress_section_update.dts
 binman/test/entry/elf.dts
 binman/test/entry/elf_strip.dts
 binman/test/entry/entry_args.dts

{binary_manager-0.1.2 → binary_manager-0.1.3}/binary_manager.egg-info/requires.txt

@@ -4,6 +4,7 @@ pycryptodomex
 jsonschema
 PyYAML
 yamllint
+u-boot-pylib>=0.1.0
 
 [test]
 concurrencytest

binary_manager-0.1.3/binman/__init__.py

@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0+
+
+"""Binman firmware packager
+
+binman bundles a copy of dtoc's devicetree modules in _vendor/. Make these
+importable by their usual name, ahead of any other copies, e.g. in a U-Boot
+tree. They are kept out of the top level of site-packages, where they would
+clash with U-Boot's tools and with the separate dtoc package.
+"""
+
+import os
+import sys
+
+_VENDOR_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                           '_vendor')
+if _VENDOR_DIR not in sys.path:
+    sys.path.insert(0, _VENDOR_DIR)

{binary_manager-0.1.2 → binary_manager-0.1.3}/binman/etype/section.py

@@ -525,6 +525,11 @@ class Entry_section(Entry):
         for entry in self._entries.values():
             if not entry.ProcessContents():
                 sizes_ok = False
+
+        # A change to the contents of an entry can change the size of the
+        # compressed section, even if the entry stays the same size
+        if sizes_ok and self.compress != 'none':
+            sizes_ok = self.ProcessContentsUpdate(self.BuildSectionData(True))
         return sizes_ok and sizes_ok_base
 
     def WriteMap(self, fd, indent):

{binary_manager-0.1.2 → binary_manager-0.1.3}/binman/fetchbase.py

@@ -19,7 +19,6 @@ import multiprocessing
 import os
 import tempfile
 
-from u_boot_pylib import command
 from u_boot_pylib import tools
 
 BINMAN_DIR = os.path.dirname(os.path.realpath(__file__))
@@ -57,8 +56,7 @@ def build_env(env=None):
     Returns:
         dict: The environment, without the variables in GIT_LOCAL_ENV
     """
-    base = tools.get_env_with_path() or os.environ
-    run_env = {key: val for key, val in base.items()
+    run_env = {key: val for key, val in os.environ.items()
                if key not in GIT_LOCAL_ENV}
     run_env.update(env or {})
     return run_env
@@ -67,22 +65,15 @@ def build_env(env=None):
 def run_build(*args, env):
     """Run a command to build from source
 
-    This uses command.run_one() since tools.run() does not support setting the
-    environment
-
     Args:
         args: Command and its arguments
-        env (dict): Environment to use, from build_env()
+        env (dict): Environment to use, from build_env(). Any tool paths are
+            added to its PATH
 
     Raises:
         ValueError: The command failed
     """
-    result = command.run_one(*args, capture=True, capture_stderr=True,
-                             env=env, raise_on_error=False)
-    if result.return_code:
-        raise ValueError(f"Error {result.return_code} running "
-                         f"'{' '.join(args)}': "
-                         f"{result.stderr or result.stdout}")
+    tools.run(*args, env=env)
 
 
 def _make(srcdir, make_targets, output_path, run_env, make_flags, make_path):

{binary_manager-0.1.2 → binary_manager-0.1.3}/binman/ftest.py

@@ -5107,6 +5107,24 @@ class TestFunctional(unittest.TestCase):
             }
         self.assertEqual(expected, props)
 
+    def testCompressSectionUpdate(self):
+        """Test a compressed section whose contents change after packing
+
+        Updating the devicetree with the image layout keeps it the same size,
+        but changes the size of the compressed section which holds it. The
+        image must hold all of the compressed data.
+        """
+        self._CheckLz4()
+        data = self._DoReadFileDtb('entry/compress_section_update.dts',
+                                   use_real_dtb=True, update_dtb=True)[0]
+        section = control.images['image'].GetEntries()['section']
+        self.assertLessEqual(len(section.data), section.size)
+        self.assertEqual(section.data, data[:len(section.data)])
+
+        dtb_data = tools.read_file(tools.get_output_filename('u-boot.dtb.out'))
+        self.assertEqual(COMPRESS_DATA + dtb_data,
+                         self._decompress(section.data))
+
     def testLz4Missing(self):
         """Test that binman still produces an image if lz4 is missing"""
         with terminal.capture() as (_, stderr):

binary_manager-0.1.3/binman/test/entry/compress_section_update.dts

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0+
+/dts-v1/;
+
+/ {
+	binman {
+		section {
+			compress = "lz4";
+			blob {
+				filename = "compress";
+			};
+			u-boot-dtb {
+			};
+		};
+		u-boot {
+			offset = <0x12345>;
+		};
+	};
+};

{binary_manager-0.1.2 → binary_manager-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "binary-manager"
-version = "0.1.2"
+version = "0.1.3"
 authors = [
   { name="Simon Glass", email="sjg@chromium.org" },
 ]
@@ -29,6 +29,7 @@ dependencies = [
     "jsonschema",
     "PyYAML",
     "yamllint",
+    "u-boot-pylib >= 0.1.0",
 ]
 
 [project.optional-dependencies]
@@ -36,17 +37,17 @@ dependencies = [
 test = ["concurrencytest", "coverage"]
 
 [project.urls]
-Homepage = "https://github.com/nxtboot/binman"
+Homepage = "https://github.com/deinde-dev/binman"
 Documentation = "https://binman.readthedocs.io/"
-Repository = "https://github.com/nxtboot/binman"
-"Bug Tracker" = "https://github.com/nxtboot/binman/issues"
+Repository = "https://github.com/deinde-dev/binman"
+"Bug Tracker" = "https://github.com/deinde-dev/binman/issues"
 
 [project.scripts]
 binman = "binman.main:start_binman"
 
 [tool.setuptools.packages.find]
 # binman.test and its subdirs hold the test data, found as namespace packages.
-# binman._vendor holds the vendored libraries (see binman/__init__.py)
+# binman._vendor holds the vendored dtoc library (see binman/__init__.py)
 include = ["binman*"]
 
 [tool.setuptools.package-data]

binary_manager-0.1.2/binman/__init__.py

@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-"""Binman firmware packager
-
-binman bundles copies of U-Boot's u_boot_pylib library and dtoc's devicetree
-modules in _vendor/. Make these importable by their usual names, ahead of any
-other copies, e.g. in a U-Boot tree. They are kept out of the top level of
-site-packages, where they would clash with U-Boot's tools and with the
-separate u_boot_pylib and dtoc packages.
-"""
-
-import os
-import sys
-
-_VENDOR_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)),
-                           '_vendor')
-if _VENDOR_DIR not in sys.path:
-    sys.path.insert(0, _VENDOR_DIR)

binary_manager-0.1.2/binman/_vendor/u_boot_pylib/__init__.py

@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-__all__ = ['claude', 'command', 'cros_subprocess', 'gitutil', 'terminal',
-           'test_util', 'tools', 'tout']

binary_manager-0.1.2/binman/_vendor/u_boot_pylib/__main__.py

@@ -1,50 +0,0 @@
-#!/usr/bin/env python3
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2023 Google LLC
-#
-
-"""u_boot_pylib test runner"""
-
-import os
-import sys
-
-# Allow 'from u_boot_pylib import xxx' to work
-our_path = os.path.dirname(os.path.realpath(__file__))
-sys.path.append(os.path.join(our_path, '..'))
-
-import argparse
-
-from u_boot_pylib import cros_subprocess
-from u_boot_pylib import test_util
-
-
-def run_tests():
-    parser = argparse.ArgumentParser(description='u_boot_pylib test runner')
-    parser.add_argument('cmd', choices=['test'], help='Command to run')
-    parser.add_argument('testname', nargs='?', default=None,
-                        help='Specific test to run')
-    parser.add_argument('-v', '--verbose', action='store_true',
-                        help='Verbose output')
-    args = parser.parse_args()
-
-    from u_boot_pylib import test_claude
-    from u_boot_pylib import test_command
-    from u_boot_pylib import test_dwarf_lines
-    from u_boot_pylib import test_gitutil
-
-    to_run = args.testname if args.testname not in [None, 'test'] else None
-    result = test_util.run_test_suites(
-        'u_boot_pylib', False, args.verbose, False,
-        False, None, to_run, None,
-        ['u_boot_pylib.terminal', 'u_boot_pylib.gitutil',
-         cros_subprocess.TestSubprocess, test_claude.TestClaude,
-         test_command.TestRunInteractive,
-         test_dwarf_lines.TestLinesToRanges, test_dwarf_lines.TestRangeFormat,
-         test_gitutil.TestGitutilHelpers, test_gitutil.TestGitutilDrift])
-
-    sys.exit(0 if result.wasSuccessful() else 1)
-
-
-if __name__ == "__main__":
-    run_tests()