switch to new binfmt registering

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>

25 files changed, 8 insertions, 190 deletions

diff --git a/debian/binfmts/qemu-aarch64 b/debian/binfmts/qemu-aarch64
deleted file mode 100644
index 2235b39..0000000
--- a/debian/binfmts/qemu-aarch64
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-aarch64-static
-credentials yes
-offset 0
-magic \x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7
-mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff
diff --git a/debian/binfmts/qemu-alpha b/debian/binfmts/qemu-alpha
deleted file mode 100644
index d029c0c..0000000
--- a/debian/binfmts/qemu-alpha
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-alpha-static
-credentials yes
-offset 0
-magic \x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90
-mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff
diff --git a/debian/binfmts/qemu-arm b/debian/binfmts/qemu-arm
deleted file mode 100644
index 59de218..0000000
--- a/debian/binfmts/qemu-arm
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-arm-static
-credentials yes
-offset 0
-magic \x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00
-mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff
diff --git a/debian/binfmts/qemu-armeb b/debian/binfmts/qemu-armeb
deleted file mode 100644
index 5b9db31..0000000
--- a/debian/binfmts/qemu-armeb
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-armeb-static
-credentials yes
-offset 0
-magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28
-mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff
diff --git a/debian/binfmts/qemu-cris b/debian/binfmts/qemu-cris
deleted file mode 100644
index 99af4de..0000000
--- a/debian/binfmts/qemu-cris
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-cris-static
-credentials yes
-offset 0
-magic \x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00
-mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff
diff --git a/debian/binfmts/qemu-i386 b/debian/binfmts/qemu-i386
deleted file mode 100644
index f49a292..0000000
--- a/debian/binfmts/qemu-i386
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-i386-static
-credentials yes
-offset 0
-magic \x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00
-mask \xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff
diff --git a/debian/binfmts/qemu-m68k b/debian/binfmts/qemu-m68k
deleted file mode 100644
index a2e6ffc..0000000
--- a/debian/binfmts/qemu-m68k
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-m68k-static
-credentials yes
-offset 0
-magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x04
-mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff
diff --git a/debian/binfmts/qemu-microblaze b/debian/binfmts/qemu-microblaze
deleted file mode 100644
index 03ef870..0000000
--- a/debian/binfmts/qemu-microblaze
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-microblaze-static
-credentials yes
-offset 0
-magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab
-mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff
diff --git a/debian/binfmts/qemu-mips b/debian/binfmts/qemu-mips
deleted file mode 100644
index f2e8bc9..0000000
--- a/debian/binfmts/qemu-mips
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-mips-static
-credentials yes
-offset 0
-magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08
-mask \xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff
diff --git a/debian/binfmts/qemu-mipsel b/debian/binfmts/qemu-mipsel
deleted file mode 100644
index 8ab9155..0000000
--- a/debian/binfmts/qemu-mipsel
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-mipsel-static
-credentials yes
-offset 0
-magic \x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00
-mask \xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff
diff --git a/debian/binfmts/qemu-ppc b/debian/binfmts/qemu-ppc
deleted file mode 100644
index 339747e..0000000
--- a/debian/binfmts/qemu-ppc
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-ppc-static
-credentials yes
-offset 0
-magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14
-mask \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff
diff --git a/debian/binfmts/qemu-ppc64 b/debian/binfmts/qemu-ppc64
deleted file mode 100644
index cd94216..0000000
--- a/debian/binfmts/qemu-ppc64
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-ppc64-static
-credentials yes
-offset 0
-magic \x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15
-mask \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff
diff --git a/debian/binfmts/qemu-ppc64abi32 b/debian/binfmts/qemu-ppc64abi32
deleted file mode 100644
index 4861408..0000000
--- a/debian/binfmts/qemu-ppc64abi32
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-ppc64abi32-static
-credentials yes
-offset 0
-magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15
-mask \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff
diff --git a/debian/binfmts/qemu-s390x b/debian/binfmts/qemu-s390x
deleted file mode 100644
index 0c2eb44..0000000
--- a/debian/binfmts/qemu-s390x
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-s390x-static
-credentials yes
-offset 0
-magic \x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16
-mask \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff
diff --git a/debian/binfmts/qemu-sh4 b/debian/binfmts/qemu-sh4
deleted file mode 100644
index e97de2a..0000000
--- a/debian/binfmts/qemu-sh4
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-sh4-static
-credentials yes
-offset 0
-magic \x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00
-mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff
diff --git a/debian/binfmts/qemu-sh4eb b/debian/binfmts/qemu-sh4eb
deleted file mode 100644
index 3d2e446..0000000
--- a/debian/binfmts/qemu-sh4eb
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-sh4eb-static
-credentials yes
-offset 0
-magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a
-mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff
diff --git a/debian/binfmts/qemu-sparc b/debian/binfmts/qemu-sparc
deleted file mode 100644
index c412f1e..0000000
--- a/debian/binfmts/qemu-sparc
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-sparc-static
-credentials yes
-offset 0
-magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02
-mask \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff
diff --git a/debian/binfmts/qemu-sparc32plus b/debian/binfmts/qemu-sparc32plus
deleted file mode 100644
index 8efa3c6..0000000
--- a/debian/binfmts/qemu-sparc32plus
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-sparc32plus-static
-credentials yes
-offset 0
-magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12
-mask \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff
diff --git a/debian/binfmts/qemu-sparc64 b/debian/binfmts/qemu-sparc64
deleted file mode 100644
index a9f6612..0000000
--- a/debian/binfmts/qemu-sparc64
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-sparc64-static
-credentials yes
-offset 0
-magic \x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b
-mask \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff
diff --git a/debian/binfmts/qemu-x86_64 b/debian/binfmts/qemu-x86_64
deleted file mode 100644
index 88c056c..0000000
--- a/debian/binfmts/qemu-x86_64
+++ /dev/null
@@ -1,6 +0,0 @@
-package qemu-user-static
-interpreter /usr/bin/qemu-x86_64-static
-credentials yes
-offset 0
-magic \x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00
-mask \xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff
diff --git a/debian/changelog b/debian/changelog
index d399c18..89c2381 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qemu (1:2.5+dfsg-4~bpo8+1) jessie-backports; urgency=medium
+qemu (1:2.5.10+dfsg-1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
   * fix misspelling in previous changelog entry
diff --git a/debian/control b/debian/control
index 2cf9f08..c91691e 100644
--- a/debian/control
+++ b/debian/control
@@ -79,7 +79,7 @@ Description: QEMU user mode emulation binaries
 
 Package: qemu-user-static
 Architecture: amd64 arm armel armhf arm64 hppa i386 ia64 mips mipsel powerpc ppc64 sparc sparc64
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}
 Recommends: binfmt-support, debootstrap
 Breaks: qemu-kvm-extras-static (<< 0.13.50-2011.02-0~rc1-0ubuntu1)
 Replaces: qemu-kvm-extras-static (<< 0.13.50-2011.02-0~rc1-0ubuntu1)
diff --git a/debian/qemu-user-static.postinst.in b/debian/qemu-user-static.postinst.in
deleted file mode 100644
index 86fb450..0000000
--- a/debian/qemu-user-static.postinst.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-BINFMT_TARGETS= # list of architectures is autogenerated from debian/rules
-
-if [ configure = "$1" ] && [ -x /usr/sbin/update-binfmts ]; then
-	for target in $BINFMT_TARGETS ; do
-		update-binfmts --import qemu-$target
-	done
-fi
-
-#DEBHELPER#
diff --git a/debian/qemu-user-static.prerm.in b/debian/qemu-user-static.prerm.in
deleted file mode 100644
index 7e4863b..0000000
--- a/debian/qemu-user-static.prerm.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-BINFMT_TARGETS= # list of architectures is autogenerated from debian/rules
-
-if [ "$1" = remove ] && [ -x /usr/sbin/update-binfmts ]; then
-	for target in $BINFMT_TARGETS ; do
-		update-binfmts --package qemu-user-static --remove qemu-$target /usr/bin/qemu-$target-static
-	done
-fi
-
-#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index cab8083..9d001b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,42 +45,6 @@ ifeq ($(DEB_HOST_ARCH_CPU),arm64)
        conf_arch += --enable-kvm
 endif
 
-
-# binfmt support
-ALL_BINFMT_TARGETS=  \
- i386 x86_64 alpha aarch64 arm armeb cris m68k microblaze microblazeel \
- mips mipsel mips64 mips64el mipsn32 mipsn32el or32 \
- ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc64 sparc32plus \
- unicore32 s390x
-
-ifeq ($(DEB_HOST_ARCH),amd64)
-BINFMT_TARGETS=$(filter-out i386 x86_64, $(ALL_BINFMT_TARGETS))
-endif
-ifneq (,$(findstring $(DEB_HOST_ARCH), arm armel armhf))
-BINFMT_TARGETS=$(filter-out arm, $(ALL_BINFMT_TARGETS))
-endif
-ifeq ($(DEB_HOST_ARCH),i386)
-BINFMT_TARGETS=$(filter-out i386, $(ALL_BINFMT_TARGETS))
-endif
-ifeq ($(DEB_HOST_ARCH),powerpc)
-BINFMT_TARGETS=$(filter-out ppc, $(ALL_BINFMT_TARGETS))
-endif
-ifeq ($(DEB_HOST_ARCH),ppc64)
-BINFMT_TARGETS=$(filter-out ppc ppc64 ppc64abi32 , $(ALL_BINFMT_TARGETS))
-endif
-ifeq ($(DEB_HOST_ARCH),sparc)
-BINFMT_TARGETS=$(filter-out sparc sparc32plus sparc64, $(ALL_BINFMT_TARGETS))
-endif
-ifeq ($(DEB_HOST_ARCH),sparc64)
-BINFMT_TARGETS=$(filter-out sparc sparc32plus sparc64, $(ALL_BINFMT_TARGETS))
-endif
-ifeq ($(DEB_HOST_ARCH),arm64)
-BINFMT_TARGETS=$(filter-out arm aarch64, $(ALL_BINFMT_TARGETS))
-endif
-ifeq ($(BINFMT_TARGETS),)
-BINFMT_TARGETS=$(ALL_BINFMT_TARGETS)
-endif
-
 # namespace to use for data files
 NAMESPACE := linaro
 
@@ -143,7 +107,7 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
 		    --disable-docs \
 		    --disable-system \
 		    --with-system-pixman --disable-guest-agent \
-			--target-list="arm-linux-user" \
+		    --target-list="arm-linux-user" \
 		    $(conf_arch)
 
 	# static user build
@@ -203,20 +167,16 @@ endif
 override_dh_auto_install:
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	dh_auto_install -B user-static-build --destdir=$(CURDIR)/debian/tmp
-	for script in prerm postinst; do \
-		sed -e 's/^BINFMT_TARGETS=.*/BINFMT_TARGETS=\"$(BINFMT_TARGETS)\"/g' \
-                $(CURDIR)/debian/qemu-user-static.$$script.in \
-		> $(CURDIR)/debian/qemu-user-static.$$script; \
+	# binfmt support
+	for x in postinst prerm; do \
+		sed -e s/@SUFFIX@/-static/ -e s/@PACKAGE@/qemu-user-static/ \
+		  debian/binfmt-update-in >> debian/qemu-user-static.$$x.debhelper ; \
 	done
+
 	for target in $(CURDIR)/debian/tmp/usr/bin/qemu-*; do \
 		install -m 755 $$target $(CURDIR)/debian/tmp/usr/bin/$$(basename $$target)-static; \
 	done
 	dh_auto_install -B user-build --destdir=$(CURDIR)/debian/tmp
-	for target in $(BINFMT_TARGETS) ; do \
-		install -m 644 $(CURDIR)/debian/binfmts/qemu-$$target \
-			$(CURDIR)/debian/qemu-user-static/usr/share/binfmts ; \
-	done
-	f=debian/qemu-user-static.sysctl; [ -f debian/qemu-user-static.sysctl.$(DEB_BUILD_ARCH) ] && f=debian/qemu-user-static.sysctl.$(DEB_BUILD_ARCH); cp $$f debian/qemu-user-static/etc/sysctl.d/30-qemu-user-static.conf
 ifeq ($(DEB_HOST_ARCH),disabled)
 	dh_auto_install -B spice-build --destdir=$(CURDIR)/debian/spice-tmp
 	for target in qemu-i386 qemu-x86_64 qemu-system-x86_64; do \