update

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

11 files changed, 172 insertions, 131 deletions

diff --git a/debian/control b/debian/control
index 84dd591..1a9e40e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,3 +1,4 @@
+# autogenerated file, please edit debian/control-in
 Source: qemu
 Section: otherosfs
 Priority: optional
@@ -18,14 +19,12 @@ Build-Depends: debhelper (>= 9),
  acpica-tools,
 # --enable-linux-aio	linux-*
  libaio-dev [linux-any],
-# --audio-drv-list=pa,alsa,sdl,oss	linux-*
-# --audio-drv-list=pa,oss,sdl		kfreebsd-*
+# --audio-drv-list=pa,alsa,oss	linux-*
+# --audio-drv-list=pa		kfreebsd-*
  libasound2-dev [linux-any],
 # for virtfs
 # --enable-attr
  libattr1-dev,
-# --enable-bluez	linux-*
- libbluetooth-dev [linux-any],
 # --enable-brlapi
  libbrlapi-dev,
 # --enable-virtfs	linux-*
@@ -49,12 +48,12 @@ Build-Depends: debhelper (>= 9),
 # --enable-libiscsi
  libiscsi-dev (>> 1.9.0~),
 # --enable-curses
- libncursesw5-dev,
+ libncurses5-dev,
 # numa is not enabled: #682853
 ## --enable-numa	i386|amd64|ia64|mips*|powerpc*|ppc64|x32
 # libnuma-dev,
-## --enable-smartcard
-#  libcacard-dev,
+# --enable-smartcard
+# libcacard-dev,
  libpixman-1-dev,
 # audio-drv-list += pa
  libpulse-dev,
@@ -75,8 +74,8 @@ Build-Depends: debhelper (>= 9),
 # --enable-usb-redir	linux-*
  libusbredirparser-dev (>= 0.6~) [linux-any],
 # libssh2 is debian-only since ubuntu/libssh2 is in universe
-# --enable-libssh2
- libssh2-1-dev,
+# --enable-libssh
+ libssh-dev,
 # vde is debian-only since ubuntu/vde2 is in universe
 # --enable-vde
  libvdeplug-dev,
diff --git a/debian/control-in b/debian/control-in
index dc271aa..4faab25 100644
--- a/debian/control-in
+++ b/debian/control-in
@@ -20,14 +20,12 @@ Build-Depends: debhelper (>= 9),
  acpica-tools,
 # --enable-linux-aio	linux-*
  libaio-dev [linux-any],
-# --audio-drv-list=pa,alsa,sdl,oss	linux-*
-# --audio-drv-list=pa,oss,sdl		kfreebsd-*
+# --audio-drv-list=pa,alsa,oss	linux-*
+# --audio-drv-list=pa		kfreebsd-*
  libasound2-dev [linux-any],
 # for virtfs
 # --enable-attr
  libattr1-dev,
-# --enable-bluez	linux-*
- libbluetooth-dev [linux-any],
 # --enable-brlapi
  libbrlapi-dev,
 # --enable-virtfs	linux-*
@@ -57,8 +55,6 @@ Build-Depends: debhelper (>= 9),
 :debian:# libnuma-dev,
 :ubuntu:# --enable-numa i386|amd64|ia64|mips|mipsel|powerpc|powerpcspe|x32|ppc64|ppc64el|arm64|sparc|hppa
 :ubuntu: libnuma-dev [i386 amd64 ia64 mips mipsel powerpc powerpcspe x32 ppc64 ppc64el arm64 sparc hppa],
-# --enable-smartcard
- libcacard-dev,
  libpixman-1-dev,
 # audio-drv-list += pa
  libpulse-dev,
@@ -79,8 +75,8 @@ Build-Depends: debhelper (>= 9),
 # --enable-usb-redir	linux-*
  libusbredirparser-dev (>= 0.6~) [linux-any],
 # libssh2 is debian-only since ubuntu/libssh2 is in universe
-:debian:# --enable-libssh2
-:debian: libssh2-1-dev,
+:debian:# --enable-libssh
+:debian: libssh-dev,
 # vde is debian-only since ubuntu/vde2 is in universe
 :debian:# --enable-vde
 :debian: libvdeplug-dev,
diff --git a/debian/qemu-block-extra.install b/debian/qemu-block-extra.install
index dd7349e..ee45ae2 100644
--- a/debian/qemu-block-extra.install
+++ b/debian/qemu-block-extra.install
@@ -1 +1 @@
-usr/lib/*/qemu/*.so
+usr/lib/*/qemu/block-*.so
diff --git a/debian/qemu-guest-agent.install b/debian/qemu-guest-agent.install
index 6e9feb1..7049413 100644
--- a/debian/qemu-guest-agent.install
+++ b/debian/qemu-guest-agent.install
@@ -1,4 +1,6 @@
 debian/tmp/usr/bin/qemu-ga /usr/sbin
 debian/tmp/usr/share/man/man8/qemu-ga.8 /usr/share/man/man8
 debian/tmp/usr/share/man/man7/qemu-ga-ref.7 /usr/share/man/man7
+debian/tmp/usr/share/doc/qemu/qemu-ga-ref.* /usr/share/doc/qemu-guest-agent
 qga/qapi-schema.json /usr/share/doc/qemu-guest-agent
+scripts/qemu-guest-agent/fsfreeze-hook /etc/qemu/
diff --git a/debian/qemu-system-common.install b/debian/qemu-system-common.install
index e6b41f2..38d6df4 100644
--- a/debian/qemu-system-common.install
+++ b/debian/qemu-system-common.install
@@ -1,9 +1,10 @@
 debian/qemu-ifdown etc/
 debian/tmp/usr/share/man/man1/qemu-system.1
+debian/tmp/usr/share/qemu/trace-events-all
 debian/tmp/usr/share/man/man7/qemu-qmp-ref.7
-debian/tmp/usr/share/qemu/keymaps
-debian/tmp/usr/share/qemu/trace-events-all 
-pc-bios/qemu-icon.bmp usr/share/qemu
-pc-bios/qemu_logo_no_text.svg usr/share/qemu
-# qemu-doc.html is duplicated here and in qemu metapackage
-debian/tmp/usr/share/doc/qemu/* usr/share/doc/qemu-system-common
+debian/tmp/usr/share/man/man7/qemu-block-drivers.7
+debian/tmp/usr/share/man/man7/qemu-cpu-models.7
+debian/tmp/usr/share/doc/qemu/qemu-* usr/share/doc/qemu-system-common
+debian/tmp/usr/bin/ivshmem-server
+debian/tmp/usr/bin/ivshmem-client
+debian/tmp/usr/bin/qemu-pr-helper
diff --git a/debian/qemu-system-ppc.install b/debian/qemu-system-ppc.install
index add1235..5f80ac2 100644
--- a/debian/qemu-system-ppc.install
+++ b/debian/qemu-system-ppc.install
@@ -1 +1,2 @@
-qemu-build/pc-bios/bamboo.dtb usr/share/qemu/
+b/qemu/pc-bios/bamboo.dtb usr/share/qemu/
+b/qemu/pc-bios/canyonlands.dtb usr/share/qemu/
diff --git a/debian/qemu-utils.install b/debian/qemu-utils.install
index 9d54c9c..92da0c5 100644
--- a/debian/qemu-utils.install
+++ b/debian/qemu-utils.install
@@ -3,6 +3,4 @@ debian/tmp/usr/share/man/man1/qemu-img.1
 debian/tmp/usr/bin/qemu-nbd
 debian/tmp/usr/share/man/man8/qemu-nbd.8
 debian/tmp/usr/bin/qemu-io
-debian/tmp/usr/bin/ivshmem-server
-debian/tmp/usr/bin/ivshmem-client
 debian/qemu-make-debian-root usr/sbin/
diff --git a/debian/qemu.docs b/debian/qemu.docs
index ce1a54f..baba6cb 100644
--- a/debian/qemu.docs
+++ b/debian/qemu.docs
@@ -1 +1 @@
-debian/tmp/usr/share/doc/qemu/qemu-doc.html
+debian/tmp/usr/share/doc/qemu/index.html
diff --git a/debian/rules b/debian/rules
index 1f3413c..6085eee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,18 +29,20 @@ BUILD_PACKAGES = $(call dpkg_late_eval,BUILD_PACKAGES,dh_listpackages)
 enable_system = $(if $(filter qemu-system,${BUILD_PACKAGES}),enable,disable)
 enable_linux_user = $(if $(filter qemu-user,${BUILD_PACKAGES}),enable,disable)
 
-DATAPATH = /usr/share/qemu:/usr/share/seabios:/usr/lib/ipxe/qemu
+FIRMWAREPATH = /usr/share/qemu:/usr/share/seabios:/usr/lib/ipxe/qemu
+
+ALPHAEV67_CROSSPFX = alpha-linux-gnu-
+PPC64_CROSSPFX = powerpc64-linux-gnu-
 
 # we add another set of configure options from debian/control
 common_configure_opts = \
 	--with-pkgversion="Debian $(DEB_VERSION)" \
-	--extra-cflags="$(CFLAGS) $(CPPFLAGS) -DVENDOR_$(VENDOR)" \
-	--firmwarepath="${DATAPATH}" \
-	--extra-ldflags="$(LDFLAGS) -Wl,--as-needed" \
+	--extra-cflags="$(CFLAGS) $(CPPFLAGS)" --extra-ldflags="$(LDFLAGS) -Wl,--as-needed" \
 	--prefix=/usr \
 	--sysconfdir=/etc \
 	--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	--libexecdir=/usr/lib/qemu \
+	--firmwarepath=${FIRMWAREPATH} \
 	--localstatedir=/var \
 	--disable-blobs \
 	--disable-strip \
@@ -52,22 +54,31 @@ ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 common_configure_opts  += --cross-prefix=$(DEB_HOST_GNU_TYPE)-
 endif
 
+ifeq ($(DEB_TARGET_ARCH), hppa)
+# allow configure to run on unsupported arches to build qemu-utils and the like
+common_configure_opts += --enable-tcg-interpreter
+endif
+
 ifeq (${enable_system},enable)
 
 # list of system (softmmu) targets, from ./configure
 system_targets = \
- i386 x86_64 alpha aarch64 arm cris lm32 m68k microblaze microblazeel \
- mips mipsel mips64 mips64el moxie nios2 or1k ppc ppcemb ppc64 sh4 sh4eb \
- sparc sparc64 s390x tricore xtensa xtensaeb unicore32
+ i386 x86_64 alpha aarch64 arm cris lm32 hppa m68k microblaze microblazeel \
+ mips mipsel mips64 mips64el moxie nios2 or1k ppc ppc64 riscv32 riscv64 \
+ sh4 sh4eb sparc sparc64 s390x tricore xtensa xtensaeb unicore32
 
 # qemu-system subpackages, from d/control
 sys_systems = arm mips ppc sparc x86
+ifeq ($(VENDOR),UBUNTU)
+sys_systems = ${sys_systems} s390x
+endif
 systems = ${sys_systems} misc
 sysarch_arm   = $(filter aarch64 arm,${system_targets})
 sysarch_mips  = $(filter mips mipsel mips64 mips64el,${system_targets})
-sysarch_ppc   = $(filter ppc ppc64 ppcemb,${system_targets})
+sysarch_ppc   = $(filter ppc ppc64,${system_targets})
 sysarch_sparc = $(filter sparc sparc64,${system_targets})
 sysarch_x86   = $(filter i386 x86_64,${system_targets})
+sysarch_s390x = $(filter s390x,${system_targets})
 sysarch_misc  = $(filter-out $(foreach s,${sys_systems},${sysarch_$s}),${system_targets})
 
 else
@@ -80,20 +91,20 @@ ifeq (${enable_linux_user},enable)
 
 # list of linux-user targets, from ./configure
 user_targets = \
- i386 x86_64 alpha aarch64 arm armeb cris hppa m68k microblaze microblazeel \
+ i386 x86_64 alpha aarch64 aarch64_be arm armeb cris hppa m68k microblaze microblazeel \
  mips mipsel mips64 mips64el mipsn32 mipsn32el nios2 or1k \
- ppc ppc64 ppc64abi32 ppc64le sh4 sh4eb sparc sparc64 sparc32plus \
- s390x tilegx
+ ppc ppc64 ppc64abi32 ppc64le riscv32 riscv64 sh4 sh4eb sparc sparc64 sparc32plus \
+ s390x tilegx xtensa xtensaeb
 
 endif	# enable_linux_user
 
-configure-stamp: configure
+b/configure-stamp: configure
 	dh_testdir
 
 	# system build
-	rm -rf qemu-build; mkdir qemu-build
-	cd qemu-build && \
-	    ../configure ${common_configure_opts} --disable-user \
+	rm -rf b/qemu; mkdir -p b/qemu
+	cd b/qemu && \
+	    ../../configure ${common_configure_opts} --disable-user \
 		--${enable_system}-system \
 		--${enable_linux_user}-linux-user \
 		--enable-modules \
@@ -102,51 +113,44 @@ configure-stamp: configure
 		$(QEMU_CONFIGURE_OPTIONS) || \
 	 { echo ===== CONFIGURE FAILED ===; tail -n 50 config.log; exit 1; }
 
+# switch some simple UI and simple audio modules to be built-ins,
+# but keep more complex to be modules to move to a separate package
+	sed -i -r 's/(CONFIG_(CURSES|-GTK|-SDL|AUDIO_(-PA|OSS|ALSA|-SDL)))=m/\1=y/' \
+		b/qemu/config-host.mak
+
 ifeq ($(enable_linux_user),enable)
 # do not use debian/configure-opts here, all optional stuff will be enabled
 # automatically, dependencies are already verified in the main build
-	rm -rf user-static-build; mkdir user-static-build
-	cd user-static-build && \
-	    ../configure ${common_configure_opts} \
+	rm -rf b/user-static; mkdir b/user-static
+	cd b/user-static && \
+	    ../../configure ${common_configure_opts} \
 		--static --disable-system \
 		--target-list="$(addsuffix -linux-user,${user_targets})"
 endif
 	touch $@
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: configure-stamp
+build-arch: b/build-stamp
+b/build-stamp: b/configure-stamp
 	dh_testdir
 
 	# system and utils build
-	$(MAKE) -C qemu-build V=${V}
+	$(MAKE) -C b/qemu V=${V}
 ifeq (${enable_system},enable)
-	dtc -o qemu-build/pc-bios/bamboo.dtb pc-bios/bamboo.dts
+	rm -f b/qemu/pc-bios/bamboo.dtb b/qemu/pc-bios/canyonlands.dtb
+	dtc -o b/qemu/pc-bios/bamboo.dtb pc-bios/bamboo.dts
+	dtc -o b/qemu/pc-bios/canyonlands.dtb pc-bios/canyonlands.dts
 endif
 
 ifeq ($(enable_linux_user),enable)
 	# user-static build
 	# we use this invocation to build just the binaries
-	$(MAKE) -C user-static-build V=${V} $(foreach t,${user_targets},subdir-${t}-linux-user)
+	$(MAKE) -C b/user-static V=${V} $(patsubst %,%-linux-user/all,${user_targets})
+	sed -e 's/qemu\\-user\\-static/qemu\\-user/g' \
+	    -e 's/ (static version)//' \
+	    debian/qemu-user-static.1 > debian/qemu-user.1
 endif
 	touch $@
 
-clean:	debian/control
-	dh_testdir
-	rm -rf qemu-build user-static-build
-	rm -f configure-stamp build-stamp
-	find scripts/ -name '*.pyc' -delete || :
-	dh_clean
-
-# define ${ai} variable to be one of -i (indep), -a (arch) or nothing (both)
-ai :=
-binary-indep: ai := -i
-binary-indep: install
-binary-arch: ai := -a
-binary-arch: install
-binary: install
-
 define inst-system
 	mkdir -p debian/qemu-system-$1/usr/share/man/man1 debian/qemu-system-$1/usr/bin
 	for t in ${sysarch_$1}; do \
@@ -164,14 +168,15 @@ ${sysarch_$1}) \
 
 endef
 
-install: build-stamp
+binary-arch:
 	dh_testdir
 	dh_testroot
-	dh_prep
+	dh_prep -a
 	dh_installdirs -a
 
 	# system and utils install
-	$(MAKE) -C qemu-build DESTDIR=$(CURDIR)/debian/tmp install
+	$(MAKE) -C b/qemu DESTDIR=$(CURDIR)/debian/tmp install \
+	  KEYMAPS= ICON_SIZES=
 
 ifeq (${enable_system},enable)
 
@@ -179,27 +184,6 @@ ifeq (${enable_system},enable)
 	mv debian/tmp/usr/share/man/man1/qemu.1 debian/tmp/usr/share/man/man1/qemu-system.1
 	$(foreach s,${systems},$(call inst-system,$s))
 
-ifneq ($(filter $(DEB_HOST_ARCH),amd64 i386),)
-# We used to load kvm module on x86 using an initscript,
-# but modern kernels do that automatically.  Remove the initscript.
-# Remove this fragment for stretch+1.
-	for x in preinst postinst postrm; do \
-	  echo 'dpkg-maintscript-helper rm_conffile /etc/init.d/qemu-system-x86 1:2.2+dfsg-3~ -- "$$@"' \
-	    >> debian/qemu-system-x86.$$x.debhelper ; \
-	done
-# there's no need to restore the links b/c kernel autoloads our modules
-	echo 'if [ configure = "$$1" ] && dpkg --compare-versions "$$2" le-nl 1:2.2+dfsg-3~; then update-rc.d qemu-system-x86 remove >/dev/null; fi' \
-	  >> debian/qemu-system-x86.postinst.debhelper
-endif
-
-# remove now-unused target-x86_64.conf (and /etc/qemu dir too, see #797608)
-	for x in preinst postinst postrm; do \
-	  echo 'dpkg-maintscript-helper rm_conffile /etc/qemu/target-x86_64.conf 1:2.4+dfsg-1~ -- "$$@"' \
-            >> debian/qemu-system-x86.$$x.debhelper ; \
-	  echo '[ -d /etc/qemu ] && rmdir /etc/qemu 2>/dev/null || :' \
-	    >> debian/qemu-system-x86.$$x.debhelper; \
-	done
-
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 
 # /usr/bin/kvm compat script.  This needs some more work for other arches
@@ -233,57 +217,49 @@ endif # linux
 endif # enable_system
 
 ifeq ($(enable_linux_user),enable)
-	# qemu-user
-	mkdir -p debian/qemu-user/usr/bin debian/qemu-user/usr/share/man/man1
-	for t in ${user_targets}; do \
-	    mv debian/tmp/usr/bin/qemu-$$t \
-		debian/qemu-user/usr/bin ; \
-	    ln -s qemu-user.1 \
-		debian/qemu-user/usr/share/man/man1/qemu-$$t.1 ; \
-	done
+	dh_movefiles -p qemu-user $(patsubst %,usr/bin/qemu-%,${user_targets})
+	dh_link -p qemu-user $(patsubst %,usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-%.1,${user_targets})
 
 	# qemu-user-static
 	mkdir -p debian/qemu-user-static/usr/bin debian/qemu-user-static/usr/share/man/man1
 	for t in ${user_targets}; do \
-	    cp -p user-static-build/$$t-linux-user/qemu-$$t \
-		debian/qemu-user-static/usr/bin/qemu-$$t-static ; \
-	    ln -s qemu-user-static.1 \
-		    debian/qemu-user-static/usr/share/man/man1/qemu-$$t-static.1 ; \
+	   cp -p b/user-static/$$t-linux-user/qemu-$$t \
+	       debian/qemu-user-static/usr/bin/qemu-$$t-static ; \
+	   ln -s qemu-user-static.1 \
+	       debian/qemu-user-static/usr/share/man/man1/qemu-$$t-static.1 ; \
 	done
 
 	# binfmt support
 	for x in postinst prerm; do \
-	    sed -e s/@SUFFIX@/-static/ -e s/@PACKAGE@/qemu-user-static/ \
+	    sed -e s/@SUFFIX@/-static/ -e s/@PACKAGE@/qemu-user-static/ -e "s/@FIX_BINARY@/--fix-binary yes/" \
 		debian/binfmt-update-in >> debian/qemu-user-static.$$x.debhelper ; \
-	    sed -e s/@SUFFIX@// -e s/@PACKAGE@/qemu-user-binfmt/ \
+	    sed -e s/@SUFFIX@// -e s/@PACKAGE@/qemu-user-binfmt/ -e s/@FIX_BINARY@// \
 		debian/binfmt-update-in >> debian/qemu-user-binfmt.$$x.debhelper ; \
 	done
 
 endif	# enable_linux_user
 
-# install whole thing so --list-missing works right
-	dh_install --list-missing
-# install the rest for arch/indep as needed
-	dh_installdocs ${ai} -Nqemu-user-binfmt
-	dh_installchangelogs ${ai} -Nqemu-user-binfmt
-	dh_installdocs ${ai} -pqemu-user-binfmt --link-doc=qemu-user
-	dh_installman ${ai}
-	dh_installudev ${ai}
-ifneq (${ai},-i)	# do not run this for binary-indep
+	dh_install -a
+	dh_missing --list-missing
+	dh_installdocs -a -Nqemu-user-binfmt
+	dh_installchangelogs -a -Nqemu-user-binfmt
+	dh_installdocs -a -pqemu-user-binfmt --link-doc=qemu-user
+	dh_installman -a
+	dh_installudev -a
 ifeq (${enable_system},enable)
 # qemu-ifup is arch-specific
 	install -D debian/qemu-ifup.$(DEB_HOST_ARCH_OS) \
 		debian/qemu-system-common/etc/qemu-ifup
 endif
-	dh_installinit -pqemu-guest-agent
-endif
-	dh_link ${ai}
-	dh_strip ${ai}
-	dh_compress ${ai}
-	dh_fixperms ${ai}
-	dh_makeshlibs ${ai}
-	dh_shlibdeps ${ai}
-	dh_installdeb ${ai}
+	dh_installinit -a -pqemu-guest-agent
+	dh_installsystemd -a -pqemu-guest-agent --no-start --no-enable
+	dh_link -a
+	dh_lintian -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_shlibdeps -a
+	dh_installdeb -a
 ifeq ($(enable_linux_user),enable)
 # after shlibdeps finished, grab ${shlibs:Depends} from -user package
 # and transform it into Built-Using field for -user-static.
@@ -296,20 +272,88 @@ ifeq ($(enable_linux_user),enable)
 	  echo "built-using=$$srcs" >> debian/qemu-user-static.substvars ; \
 	fi
 endif
-	dh_gencontrol ${ai}
-	dh_md5sums ${ai}
-	dh_builddeb ${ai}
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 ifneq (,$(wildcard debian/control-in))
 # only include rules for debian/control if debian/control-in is present
 debian/control: debian/control-in debian/rules
+	echo '# autogenerated file, please edit debian/control-in' > $@.tmp
 	sed -e 's/^:$(shell echo ${VENDOR} | tr '[A-Z]' '[a-z]')://' \
-		-e '/^:[a-z]*:/D' $< > $@.tmp
+		-e '/^:[a-z]*:/D' $< >> $@.tmp
 	mv -f $@.tmp $@
+	chmod -w $@
 endif
 
+
+build-indep:
+
+	mkdir -p b/fw
+
+# x86 optionrom
+	${MAKE} -f ${CURDIR}/debian/optionrom.mak -C ${CURDIR}/b/fw SRC_PATH=${CURDIR}
+
+# qboot, aka bios-microvm
+	cp -al roms/qboot b/
+	${MAKE} -C ${CURDIR}/b/qboot
+	cp b/qboot/bios.bin b/fw/bios-microvm.bin
+	chmod 0644 b/fw/bios-microvm.bin
+
+# sgabios. The Makefile is too complex and forces current date to be embedded to binary
+	cc -c -o b/fw/sgabios.o roms/sgabios/sgabios.S -Wall -Os -m32 -nostdlib \
+	  -DBUILD_DATE="\"$$(LC_ALL=C date -u -r roms/sgabios/sgabios.S)\"" \
+	  -DBUILD_SHORT_DATE="\"$$(date -u +%D -r roms/sgabios/sgabios.S)\"" \
+	  -DBUILD_HOST=\"debian\" -DBUILD_USER=\"build\"
+	ld -T roms/sgabios/rom16.ld -nostdlib b/fw/sgabios.o -o b/fw/sgabios.elf
+	objcopy -O binary b/fw/sgabios.elf b/fw/sgabios.bin
+	cc -Wall -O2 -o b/fw/csum8 roms/sgabios/csum8.c
+	b/fw/csum8 b/fw/sgabios.bin
+	chmod 0644 b/fw/sgabios.bin
+
+# alpha firmware in roms/palcode-clipper
+	cp -al roms/qemu-palcode b/
+	${MAKE} -C ${CURDIR}/b/qemu-palcode CROSS=${ALPHAEV67_CROSSPFX}
+	${ALPHAEV67_CROSSPFX}strip b/qemu-palcode/palcode-clipper
+
+# s390x firmware in pc-bios/s390-ccw
+	${MAKE} -f debian/s390fw.mak OUT=b/fw/
+
+# powernv firmware in roms/skiboot
+	cp -al roms/skiboot b/
+	${MAKE} -C ${CURDIR}/b/skiboot CROSS=${PPC64_CROSSPFX} V=1
+
+binary-indep:
+	dh_testdir
+	dh_testroot
+	dh_prep -i -Xdebian/tmp
+
+	dh_install -i
+	rm -f debian/qemu-system-data/usr/share/qemu/keymaps/Makefile
+	dh_installdocs -i
+	dh_installchangelogs -i
+	dh_lintian -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+build: build-arch build-indep
+binary: binary-arch binary-indep
+
+clean:	debian/control
+	dh_testdir
+	rm -rf b
+	find scripts/ -name '*.pyc' -delete || :
+	rm -f debian/qemu-user.1
+	dh_clean
+
+.PHONY: build clean binary-arch binary-indep binary build-arch build-indep build
+
 get-orig-source:
 	./debian/get-orig-source.sh ${DEB_VERSION}
 
-.PHONY: build clean binary-indep binary-arch binary install get-orig-source
+.PHONY: get-orig-source
 
diff --git a/qemu-pkg.sh b/qemu-pkg.sh
index 9fd4aa0..89fa022 100755
--- a/qemu-pkg.sh
+++ b/qemu-pkg.sh
@@ -21,7 +21,7 @@ dsc=`cat qemu.dsc`
 
 cat > qemu-params <<EOF
 source=$BUILD_URL/artifact/${dsc}
-repo=linaro-staging-stretch
+repo=Qemu:latest
 appendversion=false
 EOF
 
diff --git a/qemu-template b/qemu-template
index 80a4c6d..4fc3a4c 100644
--- a/qemu-template
+++ b/qemu-template
@@ -4,4 +4,4 @@ upstream_source=qemu
 upstream_repo=git://git.qemu.org/qemu.git
 packaging_dir=qemu-ci/debian
 packaging_repo=git://git.linaro.org/ci/qemu.git
-distribution=jessie
+distribution=buster