rpi-firmware: ignore user from tarball

[people/pmueller/ipfire-2.x.git] / lfs / qemu

diff --git a/lfs/qemu b/lfs/qemu
index 2ab1bf8c015fc89f1435e8bda5b76bc6195a5b6e..689dba96db84c46908f6475efb6194e8c18b3937 100644 (file)
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -33,10 +33,20 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = qemu
-PAK_VER    = 29
+PAK_VER    = 30
 
 DEPS       = libusbredir spice libseccomp
 
+TARGETS    = \
+       i386-linux-user \
+       x86_64-linux-user \
+       arm-linux-user \
+       riscv64-linux-user \
+       i386-softmmu \
+       x86_64-softmmu \
+       arm-softmmu \
+       riscv64-softmmu
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -78,13 +88,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-5.2.0-no-pie.patch
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/etc \
                --localstatedir=/var \
                --enable-kvm \
                --disable-attr \
-               --target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \
+               --target-list="$(TARGETS)" \
                --extra-cflags="$(CFLAGS)" \
                --enable-spice \
                --enable-usb-redir \