mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-02 13:59:59 +00:00
Code Issues Projects Releases Wiki Activity

wireshark_2.6.2.bb: Fix the configure error on git describe

Browse Source 
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 <manjukumar.harthikote-matha@xilinx.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Manjukumar Matha
2018-08-09 15:37:36 -07:00
committed by Khem Raj
parent 98382d5c77
commit 661df548dd
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-support/wireshark/wireshark/fix-fatal-no-names-found-git-error.patch
+23
View File
@@ -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 <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}
meta-networking/recipes-support/wireshark/wireshark_2.6.2.bb
+1
View File
@@ -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"