diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/binman/binman.rst | 4 | ||||
| -rw-r--r-- | tools/binman/etype/section.py | 2 | ||||
| -rwxr-xr-x | tools/buildman/main.py | 10 | ||||
| -rw-r--r-- | tools/docker/Dockerfile | 31 | ||||
| -rw-r--r-- | tools/patman/gitutil.py | 4 | ||||
| -rw-r--r-- | tools/patman/pyproject.toml | 2 |
6 files changed, 13 insertions, 40 deletions
diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst index aeea33f..020988d 100644 --- a/tools/binman/binman.rst +++ b/tools/binman/binman.rst @@ -1480,9 +1480,6 @@ as set in stone, so Binman will ensure it doesn't change. Without this feature, repacking an entry might cause it to disobey the original constraints provided when it was created. - Repacking an image involves - -.. _`BinmanLogging`: Signing FIT container with private key in an image -------------------------------------------------- @@ -1501,6 +1498,7 @@ If you want to sign and replace FIT container in place:: which will sign FIT container with private key and replace it immediately inside your image. +.. _`BinmanLogging`: Logging ------- diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index fb49e85..30c1041 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -40,7 +40,7 @@ class Entry_section(Entry): For example code, see etypes which subclass `Entry_section`, or `cbfs.py` for a more involved example:: - $ grep -l \(Entry_section tools/binman/etype/*.py + $ grep -l \\(Entry_section tools/binman/etype/*.py ReadNode() Call `super().ReadNode()`, then read any special properties for the diff --git a/tools/buildman/main.py b/tools/buildman/main.py index 5f42a58..3cf877e 100755 --- a/tools/buildman/main.py +++ b/tools/buildman/main.py @@ -7,7 +7,7 @@ """See README for more information""" try: - from importlib.resources import files + import importlib.resources except ImportError: # for Python 3.6 import importlib_resources @@ -83,7 +83,13 @@ def run_buildman(): run_test_coverage() elif args.full_help: - tools.print_full_help(str(files('buildman').joinpath('README.rst'))) + if hasattr(importlib.resources, 'files'): + dirpath = importlib.resources.files('buildman') + tools.print_full_help(str(dirpath.joinpath('README.rst'))) + else: + with importlib.resources.path('buildman', 'README.rst') as readme: + tools.print_full_help(str(readme)) + # Build selected commits for selected boards else: diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 1acb541..c4a2596 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -186,27 +186,6 @@ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ make -j$(nproc) all install && \ rm -rf /tmp/qemu -# Build QEMU supporting Nokia n900 emulation -RUN mkdir -p /opt/nokia && \ - cd /tmp && \ - git clone https://git.linaro.org/qemu/qemu-linaro.git && \ - cd /tmp/qemu-linaro && \ - git checkout 8f8d8e0796efe1a6f34cdd83fb798f3c41217ec1 && \ - ./configure --enable-system --target-list=arm-softmmu \ - --python=/usr/bin/python2.7 --disable-sdl --disable-gtk \ - --disable-curses --audio-drv-list= --audio-card-list= \ - --disable-werror --disable-xen --disable-xen-pci-passthrough \ - --disable-brlapi --disable-vnc --disable-curl --disable-slirp \ - --disable-kvm --disable-user --disable-linux-user --disable-bsd-user \ - --disable-guest-base --disable-uuid --disable-vde --disable-linux-aio \ - --disable-cap-ng --disable-attr --disable-blobs --disable-docs \ - --disable-spice --disable-libiscsi --disable-smartcard-nss \ - --disable-usb-redir --disable-guest-agent --disable-seccomp \ - --disable-glusterfs --disable-nptl --disable-fdt && \ - make -j$(nproc) && \ - cp /tmp/qemu-linaro/arm-softmmu/qemu-system-arm /opt/nokia && \ - rm -rf /tmp/qemu-linaro - # Build genimage (required by some targets to generate disk images) RUN wget -O - https://github.com/pengutronix/genimage/releases/download/v14/genimage-14.tar.xz | tar -C /tmp -xJ && \ cd /tmp/genimage-14 && \ @@ -250,16 +229,6 @@ RUN mkdir /tmp/trace && \ sudo make install && \ rm -rf /tmp/trace -# Files to run Nokia RX-51 (aka N900) tests -RUN mkdir -p /opt/nokia && \ - cd /opt/nokia && \ - wget https://raw.githubusercontent.com/pali/u-boot-maemo/master/debian/u-boot-gen-combined && \ - chmod 0755 u-boot-gen-combined && \ - wget http://repository.maemo.org/qemu-n900/qemu-n900.tar.gz && \ - wget http://repository.maemo.org/pool/maemo5.0/free/k/kernel/kernel_2.6.28-20103103+0m5_armel.deb && \ - wget http://repository.maemo.org/pool/maemo5.0/free/g/glibc/libc6_2.5.1-1eglibc27+0m5_armel.deb && \ - wget http://repository.maemo.org/pool/maemo5.0/free/b/busybox/busybox_1.10.2.legal-1osso30+0m5_armel.deb - # Create our user/group RUN echo uboot ALL=NOPASSWD: ALL > /etc/sudoers.d/uboot RUN useradd -m -U uboot diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 6700057..b0a12f2 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -651,7 +651,7 @@ def get_default_user_name(): Returns: User name found in .gitconfig file, or None if none """ - uname = command.output_one_line('git', 'config', '--global', 'user.name') + uname = command.output_one_line('git', 'config', '--global', '--includes', 'user.name') return uname @@ -661,7 +661,7 @@ def get_default_user_email(): Returns: User's email found in .gitconfig file, or None if none """ - uemail = command.output_one_line('git', 'config', '--global', 'user.email') + uemail = command.output_one_line('git', 'config', '--global', '--includes', 'user.email') return uemail diff --git a/tools/patman/pyproject.toml b/tools/patman/pyproject.toml index c5dc7c7..a54211f 100644 --- a/tools/patman/pyproject.toml +++ b/tools/patman/pyproject.toml @@ -23,7 +23,7 @@ classifiers = [ "Bug Tracker" = "https://source.denx.de/groups/u-boot/-/issues" [project.scripts] -patman = "patman.__main__:run_patman" +patman = "patman.__main__" [tool.setuptools.package-data] patman = ["*.rst"] |