allow per-target configuration for qemu-user-static

build

@@ -59,9 +59,10 @@ def docker_images(config, targets, force):
         params = config['docker-targets'][name]
         needed_qemu = params.get('qemu')
         if needed_qemu and started_qemu != needed_qemu:
-            pull('aptman/qus:d5.0', needed_qemu)
-            shell('docker run --rm --privileged aptman/qus:d5.0 -- -r')
-            shell('docker run --rm --privileged aptman/qus:d5.0 -s -- -p')
+            qemu_config = config['qemu-user-static'][name in config['qemu-user-static'] and name or 'default']
+            pull(qemu_config['image'], needed_qemu)
+            for cmd in qemu_config['setup']:
+                shell('docker run --rm --privileged %s %s' % (qemu_config['image'], cmd))
             started_qemu = needed_qemu
 
         image = prefix+name

build.yml

@@ -493,6 +493,19 @@ qt-config:
 # docker image which provides fpm
 fpm-image:      wkhtmltopdf/fpm:1.10.2-20200531
 
+# qemu-user-static -- allow overriding the setup for a specific target
+qemu-user-static:
+  default:
+    image: aptman/qus:d5.0 # chosen because it works with most builds
+    setup:
+      - "-- -r"
+      - "-s -- -p"
+  almalinux9-ppc64le:
+    image: aptman/qus:d6.1 # required for POWER 9 support used in image
+    setup:
+      - "-- -r"
+      - "-s -- -p"
+
 # mapping of distro architecture => docker platform
 matrix-platforms:
   # debian/ubuntu