binfmt: make parser more robust

Make sure we no longer match on the emulation binary, but rather on the
entry-name. The emulation binary might be a different one (see i386 and
i486 for instance). Furthermore, make sure to skip empty entries.

Lastly, note that upstream qemu now has a script to do the exact same
thing. We should switch some day..

Signed-off-by: David Rheinsberg <david.rheinsberg@gmail.com>

1 files changed, 12 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ddb1d3259610..0eb580c810fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -65,6 +65,11 @@ create_binfmts() {
   rm -Rf usr/lib/binfmt.d
   mkdir -p usr/lib/binfmt.d
 
+  # Qemu upstream now has a script to create the binfmt
+  # configurations, in ./scripts/qemu-binfmt-conf.sh. We
+  # should switch to it, rather than parsing the old
+  # Fedora configuration manually.
+
   for i in \
           aarch64 \
           alpha \
@@ -109,12 +114,13 @@ create_binfmts() {
       fi
     fi
 
-    grep "/qemu-$i:\$" "${srcdir}/qemu.binfmt" \
-            | tr -d '\n' \
-            >"usr/lib/binfmt.d/qemu-$i-static.conf"
-    echo "F" \
-            >>"usr/lib/binfmt.d/qemu-$i-static.conf"
-    perl -i -p -e "s/qemu-$i:F/qemu-$i-static:F/" \
+    CFG=$(grep "^:qemu-$i:" "${srcdir}/qemu.binfmt" | tr -d '\n')
+    if [ -z "$CFG" ] ; then
+        continue
+    fi
+
+    echo -E -n "$CFG" >"usr/lib/binfmt.d/qemu-$i-static.conf"
+    perl -i -p -e "s/bin\/qemu-([^:]+):\$/bin\/qemu-\1-static:F/" \
             "usr/lib/binfmt.d/qemu-$i-static.conf"
   done
 }