From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu] fix dependencies on headers for 'vma' and 'pbs_restore'
Date: Thu, 18 Nov 2021 08:05:38 +0100 [thread overview]
Message-ID: <20211118070538.357481-1-d.csapak@proxmox.com> (raw)
both of them depend on generated header files, so we have to specify
them as sources. Otherwise, it happens (at least on some machines) that
they will be compiled before the headers are generated, aborting the
build.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
thanks @wolfgang for helping me understand meson a bit better ;)
.../pve/0025-PVE-Backup-add-vma-backup-format-code.patch | 2 +-
...PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch b/debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch
index 0e939bf..31cd97e 100644
--- a/debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch
+++ b/debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch
@@ -46,7 +46,7 @@ index b3e7ec0e92..b84f62f882 100644
qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
dependencies: [blockdev, qemuutil, gnutls], install: true)
-+ vma = executable('vma', files('vma.c', 'vma-reader.c'),
++ vma = executable('vma', files('vma.c', 'vma-reader.c') + genh,
+ dependencies: [authz, block, crypto, io, qom], install: true)
+
subdir('storage-daemon')
diff --git a/debian/patches/pve/0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch b/debian/patches/pve/0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch
index 8178a13..c5ae406 100644
--- a/debian/patches/pve/0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch
+++ b/debian/patches/pve/0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch
@@ -16,10 +16,10 @@ index c05c926cc3..69a0fe80ef 100644
--- a/meson.build
+++ b/meson.build
@@ -2749,6 +2749,10 @@ if have_tools
- vma = executable('vma', files('vma.c', 'vma-reader.c'),
+ vma = executable('vma', files('vma.c', 'vma-reader.c') + genh,
dependencies: [authz, block, crypto, io, qom], install: true)
-+ pbs_restore = executable('pbs-restore', files('pbs-restore.c'),
++ pbs_restore = executable('pbs-restore', files('pbs-restore.c') + genh,
+ dependencies: [authz, block, crypto, io, qom,
+ libproxmox_backup_qemu], install: true)
+
--
2.30.2
next reply other threads:[~2021-11-18 7:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-18 7:05 Dominik Csapak [this message]
2021-11-18 7:21 ` [pve-devel] applied: " 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=20211118070538.357481-1-d.csapak@proxmox.com \
--to=d.csapak@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox