Install initscript that qemu-user provides for binfmts when QEMU_USER_TARGETS are set.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

4 files changed, 147 insertions, 5 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index ab81f6554644..aca487a2511d 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.159 2013/01/12 04:32:37 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.160 2013/01/12 04:56:15 cardoe Exp $
+
+  12 Jan 2013; Doug Goldstein <cardoe@gentoo.org> +files/qemu-binfmt.initd,
+  qemu-1.2.2.ebuild:
+  Install initscript that qemu-user provides for binfmts when QEMU_USER_TARGETS
+  are set.
 
   12 Jan 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.2.2.ebuild:
   Remove trailing whitespace.
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 674010433688..d0d90b883fd8 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,6 +1,7 @@
 AUX 65-kvm.rules 40 SHA256 c16a8dc7855880b2651f1a3ff488ecc54d4ac1036c71fffd5007021d8d18a7c5 SHA512 98aad2a2f212a7ac0ee5b60a9c92744fa462bce5f26594845c7a31d692aaaca2d52cb57bdbede7dfc60b9862c2a6510665dbb03215d5cf76e62516a283decdd6 WHIRLPOOL 937de93a23930f6b8533f0c3e0dd249c99ddf7d54446dea857607266ac0a4b435c5b4a52b2986b138bace9c0a7ade66f94116b38e2bc4767ead54bd11baf0920
 AUX qemu-1.2.0-cflags.patch 359 SHA256 8917142633d32497d63dd2f2934e17d86a2e2ab11be2c8551e7218c9251b66a1 SHA512 f60ecc9a0e6969436a77444193cdba4f3028db683de0963870cbac5bf3a1b47da815926236f127a5f56333efc21efc52eb732cfce6393b764bfa1b9f569df645 WHIRLPOOL e0b3b8e1e68a3b42ce7727f7fa2029dd382fe9c8f7260c29e52368a1cd3b29efcfc134cf9908b3590ed6fe57c785bd05bf676e61736dc321a7a4899dd8b0a861
 AUX qemu-9999-cflags.patch 347 SHA256 fe3bcbe83e81225b2c722578a0a976fcb724419d5208bbd6d02fb543e80b7e12 SHA512 e1b8be744170d61a2155b23a8394db01f8af6dc70ec033e71b2ff46f72975704836d42b96d7904e5d462289c5f8f24317f2fb28698f18a77ab1de02829e585eb WHIRLPOOL 2d972c7e40292f424fd37a4c1af04d2be095c215211ec2e1d15d8457df553342ffc02a7d39985f817fbbf5342e422d30e439c35a925341cf9b852ca7ff15a308
+AUX qemu-binfmt.initd 7470 SHA256 32a4196e7b4ebf02d5717596e38630131379f69216d90afb553b70cbb3d810d6 SHA512 8e33148c62d41b270dbb8d1e383dd56d3b3c06b77bd00577486fbe54c5030a4a69b70a7c7773724325fb0e742efe6d4fdee6119f3cdd4e1336abd831ad74ac25 WHIRLPOOL 9e2526714853dbdde85aa447a3e9a944c2ec3ae77edf8bef882aa73982940c6e43de03618a826a79e5b13f3d796b9962b36ef64a0871a41fa26a601b665302eb
 AUX qemu-kvm 60 SHA256 ded08eb1c74a9581912a9ca7876de6f33d1c545ed2a7d275f9b1749539feb7ee SHA512 d973d70ffeb7f4cdc61b25a30bf7174ac05b8c136234478782367a16668ff617756e9862a9cd94acd4b6636fda36410762e069a2eccca99410aa6e3b4294e363 WHIRLPOOL 41937bf752a2f643085fbd04643fb7a5cb898fabe8625d80b730c9e930f48f8d63245d5acdffbe31ecede1e1eb83fd3a73aad925f020e5c016f1b6559e7426d3
 DIST qemu-kvm-1.1.1-bp-1.tar.xz 2908 SHA256 16b7cd2e10b3a05d20006898bcfdb26eb596f7c7d3c0e18fb216cb2b2026af40 SHA512 781eae1fdc1cb7482d3d6fd1cf81e0d565588e3987fc4cab92abc06741b1b57d999b0de1fffce7270f50033b53c5707e4ef477ca3b7ddfca3dc1a432c1e15cc7 WHIRLPOOL 3f80b4cc9902021686bea823a41af136d21dd5a6b8aa59913aeb8697c3a38acc02d92ee59b9d052b6d161830a72d709fe684beb95f756a92216fe79cce4c5d9a
 DIST qemu-kvm-1.1.1.tar.gz 6599376 SHA256 c6fab57ccadcad5deb34728623840a0141a0f3c8f29d0c253db577f059c796df SHA512 1106a35212cdac1fe5b043af6754595d03232f22bf74cdab86973759adb3cff2d3d7b42290883d2d99d97d163fe274de0108a05eed906ffdc3349c0631f52492 WHIRLPOOL 4d9b2b788a7f87104032635b3b6e2cd96275b92683e3003510b0951536ed6bcb959959bc7529e3f912a7a2055b5c1710b9310d591a8b443a17a231e5b86f6105
@@ -17,7 +18,7 @@ EBUILD qemu-1.1.2-r2.ebuild 12143 SHA256 5f8ab28b784d2a35b32c28600189f99e5dcee40
 EBUILD qemu-1.1.2-r3.ebuild 12271 SHA256 1d6d342f14d573b1f10da3d1e24ef2bf456863f61d2440416ac5502cf6dd1ae9 SHA512 43f3182cb4a13e4de36f95dfe36caaa882f8f238afb46697859775107dd269d888676bef05000764f95e1848c4f7e014661da2a2ace7fa8f2259dd8a8395a7d4 WHIRLPOOL ac9f9ce5592a04990541fc959003c81ac9f4e79e03e83a56dd1ac679ddd04f74948bff04d9c1b125c2d026f1aaec23c1344e3503e5bd39671e17f75351cf21f7
 EBUILD qemu-1.2.0.ebuild 12734 SHA256 70882add7a604530bb05c169006d1ce7c2b7b8d19a1fae0e4dbda84f4c9f0678 SHA512 107b7fae751c09ad472ea698830e3dea8725788fb3dfed3391d6f202ea1549d1d14a97ce5a9fa635ea351d3f651403202eb3b3cc1ac8027597b25efd20fd2485 WHIRLPOOL f3d1fda4c3686d1ab0fbb18f18b34f8240a6ab38bb69fad6d0d1f87cb789438fcf468c9c3fa684608bb7d423ecc2d2880242cb5861fcfc41a12b7e93ec118da2
 EBUILD qemu-1.2.1.ebuild 12739 SHA256 8911c3d363d66674aea349b49db2edf6267fb5bb4c044cbf078e6d26d7ca7233 SHA512 fdcace8fb1caf47a3e04a0b335ddf79eb5462649e3af9e8cd433f69d3ac85ff3e2bdd563e3aa776b14e4c72410b1966fb9e520f49eed5494d42c4bece91d856b WHIRLPOOL f910fde1660fac851a3509113b16b6d74fa629f279775f0969e7b22987be8c1e1e923b8c97772e3f970de20f9377ced3fff488db312beb1c0fd351c0aa186620
-EBUILD qemu-1.2.2.ebuild 12814 SHA256 e827c67f268d190dde4779fac9019c6d667fd40ff7916415522ebb45c498d901 SHA512 cf16dcc290b8d7aceb0f29df234692fa1580e82d342438bdb30e706aa39dc3ada377bcd07e6b0e0e0098aa7fa105b4d0698253143446bdf3877fcac6abd75c3b WHIRLPOOL 5845f73368d1cb0b29586b60af666536ea9be296c74c987d59106967d4583cd66e4010884e5e4898ba20f9c2e78793326cfcc21aa99e33406bb03d68d7ab523f
+EBUILD qemu-1.2.2.ebuild 12943 SHA256 1435726997ca5af5a14206ff4f346b8a0573d788e74a691679d6b10b95317cf3 SHA512 f1c832ec43499fc742cc81712ce762a189da2a3efe3a6333e2124790062eb9d6332683325f44151188bbca1e05f5768b7b6dc43c8c8fe17f4440ed90352001bd WHIRLPOOL df858355e274594e9f3c5ec2b219bd208e8a8a1a8b43c27dd8c081a1d161c7e83d8f198b998fddab4667839c9b2f1039940f75a6c88e17bade550c04fbcd61a4
 EBUILD qemu-9999.ebuild 12706 SHA256 24e1deb0648545fa01df3fcf679bf3fc4f5883de2b49d86fc1fb3f462db547e7 SHA512 9f316d88f716b71bfe1e2ad6c0c9a40feb97631e666e01c0da626489ab8b90842dd0561099d30a1cc34eff16011fca27222e971604116463e45995b26b3950c1 WHIRLPOOL 06bbd92092b92efe9c058f91d509cc6702fa476b21de169ce85d123d446af4bb4b0749d021a737afc7427367a8a24294ffefd4f75c87ff43aff7d024103111d2
-MISC ChangeLog 25569 SHA256 ce4f79acbc0e6be156603eaefd149a7b0f20ef7ac13c9ceb672574bb24714e82 SHA512 0f71885d3005030c7901a97176e567be88d60ef83039bd369f2420fc37ee52e10bd19f4b30107a26cc6dfddf79644763ef278a4902beb45729e3fcd7d686e355 WHIRLPOOL 2a98ab37427d3a89a174749a01f9ae9d43ef9fc3e7be38e231464eb0a658e5011b5e2e37f98680efb42952272944d97b37e2f08d22bed276ff72477c418f0231
+MISC ChangeLog 25758 SHA256 582722c2f6aa35c09de9253d27e768de07cf8e956238ede0e6aa022c7b3ae5fc SHA512 c584a543474e207357459fad59b939a6f9da6b2c12cd65d696eba0aceed74b80f0befaaf45a9d58fc3ff77e78e0975cb6a81bb01f622965fc11caae06434c36a WHIRLPOOL 222df6cdb12c516d04f49805a8c65f858ca6f2e696da6de25a5b0d4ba298f58d1df67b1983cdcd58e29f4977b56f388a3d4e000d2aec86a948f1844067feb8cb
 MISC metadata.xml 2722 SHA256 0d2c9fb51a2177ac7750c15ed830479795b67b15734ed2b916afae556a3cadf7 SHA512 3b364d79b6790c7c7c4826aff13dd380e8a914abf691431e22821337d1ab91281614beaa2736ab459b0c996893aa80e09db45eeb1f6a0b14ca251b1a645310e5 WHIRLPOOL a0521b8ee57b1d7c31133701d7e1c7348473e54d1b39708a49c31baa352f365c65dd3cba53860139551723f26ee7213b0db759b65e03b843e94e24b3723b5575
diff --git a/app-emulation/qemu/files/qemu-binfmt.initd b/app-emulation/qemu/files/qemu-binfmt.initd
new file mode 100644
index 000000000000..72044bf8e5bf
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-binfmt.initd
@@ -0,0 +1,132 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/files/qemu-binfmt.initd,v 1.1 2013/01/12 04:56:15 cardoe Exp $
+
+# enable automatic i386/ARM/M68K/MIPS/SPARC/PPC/s390 program execution by the kernel
+
+depend() {
+    after procfs
+}
+
+start() {
+   ebegin "Registering qemu-user binaries"
+
+   if [[ ! -d /proc/sys/fs/binfmt_misc ]] ; then
+      eerror "You need support for \"misc binaries\" in your kernel!"
+      eend 1
+   fi
+
+   if [[ $(mount | grep -c binfmt_misc) -eq 0 ]] ; then
+      mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc &> /dev/null
+      local result=$?
+
+      if [[ $result -ne 0 ]] ; then
+         eend $result
+      fi
+   fi
+
+   # probe cpu type
+   cpu=`uname -m`
+   case "$cpu" in
+      i386|i486|i586|i686|i86pc|BePC|x86_64)
+         cpu="i386"
+         ;;
+      m68k)
+         cpu="m68k"
+         ;;
+      mips*)
+         cpu="mips"
+      ;;
+      "Power Macintosh"|ppc|ppc64)
+         cpu="ppc"
+      ;;
+      armv[4-9]*)
+         cpu="arm"
+      ;;
+      sparc*)
+         cpu="sparc"
+      ;;
+   esac
+
+   # register the interpreter for each cpu except for the native one
+   if [ $cpu != "i386" -a -x "/usr/bin/qemu-static-i386-binfmt" ] ; then
+      echo ':i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-static-i386-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+      echo ':i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-static-i386-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "alpha" -a -x "/usr/bin/qemu-static-alpha-binfmt" ] ; then
+      echo ':alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-static-alpha-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "arm" -a -x "/usr/bin/qemu-static-arm-binfmt" ] ; then
+      echo   ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff:/usr/bin/qemu-static-arm-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "arm" -a -x "/usr/bin/qemu-static-armeb-binfmt" ] ; then
+      echo   ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-static-armeb-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "sparc" -a -x "/usr/bin/qemu-static-sparc-binfmt" ] ; then
+      echo   ':sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-static-sparc-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "ppc" -a -x "/usr/bin/qemu-static-ppc-binfmt" ] ; then
+      echo   ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-static-ppc-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "m68k" -a -x "/usr/bin/qemu-static-m68k-binfmt" ] ; then
+      echo   'Please check cpu value and header information for m68k!'
+      echo   ':m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-static-m68k-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "mips" -a -x "/usr/bin/qemu-static-mips-binfmt" ] ; then
+      # FIXME: We could use the other endianness on a MIPS host.
+      echo   ':mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-static-mips-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "mips" -a -x "/usr/bin/qemu-static-mipsel-binfmt" ] ; then
+      echo   ':mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-static-mipsel-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "mips" -a -x "/usr/bin/qemu-static-mipsn32-binfmt" ] ; then
+      echo   ':mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-static-mipsn32-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "mips" -a -x "/usr/bin/qemu-static-mipsn32el-binfmt" ] ; then
+      echo   ':mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-static-mipsn32el-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "mips" -a -x "/usr/bin/qemu-static-mips64-binfmt" ] ; then
+      echo   ':mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-static-mips64-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "mips" -a -x "/usr/bin/qemu-static-mips64el-binfmt" ] ; then
+      echo   ':mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-static-mips64el-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "sh" -a -x "/usr/bin/qemu-static-sh4-binfmt" ] ; then
+      echo    ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-static-sh4-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "sh" -a -x "/usr/bin/qemu-static-sh4eb-binfmt" ] ; then
+      echo    ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-static-sh4eb-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "s390x" -a -x "/usr/local/bin/qemu-static-s390x-binfmt" ] ; then
+      echo   ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-static-s390x-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   eend $?
+}
+
+stop() {
+   ebegin "Unregistering qemu-user binaries"
+   local arches
+
+   arches="${arches} i386 i486"
+   arches="${arches} alpha"
+   arches="${arches} arm armeb"
+   arches="${arches} sparc"
+   arches="${arches} ppc"
+   arches="${arches} m68k"
+   arches="${arches} mips mipsel mipsn32 mipsn32el mips64 mips64el"
+   arches="${arches} sh4 sh4eb"
+   arches="${arches} s390x"
+
+   for a in ${arches}; do
+      if [[ -f /proc/sys/fs/binfmt_misc/$a ]] ; then
+         echo '-1' > /proc/sys/fs/binfmt_misc/$a
+      fi
+   done
+
+   eend $?
+}
+
+# vim: ts=4 :
+
+
diff --git a/app-emulation/qemu/qemu-1.2.2.ebuild b/app-emulation/qemu/qemu-1.2.2.ebuild
index 38667c4d5046..16ff3fc50a08 100644
--- a/app-emulation/qemu/qemu-1.2.2.ebuild
+++ b/app-emulation/qemu/qemu-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2.ebuild,v 1.2 2013/01/12 04:32:37 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2.ebuild,v 1.3 2013/01/12 04:56:15 cardoe Exp $
 
 EAPI="4"
 
@@ -209,7 +209,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local conf_opts audio_opts user_targets
+	local conf_opts audio_opts
 
 	for target in ${IUSE_SOFTMMU_TARGETS} ; do
 		use "qemu_softmmu_targets_${target}" && \
@@ -336,6 +336,10 @@ src_install() {
 	# Avoid collision with app-emulation/libcacard
 	use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"
 
+	# Install binfmt handler init script for user targets
+	[[ -n ${user_targets} ]] && \
+		newinitd "${FILESDIR}/qemu-binfmt.initd" qemu-binfmt
+
 	# Remove SeaBIOS since we're using the SeaBIOS packaged one
 	rm "${ED}/usr/share/qemu/bios.bin"
 	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin