From 0d2b5864c5fef739cac514567452c1de78904b09 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei.gherzan@huawei.com> Date: Wed, 6 Oct 2021 11:22:45 +0100 Subject: [PATCH] qemu: Define libnfs PACKAGECONFIG The upstream qemu recipe uses host's pkg-config files as a solution to detecting host's SDL[1]. This has a side effect of using other host libraries that are later queried by the configure script. This can get into a situation when the host provides libnfs (for example) and because later this dependency is not in place anymore, qemu will fail at runtime. This change adds a PACKAGECONFIG definition for libnfs that is disabled by default, in turn disabling by default pkgconfig autodetection in configure. [1] https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/qemu/qemu.inc?h=dunfell#n165 Fixes: https://git.ostc-eu.org/OSTC/OHOS/meta-ohos/-/issues/141 Upstream-status: Submitted [https://lists.openembedded.org/g/openembedded-core/message/156694] Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> --- meta-ohos-core/recipes-devtools/qemu/asos-qemu.inc | 5 +++++ meta-ohos-core/recipes-devtools/qemu/qemu-native_%.bbappend | 5 +++++ .../recipes-devtools/qemu/qemu-system-native_%.bbappend | 5 +++++ 3 files changed, 15 insertions(+) create mode 100644 meta-ohos-core/recipes-devtools/qemu/asos-qemu.inc create mode 100644 meta-ohos-core/recipes-devtools/qemu/qemu-native_%.bbappend create mode 100644 meta-ohos-core/recipes-devtools/qemu/qemu-system-native_%.bbappend diff --git a/meta-ohos-core/recipes-devtools/qemu/asos-qemu.inc b/meta-ohos-core/recipes-devtools/qemu/asos-qemu.inc new file mode 100644 index 00000000..ab715e99 --- /dev/null +++ b/meta-ohos-core/recipes-devtools/qemu/asos-qemu.inc @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +PACKAGECONFIG[libnfs] = "--enable-libnfs,--disable-libnfs,libnfs" diff --git a/meta-ohos-core/recipes-devtools/qemu/qemu-native_%.bbappend b/meta-ohos-core/recipes-devtools/qemu/qemu-native_%.bbappend new file mode 100644 index 00000000..25fd13cc --- /dev/null +++ b/meta-ohos-core/recipes-devtools/qemu/qemu-native_%.bbappend @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +require asos-qemu.inc diff --git a/meta-ohos-core/recipes-devtools/qemu/qemu-system-native_%.bbappend b/meta-ohos-core/recipes-devtools/qemu/qemu-system-native_%.bbappend new file mode 100644 index 00000000..25fd13cc --- /dev/null +++ b/meta-ohos-core/recipes-devtools/qemu/qemu-system-native_%.bbappend @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +require asos-qemu.inc -- GitLab