[PATCH] wireshark_2.6.1.bb: Fix the configure error on git describe

[PATCH] wireshark_2.6.1.bb: Fix the configure error on git describe

[Manjukumar Matha]

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>
---
 .../fix-fatal-no-names-found-git-error.patch       | 23 ++++++++++++++++++++++
 .../recipes-support/wireshark/wireshark_2.6.1.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 0000000..80119e3
--- /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 <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.1.bb b/meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb
index 91c5e96..b001bcb 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_2.6.1.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"
-- 
2.7.4

Re: [PATCH] wireshark_2.6.1.bb: Fix the configure error on git describe

[akuster808]

Manjukumar,


On 08/08/2018 06:38 PM, Manjukumar Matha wrote:
> 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

There is an upgrade to 2.6.2 sitting in master-next. Have you checked
that version?

- Armin
>
> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
> ---
>  .../fix-fatal-no-names-found-git-error.patch       | 23 ++++++++++++++++++++++
>  .../recipes-support/wireshark/wireshark_2.6.1.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 0000000..80119e3
> --- /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 <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.1.bb b/meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb
> index 91c5e96..b001bcb 100644
> --- a/meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb
> +++ b/meta-networking/recipes-support/wireshark/wireshark_2.6.1.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"

Re: [PATCH] wireshark_2.6.1.bb: Fix the configure error on git describe

[Manjukumar Harthikote Matha]

Hi Armin,

> -----Original Message-----
> From: akuster808 [mailto:akuster808@gmail.com]
> Sent: Thursday, August 09, 2018 7:16 AM
> To: Manjukumar Harthikote Matha <MANJUKUM@xilinx.com>; openembedded-
> devel@lists.openembedded.org
> Subject: Re: [oe] [PATCH] wireshark_2.6.1.bb: Fix the configure error on git
> describe
> 
> Manjukumar,
> 
> 
> On 08/08/2018 06:38 PM, Manjukumar Matha wrote:
> > 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
> 
> There is an upgrade to 2.6.2 sitting in master-next. Have you checked that
> version?
> 

Will try it out now and keep you posted

Thanks,
Manju

<...>

Re: [PATCH] wireshark_2.6.1.bb: Fix the configure error on git describe

[Manjukumar Harthikote Matha]

Hi Armin,

> 
> > -----Original Message-----
> > From: akuster808 [mailto:akuster808@gmail.com]
> > Sent: Thursday, August 09, 2018 7:16 AM
> > To: Manjukumar Harthikote Matha <MANJUKUM@xilinx.com>;
> openembedded-
> > devel@lists.openembedded.org
> > Subject: Re: [oe] [PATCH] wireshark_2.6.1.bb: Fix the configure error
> > on git describe
> >
> > Manjukumar,
> >
> >
> > On 08/08/2018 06:38 PM, Manjukumar Matha wrote:
> > > 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
> >
> > There is an upgrade to 2.6.2 sitting in master-next. Have you checked
> > that version?
> >
> 
> Will try it out now and keep you posted
> 

Still get the same issue on 2.6.2. I will send a patch based on 2.6.2

Thanks,
Manju