diff options
| author | Mingde (Matthew) Zeng <matthew.zeng@windriver.com> | 2020-04-08 10:44:27 -0400 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-04-08 11:21:13 -0700 |
| commit | 6d80111b244f549ae3c2768d6e3872aa746ec1cf (patch) | |
| tree | 1fcbf0d502a85e82144278f87ac7cecc09a3b88f /meta-networking | |
| parent | 26801c58ee2b0621bd55fc6269abc874d5da5017 (diff) | |
| download | meta-openembedded-6d80111b244f549ae3c2768d6e3872aa746ec1cf.tar.gz | |
wireshark: poppler: prevent PACKAGECONFIG change based on different layers
As per discussed in a previous email under the subject "Regarding
poppler auto PACKAGECONFIG when qt5-layer exists", adding a layer
but not using it should not change PACKAGECONFIG automatically. It
may result unexpected error.
Signed-off-by: Matthew Zeng <matthew.zeng@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb index 91a7e1a36d..db545028f2 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb | |||
| @@ -19,7 +19,7 @@ PE = "1" | |||
| 19 | 19 | ||
| 20 | inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg | 20 | inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg |
| 21 | 21 | ||
| 22 | PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5 plugins', '', d)}" | 22 | PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" |
| 23 | 23 | ||
| 24 | PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" | 24 | PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" |
| 25 | 25 | ||