[elbe-devel] [PATCH 4/4] default-init.xml: use qemu-user-static from jessie-backports

[John Ogness]

The version of qemu-user-stack in jessie-backports is newer and
supports more platforms than the custom elbe version so use that
instead.

Remove qemu-elbe-user-static from the preseed.cfg since that
version should not be used by elbe. Also cleanup the package
name spacing to avoid extra spaces.

Signed-off-by: John Ogness <john.ogness at linutronix.de>
---
 elbepack/init/default-init.xml | 1 +
 elbepack/init/preseed.cfg.mako | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/elbepack/init/default-init.xml b/elbepack/init/default-init.xml
index 847057cd..f0af7e88 100644
--- a/elbepack/init/default-init.xml
+++ b/elbepack/init/default-init.xml
@@ -42,6 +42,7 @@
 		<pkg-list>
 			<pkg>openssh-server</pkg>
 			<pkg pin="jessie-backports">debootstrap</pkg>
+			<pkg pin="jessie-backports">qemu-user-static</pkg>
 		</pkg-list>
 		<preseed>
 			<conf owner="pbuilder" key="pbuilder/mirrorsite" type="string" value="http://ftp.de.debian.org/debian"/>
diff --git a/elbepack/init/preseed.cfg.mako b/elbepack/init/preseed.cfg.mako
index d62b6de6..7e9df7d2 100644
--- a/elbepack/init/preseed.cfg.mako
+++ b/elbepack/init/preseed.cfg.mako
@@ -136,9 +136,8 @@ apt-mirror-setup apt-setup/use_mirror boolean false
         return pkgname + '/' + pkgrel
 %>
 d-i finish-install/reboot_in_progress note
-d-i pkgsel/include string rng-tools btrfs-tools openssh-client \
-debathena-transform-lighttpd \
-elbe-soap python-elbe-buildenv qemu-elbe-user-static \
+d-i pkgsel/include string rng-tools btrfs-tools openssh-client\
+ debathena-transform-lighttpd elbe-soap python-elbe-buildenv\
 % for n in pkgs:
 % if n.tag == "pkg":
  ${pkg2preseed (n)}\
-- 
2.15.1