update: README.md, CHANGELOG.md, bump actions/checkout@v7

Author: o-murphy

.github/workflows/natmod.yml

@@ -75,7 +75,7 @@ jobs:
             }
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: recursive
 
@@ -119,7 +119,7 @@ jobs:
           - { suffix: _sp, precision: single }
           - { suffix: _dp, precision: double }
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: recursive
 
@@ -162,7 +162,7 @@ jobs:
           - { suffix: _sp, precision: single }
           - { suffix: _dp, precision: double }
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: recursive
 
@@ -202,7 +202,7 @@ jobs:
     if: ${{ !cancelled() }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: recursive
 
@@ -260,7 +260,7 @@ jobs:
   #   if: ${{ !cancelled() }}
   #   runs-on: ubuntu-latest
   #   steps:
-  #     - uses: actions/checkout@v6
+  #     - uses: actions/checkout@v7
 
   #     - name: Fetch MicroPython ${{ env.MPY_TAG }}
   #       run: |

.github/workflows/usermod.yml

@@ -22,7 +22,7 @@ jobs:
     name: build + test (armhf / qemu-arm)
     runs-on: ubuntu-26.04-arm
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: 'true'
           fetch-depth: 0
@@ -61,7 +61,7 @@ jobs:
     name: build + test (mipsel / qemu-mipsel)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: 'true'
           fetch-depth: 0
@@ -98,7 +98,7 @@ jobs:
     name: build + test (aarch64)
     runs-on: ubuntu-26.04-arm
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: 'true'
           fetch-depth: 0
@@ -142,7 +142,7 @@ jobs:
     name: build + test (armv7m_sp / QEMU Cortex-M3)
     runs-on: ubuntu-26.04-arm
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: 'true'
           fetch-depth: 0
@@ -163,7 +163,7 @@ jobs:
     name: build + test (x64)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: 'true'
           fetch-depth: 0
@@ -205,7 +205,7 @@ jobs:
     name: build + test (x86)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: 'true'
           fetch-depth: 0
@@ -241,7 +241,7 @@ jobs:
     name: build + artifact (rp2040)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: 'true'
           fetch-depth: 0

CHANGELOG.md

@@ -9,9 +9,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+#### `usermod/` — x86, armhf, armv7m builds moved inside Docker
+
+All targets that require standalone libffi (`autoreconf` + `deplibs`) or a bare-metal
+toolchain are now fully self-contained inside pinned Ubuntu 22.04 Docker images.
+This eliminates `autotools` version sensitivity (Ubuntu 24.04+ breaks libffi's
+`configure.ac` from MicroPython v1.28) and removes all host-side toolchain requirements
+beyond Docker itself.
+
+| Target | Dockerfile | What runs inside |
+|--------|-----------|-----------------|
+| `x86` / `x86sp` | `Dockerfile.x86` | mpy-cross, autoreconf, deplibs, main build |
+| `armhf` / `armhfsp` | `Dockerfile.armhf` | mpy-cross, autoreconf, deplibs, main build, strip |
+| `qemu-armv7m` | `Dockerfile.armv7m` | mpy-cross, firmware build, QEMU test |
+| `mipsel` / `mipselsp` | `Dockerfile.mipsel` | mpy-cross, submodules, deplibs, main build, strip |
+
+- `usermod/Dockerfile.x86`: Ubuntu 22.04 + `gcc-multilib g++-multilib` + autotools.
+- `usermod/Dockerfile.armhf`: Ubuntu 22.04 + `gcc-arm-linux-gnueabihf` + autotools.
+- `usermod/Dockerfile.armv7m`: Ubuntu 22.04 + `gcc-arm-none-eabi libnewlib-arm-none-eabi qemu-system-arm python3-serial`.
+- New `make qemu-armv7m` target: runs the full Cortex-M3 build **and** test inside Docker via `usermod/ci/run_qemu.py`.
+- `apt-deps` Makefile target removed (superseded by Docker).
+- `.github/workflows/usermod.yml`:
+  - `build-test-x86`: removed `Install deps` and `Build mpy-cross` steps; single `make x86 / make x86sp` step.
+  - `build-test-armhf`: runner changed `ubuntu-22.04` → `ubuntu-26.04-arm`; removed `Install cross-compiler`, `Build mpy-cross`, `Build standalone libffi` steps; build step is now `make armhf`; only `Install QEMU` + test remain on the host.
+  - `build-test-qemu-armv7m`: runner changed `ubuntu-latest` → `ubuntu-26.04-arm`; all 5 steps (toolchain install, mpy-cross, version header, firmware build, test) replaced with a single `make qemu-armv7m`.
+
 #### `usermod/Makefile` — mipsel builds inside Docker
-- `mipsel` / `mipselsp` targets now run inside a Docker container (Ubuntu 20.04 + `gcc-mipsel-linux-gnu`) instead of requiring the toolchain on the host. Docker image is built automatically on first run from `usermod/Dockerfile.mipsel` and reused on subsequent builds.
-- `usermod/Dockerfile.mipsel`: Ubuntu 20.04, `libtool-bin` included for `autoreconf`/`deplibs`; no host toolchain install needed for mipsel.
+- `mipsel` / `mipselsp` targets now run inside a Docker container (Ubuntu 22.04 + `gcc-mipsel-linux-gnu`) instead of requiring the toolchain on the host. Docker image is built automatically on first run from `usermod/Dockerfile.mipsel` and reused on subsequent builds.
+- `usermod/Dockerfile.mipsel`: Ubuntu 22.04, `libtool-bin` included for `autoreconf`/`deplibs`; no host toolchain install needed for mipsel.
 - Build sequence inside container: `mpy-cross` → `submodules` → `deplibs` → main build. Output lands on the host at `usermod/build/mipsel_{dp,sp}/micropython` via Docker volume mount.
 - `.github/workflows/usermod.yml` `build-mipsel` job simplified: toolchain install, mpy-cross, and deplibs steps removed; replaced with a single `make mipsel MPY_DIR=...` step.
 

README.md

@@ -42,7 +42,10 @@ and all flag / index constants.
 │   ├── micropython.mk          # Picked up by py.mk via USER_C_MODULES
 │   ├── micropython.cmake       # CMake entry point for RP2040 / pico-sdk
 │   ├── manifest.py             # Freezes tiny_bclibc.py into firmware
-│   ├── Dockerfile.mipsel       # Ubuntu 22.04 + mipsel cross-compiler
+│   ├── Dockerfile.x86          # Ubuntu 22.04 + gcc-multilib (x86 builds)
+│   ├── Dockerfile.armhf        # Ubuntu 22.04 + gcc-arm-linux-gnueabihf
+│   ├── Dockerfile.armv7m       # Ubuntu 22.04 + gcc-arm-none-eabi + qemu-system-arm
+│   ├── Dockerfile.mipsel       # Ubuntu 22.04 + gcc-mipsel-linux-gnu
 │   └── ci/run_qemu.py          # QEMU UART bridge for usermod CI tests
 │
 ├── ffimod/                     # FFI-based access (any unix arch)
@@ -196,18 +199,19 @@ available as a built-in. Use this approach when:
 All commands are run from `usermod/`.
 
 ```bash
-make x64        # x64 double (default)
-make x64sp      # x64 single
-make x86        # x86 double  [requires gcc-multilib; standalone static]
-make x86sp      # x86 single
-make aarch64    # AArch64 double  (cross: aarch64-linux-gnu-, static)
-make aarch64sp  # AArch64 single
-make armhf      # ARMv7hf double  (cross: arm-linux-gnueabihf-, static)
-make armhfsp    # ARMv7hf single
-make mipsel     # MIPS LE double  (cross: mipsel-linux-gnu-, static)
-make mipselsp   # MIPS LE single
-make rp2040     # RP2040 single (cmake, pico-sdk)
-make rp2040dp   # RP2040 double
+make x64          # x64 double (default)
+make x64sp        # x64 single
+make x86          # x86 double           [Docker — no host toolchain needed]
+make x86sp        # x86 single           [Docker]
+make aarch64      # AArch64 double  (cross: aarch64-linux-gnu-, static)
+make aarch64sp    # AArch64 single
+make armhf        # ARMv7hf double       [Docker — no host toolchain needed]
+make armhfsp      # ARMv7hf single       [Docker]
+make mipsel       # MIPS LE double       [Docker]
+make mipselsp     # MIPS LE single       [Docker]
+make qemu-armv7m  # Cortex-M3 build + test [Docker]
+make rp2040       # RP2040 single (cmake, pico-sdk)
+make rp2040dp     # RP2040 double
 ```
 
 Output for unix targets: `usermod/build/<target>/micropython`
@@ -219,17 +223,15 @@ Precision is passed as `TINY_BCLIBC_PRECISION=single|double` for make-based port
 ### Prerequisites
 
 ```bash
-# For armhf / aarch64 cross-compile targets
-sudo apt-get install \
-    autoconf automake libtool libtool-bin \
-    gcc-arm-linux-gnueabihf \     # armhf
-    gcc-aarch64-linux-gnu \       # aarch64
-    gcc-multilib                  # x86
+# x64 / x64sp — host gcc only (already installed)
 
-# mipsel — builds inside Docker (Ubuntu 22.04); no host toolchain needed:
-#   make mipsel MPY_DIR=...   (Docker image built automatically on first run)
+# aarch64 / aarch64sp — cross-compiler on host
+sudo apt-get install gcc-aarch64-linux-gnu
 
-# For rp2040
+# x86, armhf, mipsel, qemu-armv7m — Docker only, no host toolchain needed:
+#   Docker images are built automatically on first run from usermod/Dockerfile.*
+
+# rp2040 / rp2040dp — bare-metal ARM toolchain
 sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
 ```
 
@@ -264,46 +266,28 @@ vfs.mount(bdev, '/')
 
 ### Test (QEMU Cortex-M3 / armv7m_sp)
 
-```bash
-sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi qemu-system-arm
-pip install pyserial
-
-MPY_DIR=/path/to/micropython-1.28.0
-make -C "$MPY_DIR/mpy-cross"
-make generated MPY_DIR="$MPY_DIR"
-
-make -C "$MPY_DIR/ports/qemu" BOARD=MPS2_AN385 \
-    USER_C_MODULES="$(pwd)/.." \
-    FROZEN_MANIFEST="$(pwd)/manifest.py" \
-    TINY_BCLIBC_PRECISION=single
+Runs entirely inside Docker — no host toolchain needed:
 
-MPY_DIR="$MPY_DIR" python3 ci/run_qemu.py \
-    "$MPY_DIR/ports/qemu/build-MPS2_AN385/firmware.elf" \
-    ../tests/
+```bash
+cd usermod
+make qemu-armv7m MPY_DIR=/path/to/micropython-1.28.0
 ```
 
-Unlike the natmod QEMU runner, `ci/run_qemu.py` sends `test_bclibc.py` directly to the
-UART REPL — no `.mpy` injection step, because the module is already built into the firmware.
+The `qemu-armv7m` target builds the Docker image on first run, then inside the container:
+mpy-cross → version header → MPS2_AN385 firmware → `ci/run_qemu.py` test.
 
-### Standalone static build (cross, for qemu-user testing)
+### Test (armhf / qemu-arm)
 
-Cross-compile targets (`armhf`, `aarch64`, `mipsel`) use `MICROPY_STANDALONE=1` and
-`LDFLAGS_EXTRA="-static"` to produce fully static binaries. These run directly under
-`qemu-arm` / `qemu-aarch64` / `qemu-mipsel` without needing matching shared libraries.
+```bash
+cd usermod
+make armhf MPY_DIR=/path/to/micropython-1.28.0
+qemu-arm build/armhf_dp/micropython ../tests/test_bclibc.py
+```
 
-Building libffi from source (required by `MICROPY_STANDALONE=1`) needs `libtool-bin`
-so that `lib/libffi/autogen.sh → autoreconf` can find `libtoolize`:
+The build runs inside Docker (`Dockerfile.armhf`). Only `qemu-arm` is needed on the host:
 
 ```bash
-sudo apt-get install autoconf automake libtool libtool-bin pkg-config
-USERMOD_BUILD="$(pwd)/build"
-make -C "$MPY_DIR/ports/unix" VARIANT=standard \
-    BUILD="$USERMOD_BUILD/armhf" \
-    CROSS_COMPILE=arm-linux-gnueabihf- \
-    MICROPY_STANDALONE=1 LDFLAGS_EXTRA="-static" \
-    deplibs
-make armhf MPY_DIR="$MPY_DIR"
-qemu-arm build/armhf/micropython ../tests/test_bclibc.py
+sudo apt-get install qemu-user
 ```
 
 ### natmod vs usermod comparison