From dda251dfc2dc7755bf1e909ec8eb6a708e2cde6d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 11 Jan 2024 18:14:42 +0000 Subject: [PATCH] xmlcatalog: limit to native recipes only The sysroot postinst is explicitly native-only, so use more overrides to ensure that we don't try to run them outside of native recipes. Also add a comment so this doesn't get forgotten again, and link to the related bug. (From OE-Core rev: 38a5fc5dbb33fd3314f0a98c861a842342add064) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes-recipe/xmlcatalog.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/xmlcatalog.bbclass b/meta/classes-recipe/xmlcatalog.bbclass index 5826d0a8b5..d3ef7ff43c 100644 --- a/meta/classes-recipe/xmlcatalog.bbclass +++ b/meta/classes-recipe/xmlcatalog.bbclass @@ -4,13 +4,17 @@ # SPDX-License-Identifier: MIT # -DEPENDS = "libxml2-native" +# Note that this recipe only handles XML catalogues in the native sysroot, and doesn't +# yet support catalogue management in the target sysroot or on the target itself. +# (https://bugzilla.yoctoproject.org/13271) # A whitespace-separated list of XML catalogs to be registered, for example # "${sysconfdir}/xml/docbook-xml.xml". XMLCATALOGS ?= "" -SYSROOT_PREPROCESS_FUNCS:append = " xmlcatalog_sstate_postinst" +DEPENDS:append = " libxml2-native" + +SYSROOT_PREPROCESS_FUNCS:append:class-native = " xmlcatalog_sstate_postinst" xmlcatalog_complete() { ROOTCATALOG="${STAGING_ETCDIR_NATIVE}/xml/catalog"