all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu 1/5] buildsys: adapt removal of dtb files for 10.1.0
Date: Wed, 24 Sep 2025 16:47:10 +0200	[thread overview]
Message-ID: <20250924144848.170589-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20250924144848.170589-1-f.ebner@proxmox.com>

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@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



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


  reply	other threads:[~2025-09-24 14:48 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-24 14:47 [pve-devel] [PATCH qemu 0/5] QEMU 10.1.0 Fiona Ebner
2025-09-24 14:47 ` Fiona Ebner [this message]
2025-09-24 14:47 ` [pve-devel] [PATCH qemu 2/5] bump baseline machine version to 6.0 for Proxmox VE 9 Fiona Ebner
2025-09-24 14:47 ` [pve-devel] [PATCH qemu 3/5] alloc-track/zeroinit: squash patches enabling using with blockdev into patches adding block drivers Fiona Ebner
2025-09-24 14:47 ` [pve-devel] [PATCH qemu 4/5] update submodule and patches to QEMU 10.1.0 Fiona Ebner
2025-09-24 14:47 ` [pve-devel] [PATCH qemu 5/5] stable fixes for " Fiona Ebner
2025-10-03 20:28 ` [pve-devel] applied: [PATCH qemu 0/5] " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250924144848.170589-2-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal