There is an implicit ordering problem with this class and kernel.bbclass, since kernel.bbclass uses EXPORT_FUNCTIONS on these function and if the inherit ordering is wrong, the functions get broken.
The class is always included and always wants to append them. Therefore target the real functions we want to change. This makes the inherit order less fragile. Signed-off-by: Richard Purdie <[email protected]> --- meta/classes-recipe/kernel-devicetree.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes-recipe/kernel-devicetree.bbclass b/meta/classes-recipe/kernel-devicetree.bbclass index eff052b4029..49c39e27ec1 100644 --- a/meta/classes-recipe/kernel-devicetree.bbclass +++ b/meta/classes-recipe/kernel-devicetree.bbclass @@ -44,7 +44,7 @@ get_real_dtb_path_in_kernel () { echo "$dtb_path" } -do_configure:append() { +kernel_do_configure:append() { if [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then if echo ${KERNEL_IMAGETYPE_FOR_MAKE} | grep -q 'zImage'; then case "${ARCH}" in @@ -66,7 +66,7 @@ do_configure:append() { fi } -do_compile:append() { +kernel_do_compile:append() { if [ -n "${KERNEL_DTC_FLAGS}" ]; then export DTC_FLAGS="${KERNEL_DTC_FLAGS}" fi @@ -77,7 +77,7 @@ do_compile:append() { done } -do_install:append() { +kernel_do_install:append() { install -d ${D}/${KERNEL_DTBDEST} for dtbf in ${KERNEL_DEVICETREE}; do dtb=`normalize_dtb "$dtbf"` @@ -91,7 +91,7 @@ do_install:append() { done } -do_deploy:append() { +kernel_do_deploy:append() { for dtbf in ${KERNEL_DEVICETREE}; do dtb=`normalize_dtb "$dtbf"` dtb_ext=${dtb##*.}
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#242545): https://lists.openembedded.org/g/openembedded-core/message/242545 Mute This Topic: https://lists.openembedded.org/mt/120561036/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
