From 5fa26ec9b5e628709d1cc0217a0c5e0a43590191 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 29 Oct 2020 10:33:41 +0100 Subject: tools/syz-kconf: detect -rcN tags We currently detect v5.10-rc1 as v5.9 because we ignore -rc tags. This makes it impossible to enable configs that were already added for v5.10. Treat v5.10-rc1 as v5.10 already. --- tools/syz-kconf/kconf.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/syz-kconf') diff --git a/tools/syz-kconf/kconf.go b/tools/syz-kconf/kconf.go index 841366146..862e4ff45 100644 --- a/tools/syz-kconf/kconf.go +++ b/tools/syz-kconf/kconf.go @@ -323,7 +323,7 @@ func (ctx *Context) setTarget() error { func (ctx *Context) setReleaseFeatures() error { tag := ctx.ReleaseTag - match := regexp.MustCompile(`^v([0-9]+)\.([0-9]+)(?:\.([0-9]+))?$`).FindStringSubmatch(tag) + match := regexp.MustCompile(`^v([0-9]+)\.([0-9]+)(?:-rc([0-9]+))?(?:\.([0-9]+))?$`).FindStringSubmatch(tag) if match == nil { return fmt.Errorf("bad release tag %q", tag) } -- cgit mrf-deployment