virt/qemu/debian/deb_patches/0004-add-condition-for-dh_installdocs.patch
dliu5 f08c85737a Upgrade qemu to 7.2.0.
As we add kata container support for StarlingX
with the latest kata containers stable version 3.1.3.

We need to upgrade qemu to 7.2.0 version to make them
compatible.

Test plan:
PASS - Build qemu package.
PASS - Build /install image on AIO-SX.
PASS - Verify the package is installed in the system.
PASS - Verify the qemu-utils correctly installed by
       running qemi-image -V
PASS - Verify the qemu x86_64 correctly installed by
       running qemu-system-x86_64 --version
PASS - Verify stx-openstack works correctly with sanity
       and regression tests.
PASS - Verify that the kata-runtime check command print
       system is capable of running kata containers.
PASS - Verify that kubectl could create pod with kata
       containers runtime, and pod start successfully.

Story: 2010781
Task: 48183

Change-Id: Ie9fba13999023e3dce37c620864710707bc679ed
Signed-off-by: David Liu <david.liu@windriver.com>
2023-12-22 07:05:27 -05:00

35 lines
1.0 KiB
Diff

From e628f96df051dae5f2d5b6baf89deb9470207478 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Tue, 13 Jun 2023 05:56:58 +0000
Subject: [PATCH 2/2] add condition for dh_installdocs
This should only be installed when linux_user is enabled.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
debian/rules | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/debian/rules b/debian/rules
index 67549c4d..2d48c723 100755
--- a/debian/rules
+++ b/debian/rules
@@ -357,10 +357,14 @@ build-arch: $(addprefix build-, ${qemu-builds})
override_dh_auto_install-arch: $(addprefix install-, ${qemu-builds})
override_dh_installdocs:
+ifeq ($(enable_linux_user),enable)
dh_installdocs -Nqemu-user-binfmt
dh_installdocs -pqemu-user-binfmt --link-doc=qemu-user
+endif
override_dh_installchangelogs:
+ifeq ($(enable_linux_user),enable)
dh_installchangelogs -Nqemu-user-binfmt
+endif
override_dh_installinit:
dh_installinit -pqemu-guest-agent
override_dh_installsystemd:
--
2.30.2