Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packagegroup-qt6-addons: only add qtpdf when "webengine" is a DISTRO_FEATURE 

This was always the case until commit 498e94c9132e90fc1c406b8422e4554c6801918e
in meta-qt6, which was meant to reorganize some packages depending on the
target architecture, but removed the check for this package in the process
(while maintaining the check for other related packages). We haven't tried
building qtpdf until now, and since it's causing build errors out of the box,
we might as well remove it for now because it's only meant to be an addon
exclusive to the SDK.

Since the new package qtdoc has a dependency with qtpdf, remove it as well.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2024-10-23 12:36:58 +02:00
parent 1d6fa1cf22
commit 3bf06c2c6f
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-addons.bbappend
View File

@ -1,5 +1,19 @@
# Copyright (C) 2023, Digi International Inc. # Copyright (C) 2023-2024, Digi International Inc.
# qtdeviceutilities provides a networksettings module that depends # qtdeviceutilities provides a networksettings module that depends
# on "connman". This conflicts with NetworkManager # on "connman". This conflicts with NetworkManager
RDEPENDS:${PN}:remove:dey = "qtdeviceutilities" RDEPENDS:${PN}:remove:dey = "qtdeviceutilities"
# Historically, qtpdf was added to this packagegroup only when "webengine" is
# in DISTRO_FEATURES, but now it always gets added and causes build errors.
# Restore this logic to prevent the errors while respecting the specific
# architecture overrides from the original recipe.
RDEPENDS:${PN}:remove:dey = "qtpdf"
RDEPENDS:${PN}:append:aarch64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}"
RDEPENDS:${PN}:append:armv6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}"
RDEPENDS:${PN}:append:armv7a = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}"
RDEPENDS:${PN}:append:armv7ve = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}"
RDEPENDS:${PN}:append:x86-64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}"
# qtdoc has a hardcoded dependency with qtpdf, so remove it as well
RDEPENDS:${PN}:remove:dey = "qtdoc"