From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
To: svt-core@virtuozzo.com
Cc: ilia.solovykh@virtuozzo.com, artem.vasiliev@virtuozzo.com,
den@openvz.org, andrey.drobyshev@virtuozzo.com
Subject: [PATCH qemu.vzspecs hci-8.1 2/2] coverage: pack sources of the static build too
Date: Fri, 13 Nov 2026 18:37:20 +0200 [thread overview]
Message-ID: <20261113163720.893889-2-andrey.drobyshev@virtuozzo.com> (raw)
In-Reply-To: <20261113163720.893889-1-andrey.drobyshev@virtuozzo.com>
The qemu-ga we ship is built in qemu_kvm_static, so its coverage data
comes from there. But we only packed the sources of qemu_kvm_build.
The files which only the static build compiles were missing from the
archive, e.g. crypto/hash-glib.c and qga/libdl-wrapper.c.
Let's pack the sources of both builds.
Fixes: 78390c804b30 ("coverage: pack only compiled sources in a reproducible way #VSTOR-151318")
Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
---
qemu-kvm.spec | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/qemu-kvm.spec b/qemu-kvm.spec
index 55287fc3..1f17cc5f 100644
--- a/qemu-kvm.spec
+++ b/qemu-kvm.spec
@@ -2240,11 +2240,14 @@ install -m 0644 %{SOURCE2} ./sonar-project.properties
# Pack only the source files the compiler actually used, generated ones
# included. Ninja knows them for each build. We make every path relative
-# to the source tree and skip files outside it, like system headers.
+# to the source tree and skip files outside it, like system headers. The
+# static build is included too, since the qemu-ga we ship comes from it.
set -o pipefail
-ninja -C %{qemu_kvm_build} -t deps |
- sed -En 's/^[[:space:]]+//p' |
- (cd %{qemu_kvm_build} && xargs realpath -ms --relative-to=..) |
+for b in %{qemu_kvm_build} %{?with_qga_static:%{qemu_kvm_static}}; do
+ ninja -C "$b" -t deps |
+ sed -En 's/^[[:space:]]+//p' |
+ (cd "$b" && xargs realpath -ms --relative-to=..)
+done |
grep -v '^\.\./' |
grep -E '\.([chS]|inc)$' |
LC_ALL=C sort -u |
--
2.47.1
prev parent reply other threads:[~2026-11-13 16:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-13 16:37 [PATCH qemu.vzspecs hci-8.1 1/2] coverage: keep headers with absolute paths in sources archive #VSTOR-154473 Andrey Drobyshev
2026-11-13 16:37 ` Andrey Drobyshev [this message]
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=20261113163720.893889-2-andrey.drobyshev@virtuozzo.com \
--to=andrey.drobyshev@virtuozzo.com \
--cc=artem.vasiliev@virtuozzo.com \
--cc=den@openvz.org \
--cc=ilia.solovykh@virtuozzo.com \
--cc=svt-core@virtuozzo.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.