| Message ID | 20260224035119.1597-1-liuyd.fnst@fujitsu.com |
|---|---|
| State | Under Review |
| Headers | show |
| Series | orc: Enable hotdoc to produce doc | expand |
On Tue, 24 Feb 2026 at 04:51, Yiding Liu (Fujitsu) via
lists.openembedded.org <liuyd.fnst=fujitsu.com@lists.openembedded.org>
wrote:
> +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'hotdoc-native', '', d)}"
Unfortunately this is not going to work. Yocto's autobuilder does run
builds with api-documentation enabled, and they're expected to succeed
without any additional layers.
The correct thing is to define a PACKAGECONFIG, and leave it disabled.
Alex
Hi Alex
Yes, I will add PACKAGECONFIG for hotdoc and send a v2 patch.
PACKAGECONFIG ??= ""
PACKAGECONFIG[hotdoc] = ",,hotdoc-native"
Liu
________________________________
发件人: Alexander Kanavin <alex.kanavin@gmail.com>
发送时间: 2026年2月25日 01:31
收件人: Liu, Yiding/刘 乙丁 <liuyd.fnst@fujitsu.com>
抄送: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org>
主题: Re: [OE-core][PATCH] orc: Enable hotdoc to produce doc
On Tue, 24 Feb 2026 at 04:51, Yiding Liu (Fujitsu) via
lists.openembedded.org <liuyd.fnst=fujitsu.com@lists.openembedded.org>
wrote:
> +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'hotdoc-native', '', d)}"
Unfortunately this is not going to work. Yocto's autobuilder does run
builds with api-documentation enabled, and they're expected to succeed
without any additional layers.
The correct thing is to define a PACKAGECONFIG, and leave it disabled.
Alex
diff --git a/meta/recipes-devtools/orc/orc_0.4.42.bb b/meta/recipes-devtools/orc/orc_0.4.42.bb index f56b9058c2..02f431dc0f 100644 --- a/meta/recipes-devtools/orc/orc_0.4.42.bb +++ b/meta/recipes-devtools/orc/orc_0.4.42.bb @@ -9,6 +9,8 @@ SRC_URI[sha256sum] = "7ec912ab59af3cc97874c456a56a8ae1eec520c385ec447e8a102b2bd1 inherit meson pkgconfig +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'hotdoc-native', '', d)}" + # distinguish from apache:orc CVE_PRODUCT = "gstreamer:orc" @@ -27,3 +29,13 @@ python populate_packages:prepend () { do_compile:prepend:class-native () { sed -i -e 's#/tmp#.#g' ${S}/orc/orccodemem.c } + +#Add this function to deal with QA Issue like File /usr/share/doc/orc/html/assets/js/search/hotdoc_fragments/orctarget.html-enum (unnamed at /work/x86-64-v3-poky-linux/orc/0.4.42/sources/orc-0.4.42/orc/orctarget.h:39:1).fragment in package orc-doc contains reference to TMPDIR [buildpaths] +do_install:append:class-target () { + if ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'true', 'false', d)}; then + rm -rf ${D}${docdir}/${PN}/html/assets/js/search/hotdoc_fragments/*unnamed* + for ss in $(find ${D}${docdir}/${PN}/html -type f); do + sed -i 's,${S},,g' "$ss" + done + fi +}
Add do_install:append function to fix QA Issue like "File /usr/share/doc/orc/html/assets/js/search/hotdoc_fragments/orctarget.html-enum (unnamed at /work/x86-64-v3-poky-linux/orc/0.4.42/sources/orc-0.4.42/orc/orctarget.h:39:1).fragment in package orc-doc contains reference to TMPDIR [buildpaths]" Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> --- meta/recipes-devtools/orc/orc_0.4.42.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+)