Fix cpu_info tests with qemu >= 8.2, update README

Signed-off-by: Paul Guyot <pguyot@kallisys.net>

Author: pguyot

.github/workflows/test-cpu_info.yml

@@ -9,7 +9,11 @@ on:
 
 jobs:
   test_zero_w:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: ["ubuntu-22.04", "ubuntu-24.04"]
     steps:
     - uses: actions/checkout@v4
     - uses: ./ # pguyot/arm-runner-action@HEAD
@@ -21,43 +25,58 @@ jobs:
             cat /proc/cpuinfo > cpuinfo.txt
     - name: Test content of cpuinfo
       run: |
+        cat cpuinfo.txt
         grep -c ARMv6 cpuinfo.txt
         grep -c "CPU architecture: 7" cpuinfo.txt
-        grep -c 6769746875620000 cpuinfo.txt
+        grep -c "CPU part.*0xb76" cpuinfo.txt
   test_3b:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: ["ubuntu-22.04", "ubuntu-24.04"]
     steps:
     - uses: actions/checkout@v4
     - uses: ./ # pguyot/arm-runner-action@HEAD
       with:
         cpu_info: cpuinfo/raspberrypi_3b
         bind_mount_repository: true
-        cpu: cortex-a7
+        cpu: cortex-a53:cortex-a53
         commands: |
             cat /proc/cpuinfo > cpuinfo.txt
     - name: Test content of cpuinfo
       run: |
+        cat cpuinfo.txt
         grep -c ARMv7 cpuinfo.txt
         grep -c "CPU architecture: 7" cpuinfo.txt
-        grep -c 676974687562003b cpuinfo.txt
+        grep -c "CPU part.*0xd03" cpuinfo.txt
   test_zero2_w:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: ["ubuntu-22.04", "ubuntu-24.04"]
     steps:
     - uses: actions/checkout@v4
     - uses: ./ # pguyot/arm-runner-action@HEAD
       with:
         cpu_info: cpuinfo/raspberrypi_zero2_w
         bind_mount_repository: true
-        cpu: cortex-a7
+        cpu: cortex-a53:cortex-a53
         commands: |
             cat /proc/cpuinfo > cpuinfo.txt
     - name: Test content of cpuinfo
       run: |
+        cat cpuinfo.txt
         grep -c ARMv7 cpuinfo.txt
         grep -c "CPU architecture: 7" cpuinfo.txt
-        grep -c 6769746875620002 cpuinfo.txt
+        grep -c "CPU part.*0xd03" cpuinfo.txt
   test_zero2_w_arm64:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: ["ubuntu-22.04", "ubuntu-24.04"]
     steps:
     - uses: actions/checkout@v4
     - uses: ./ # pguyot/arm-runner-action@HEAD
@@ -70,39 +89,51 @@ jobs:
             cat /proc/cpuinfo > cpuinfo.txt
     - name: Test content of cpuinfo
       run: |
+        cat cpuinfo.txt
         grep -c "CPU architecture: 8" cpuinfo.txt
-        grep -c 6769746875620002 cpuinfo.txt
+        grep -c "CPU part.*0xd03" cpuinfo.txt
   test_4b:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: ["ubuntu-22.04", "ubuntu-24.04"]
     steps:
     - uses: actions/checkout@v4
     - uses: ./ # pguyot/arm-runner-action@HEAD
       with:
         cpu_info: cpuinfo/raspberrypi_4b
         bind_mount_repository: true
-        cpu: cortex-a53
+        cpu: max:cortex-a72
+        base_image: raspios_lite_arm64:latest
         commands: |
             cat /proc/cpuinfo > cpuinfo.txt
     - name: Test content of cpuinfo
       run: |
         cat cpuinfo.txt
         grep -c "CPU architecture: 8" cpuinfo.txt
-        grep -c 676974687562004b cpuinfo.txt
+        grep -c "CPU part.*0xd08" cpuinfo.txt
   test_5:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: ["ubuntu-22.04", "ubuntu-24.04"]
     steps:
     - uses: actions/checkout@v4
     - uses: ./ # pguyot/arm-runner-action@HEAD
       with:
         cpu_info: cpuinfo/raspberrypi_5
         bind_mount_repository: true
-        cpu: cortex-a53
+        cpu: cortex-a76
+        base_image: raspios_lite_arm64:latest
         commands: |
             cat /proc/cpuinfo > cpuinfo.txt
     - name: Test content of cpuinfo
       run: |
+        cat cpuinfo.txt
         grep -c "CPU architecture: 8" cpuinfo.txt
-        grep -c 6769746875620050 cpuinfo.txt
+        grep -c "CPU part.*0xd0b" cpuinfo.txt
   test_cortex_a76:
     # Ubuntu 24.04 comes with qemu >= 8.2 which does emulate /proc/cpuinfo
     # on aarch64
@@ -113,9 +144,12 @@ jobs:
       with:
         bind_mount_repository: true
         cpu: cortex-a76
+        base_image: raspios_lite_arm64:latest
         commands: |
             cat /proc/cpuinfo > cpuinfo.txt
     - name: Test content of cpuinfo
       run: |
+        cat cpuinfo.txt
         grep -c "model name	: ARMv8 Processor rev 0 (v8l)" cpuinfo.txt
         grep -c "CPU architecture: 8" cpuinfo.txt
+        grep -c "CPU part.*0xd0b" cpuinfo.txt

README.md

@@ -200,9 +200,8 @@ from the target system.
 #### `cpu_info`
 
 Path to a fake cpu_info file to be used instead of `/proc/cpuinfo`. Default is
-to not fake the CPU. With older versions of qemu, including the one provided
-by ubuntu-latest as of this writing (ubuntu 22.04, qemu 6), `/proc/cpuinfo` is
-not intercepted and will report amd64 CPU of GitHub runner.
+to not fake the CPU. With older versions of qemu, `/proc/cpuinfo` is not
+intercepted and will report amd64 CPU of GitHub runner.
 
 Some software checks for features using `/proc/cpuinfo` and this option can be
 used to trick them. The path is relative to the action (to use pre-defined
@@ -229,8 +228,11 @@ default emulated CPU for 32 bits may not work and you should set `cpu` option
 to `cortex-a7`.
 
 qemu 8.2 and higher do intercept `/proc/cpuinfo` to report something related
-to the passed cpu option. So if you are running ubuntu-24.04 or if you install
-your own version of qemu-user-arm/aarch64, this option will be effectless.
+to the passed `cpu` option. So if you are running ubuntu-24.04 or if you install
+your own version of qemu-user-arm/aarch64, this option will not override
+`/proc/cpuinfo`; set `cpu` to the CPU you want qemu to report instead. For
+example, Raspberry Pi 4 should use `max:cortex-a72` with a 64-bit image, and
+Raspberry Pi 5 should use `cortex-a76` with a 64-bit image.
 
 #### `optimize_image`