diff options
| -rw-r--r-- | meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch | 15 | ||||
| -rw-r--r-- | meta-networking/recipes-support/wireshark/wireshark_3.4.11.bb (renamed from meta-networking/recipes-support/wireshark/wireshark_3.4.8.bb) | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch b/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch index c1a528f90d..134633f668 100644 --- a/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch +++ b/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch | |||
| @@ -12,11 +12,11 @@ Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> | |||
| 12 | cmake/modules/UseLemon.cmake | 49 +++++++++++++++++++++++++----------- | 12 | cmake/modules/UseLemon.cmake | 49 +++++++++++++++++++++++++----------- |
| 13 | 1 file changed, 34 insertions(+), 15 deletions(-) | 13 | 1 file changed, 34 insertions(+), 15 deletions(-) |
| 14 | 14 | ||
| 15 | diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake | 15 | Index: wireshark-3.4.11/cmake/modules/UseLemon.cmake |
| 16 | index 849ffc1..ca38ab7 100644 | 16 | =================================================================== |
| 17 | --- a/cmake/modules/UseLemon.cmake | 17 | --- wireshark-3.4.11.orig/cmake/modules/UseLemon.cmake |
| 18 | +++ b/cmake/modules/UseLemon.cmake | 18 | +++ wireshark-3.4.11/cmake/modules/UseLemon.cmake |
| 19 | @@ -7,21 +7,40 @@ MACRO(ADD_LEMON_FILES _source _generated) | 19 | @@ -7,21 +7,40 @@ MACRO(ADD_LEMON_FILES _source _generated |
| 20 | 20 | ||
| 21 | SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename}) | 21 | SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename}) |
| 22 | 22 | ||
| @@ -26,7 +26,7 @@ index 849ffc1..ca38ab7 100644 | |||
| 26 | - # These files are generated as side-effect | 26 | - # These files are generated as side-effect |
| 27 | - ${_out}.h | 27 | - ${_out}.h |
| 28 | - ${_out}.out | 28 | - ${_out}.out |
| 29 | - COMMAND lemon | 29 | - COMMAND $<TARGET_FILE:lemon> |
| 30 | - -T${_lemonpardir}/lempar.c | 30 | - -T${_lemonpardir}/lempar.c |
| 31 | - -d. | 31 | - -d. |
| 32 | - ${_in} | 32 | - ${_in} |
| @@ -72,6 +72,3 @@ index 849ffc1..ca38ab7 100644 | |||
| 72 | 72 | ||
| 73 | LIST(APPEND ${_source} ${_in}) | 73 | LIST(APPEND ${_source} ${_in}) |
| 74 | LIST(APPEND ${_generated} ${_out}.c) | 74 | LIST(APPEND ${_generated} ${_out}.c) |
| 75 | -- | ||
| 76 | 2.26.2.Cisco | ||
| 77 | |||
diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.4.8.bb b/meta-networking/recipes-support/wireshark/wireshark_3.4.11.bb index faf2a3ad1f..6fee972b2c 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_3.4.8.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_3.4.11.bb | |||
| @@ -19,7 +19,7 @@ SRC_URI += " \ | |||
| 19 | 19 | ||
| 20 | UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" | 20 | UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" |
| 21 | 21 | ||
| 22 | SRC_URI[sha256sum] = "58a7fa8dfe2010a8c8b7dcf66438c653e6493d47eb936ba48ef49d4aa4dbd725" | 22 | SRC_URI[sha256sum] = "a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279" |
| 23 | 23 | ||
| 24 | PE = "1" | 24 | PE = "1" |
| 25 | 25 | ||
