[pve-devel] [PATCH qemu 1/5] buildsys: adapt removal of dtb files for 10.1.0

[Fiona Ebner]

QEMU commit 12963e79ca ("pc-bios: Move device tree files in their own
subdir") moved all .dtb and .dts files into a separate 'dtb'
subdirectory. Adapt the Makefile to remove that directory.

Signed-off-by: Fiona Ebner <f.ebner at proxmox.com>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f31d3b8..eecdf17 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,6 @@ PC_BIOS_FW_PURGE_LIST_IN = \
 	s390-ccw.img \
 	s390-netboot.img \
 	u-boot.e500 \
-	.*[a-zA-Z0-9]\.dtb \
-	.*[a-zA-Z0-9]\.dts \
 	qemu_vga.ndrv \
 	slof.bin \
 	opensbi-riscv.*-generic-fw_dynamic.bin \
@@ -49,8 +47,10 @@ $(BUILDDIR): submodule
 	cp -a $(SRCDIR) $@.tmp
 	cp -a debian $@.tmp/debian
 	rm -rf $@.tmp/roms/edk2 # packaged separately
+	rm -rf $@.tmp/pc-bios/dtb
 	find $@.tmp/pc-bios -type f | grep $(BLOB_PURGE_FILTER) | xargs rm -f
 	sed -i $(BLOB_PURGE_SED_CMDS) $@.tmp/pc-bios/meson.build
+	sed -i "/subdir('dtb')/d" $@.tmp/pc-bios/meson.build
 	echo "git clone git://git.proxmox.com/git/pve-qemu.git\\ngit checkout $(GITVERSION)" > $@.tmp/debian/SOURCE
 	mv $@.tmp $@
 
-- 
2.47.3