| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | From 9a7dead72f41e79979625c9bdef2fb638427d3d6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 22 Aug 2022 20:54:17 -0700 |
| 4 | Subject: [PATCH] wscript: Widen the search for tags |
| 5 | |
| 6 | Default is to look for annotated tags, howveer when using devtool we |
| 7 | create our own git tree from release tarballs which will have tags but |
| 8 | they are not annotated, therefore broaden the search to include all tags |
| 9 | |
| 10 | Upstream-Status: Inappropriate [OE-specific] |
| 11 | |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | --- |
| 14 | wscript | 2 +- |
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/wscript b/wscript |
| 18 | index 879ded1..dff835d 100644 |
| 19 | --- a/wscript |
| 20 | +++ b/wscript |
| 21 | @@ -177,7 +177,7 @@ def configure(ctx): |
| 22 | if build_desc: |
| 23 | build_desc = ' ' + build_desc |
| 24 | if ctx.env.BIN_GIT: |
| 25 | - cmd = ctx.env.BIN_GIT + shlex.split("describe --dirty") |
| 26 | + cmd = ctx.env.BIN_GIT + shlex.split("describe --tags --dirty") |
| 27 | git_short_hash = ctx.cmd_and_log(cmd).strip() |
| 28 | git_short_hash = '-'.join(git_short_hash.split('-')[1:]) |
| 29 | |