From 661df548dddf723cdf055a4f76f4aa2c93f3774c Mon Sep 17 00:00:00 2001 From: Manjukumar Matha Date: Thu, 9 Aug 2018 15:37:36 -0700 Subject: wireshark_2.6.2.bb: Fix the configure error on git describe This patch fixes the following error during do_configure task | fatal: No names found, cannot describe anything. | CMake Error at CMakeLists.txt:3086 (string): | string begin index: 1 is out of range 0 - 0 | Using --always is a fallback for fetching uniquely abbreviated commit object Signed-off-by: Manjukumar Matha Signed-off-by: Khem Raj --- .../fix-fatal-no-names-found-git-error.patch | 23 ++++++++++++++++++++++ .../recipes-support/wireshark/wireshark_2.6.2.bb | 1 + 2 files changed, 24 insertions(+) create mode 100644 meta-networking/recipes-support/wireshark/wireshark/fix-fatal-no-names-found-git-error.patch 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 new file mode 100644 index 0000000000..80119e3fde --- /dev/null +++ b/meta-networking/recipes-support/wireshark/wireshark/fix-fatal-no-names-found-git-error.patch @@ -0,0 +1,23 @@ +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 +--- +--- 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.2.bb index 1735ae7fe0..e949080e1b 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_2.6.2.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_2.6.2.bb @@ -10,6 +10,7 @@ DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " SRC_URI = "https://1.as.dl.wireshark.org/src/${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" -- cgit 1.2.3-korg