浏览代码

wireshark: use inherit_defer for conditional cases

Conditionnal inherit may be missed when PACKAGECONFIG qt5 is activated
after this inherit, eg in .bbappend. see patch [0]

[0]: https://lists.openembedded.org/g/bitbake-devel/message/16815

Reviewed-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Ghislain Mangé <ghislain.mange@smile.fr>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 97318e27ebf9f528acf77fb0759c332bd83adb4b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Ghislain Mangé 6 月之前
父节点
当前提交
df6844bc84
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb

+ 1 - 1
meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb

@@ -48,7 +48,7 @@ PACKAGECONFIG[nghttp2] = "-DENABLE_NGHTTP2=ON,-DENABLE_NGHTTP2=OFF, nghttp2"
 # these next two options require addional layers
 PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg"
 
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)}
+inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)}
 
 EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \
                   -DBUILD_mmdbresolve=OFF \