On 7/30/20 8:56 PM, GitLab Bridge on behalf of prarit wrote:
> From: Prarit Bhargava <prarit@xxxxxxxxxx>
>
Forgot to cc dzickus & jforbes.
P.
> 'make setup-source' is failing with, for example,
>
> fatal: Not a valid object name master
> BUILDID is "hello". Update '/home/prarit/git-kernel/kernel-ark/localversion' to change.
> Gathering new log entries since 2eb3eaedb74aa011774bb95fd6516d6d7858d0f8
> fatal: ambiguous argument 'itd3590ebf6f91.1-1-..': unknown revision or path not in the working tree.
> Use '--' to separate paths from revisions, like this:
> 'git <command> [<revision>...] -- [<file>...]'
>
> As of 5.7.0 new tags were added to the tree of the form
>
> kernel-5.8.0-0.rc7.20200730gitd3590ebf6f91.1
>
> After applying a patch the value of "git describe" is
> kernel-5.8.0-0.rc7.20200730gitd3590ebf6f91.1-1-gd76dfb51aa86. This string
> is stored in TAG which is used by MARKER. The value of MARKER is set
> using a cut command on 'g' which results in MARKER being set to
> "it69119673bd50.1" instead of "d76dfb51aa86"
>
> The problem with continuing to use cut and 'g' is that the tag string
> may change again. It is safer to use awk and '-g'.
>
> Use awk instead of cut to evaluate MARKER.
>
> Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
> ---
> redhat/Makefile.common | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/redhat/Makefile.common b/redhat/Makefile.common
> index e7fb532874e3..6d048415ba6d 100644
> --- a/redhat/Makefile.common
> +++ b/redhat/Makefile.common
> @@ -52,7 +52,7 @@ endif
>
> ifeq ($(SNAPSHOT),1)
> # The base for generating tags is the snapshot commit
> - MARKER:=$(shell echo $(TAG) | cut -d "g" -f 2)
> + MARKER:=$(shell echo $(TAG) | awk -F "-g" '{ print $$2 }')
> # The merge window is weird because the actual versioning hasn't
> # been updated but we still need something that works for
> # packaging. Fix this by bumping the patch level and marking
>
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
