c/pve-qemu-qoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildsys: fix build-dependencies on headers for 'vma' and 'pbs_restore'

Browse Source 
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>
This commit is contained in:
Dominik Csapak 2021-11-18 08:05:38 +01:00 committed by Thomas Lamprecht
parent 7cf6b60926
commit c5e8e7c998
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch vendored
View File

@ -46,7 +46,7 @@ index b3e7ec0e92..b84f62f882 100644
qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'), qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
dependencies: [blockdev, qemuutil, gnutls], install: true) 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) + dependencies: [authz, block, crypto, io, qom], install: true)
+ +
subdir('storage-daemon') subdir('storage-daemon')

4
debian/patches/pve/0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch vendored
View File

@ -16,10 +16,10 @@ index c05c926cc3..69a0fe80ef 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -2749,6 +2749,10 @@ if have_tools @@ -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) 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, + dependencies: [authz, block, crypto, io, qom,
+ libproxmox_backup_qemu], install: true) + libproxmox_backup_qemu], install: true)
+ +