diff options
| -rw-r--r-- | meta-networking/recipes-support/wireshark/wireshark/fix-fatal-no-names-found-git-error.patch | 23 | ||||
| -rw-r--r-- | meta-networking/recipes-support/wireshark/wireshark_2.6.4.bb (renamed from meta-networking/recipes-support/wireshark/wireshark_2.6.2.bb) | 7 |
2 files changed, 3 insertions, 27 deletions
diff --git a/meta-networking/recipes-support/wireshark/wireshark/fix-fatal-no-names-found-git-error.patch b/meta-networking/recipes-support/wireshark/wireshark/fix-fatal-no-names-found-git-error.patch deleted file mode 100644 index 80119e3fde..0000000000 --- a/meta-networking/recipes-support/wireshark/wireshark/fix-fatal-no-names-found-git-error.patch +++ /dev/null @@ -1,23 +0,0 @@ -fixes - -| fatal: No names found, cannot describe anything. -| CMake Error at CMakeLists.txt:3086 (string): -| string begin index: 1 is out of range 0 - 0 - -Use always to circumvent the issue if git tag is not present - -Upstream-status: Pending - -Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> ---- ---- wireshark-2.6.1/CMakeLists.txt 2018-08-08 18:18:05.388318652 -0700 -+++ wireshark-2.6.1/CMakeLists-fix.txt 2018-08-08 18:22:27.829670496 -0700 -@@ -3078,7 +3078,7 @@ - endif() - - execute_process( -- COMMAND git describe --abbrev=8 --match v[1-9]* -+ COMMAND git describe --always --abbrev=8 --match v[1-9]* - OUTPUT_VARIABLE _git_description - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.6.2.bb b/meta-networking/recipes-support/wireshark/wireshark_2.6.4.bb index 5be7d4f18f..595502e763 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_2.6.2.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_2.6.4.bb @@ -8,15 +8,14 @@ DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bi DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " -SRC_URI = "https://1.as.dl.wireshark.org/src/${BP}.tar.xz \ +SRC_URI = "https://1.as.dl.wireshark.org/src/all-versions/${BP}.tar.xz \ file://0001-Add-libm-to-link-for-fmod-API.patch \ - file://fix-fatal-no-names-found-git-error.patch \ " UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[md5sum] = "086d235509717190d06554b2ab870209" -SRC_URI[sha256sum] = "49b2895ee3ba17ef9ef0aebfdc4d32a778e0f36ccadde184516557d5f3357094" +SRC_URI[md5sum] = "8aa7b8c8ce0b6ce4256a081493819d6f" +SRC_URI[sha256sum] = "a06b007e6343f148b8b93443b2fcfc9bb3204311cd268565d54d1b71660bc861" PE = "1" |