From f613a7c41d0b3ea16eeaad515e44dec003688ffb Mon Sep 17 00:00:00 2001
From: Siddharth M <siddharth.muralee@gmail.com>
Date: Wed, 17 Jul 2019 15:28:23 +0530
Subject: pkg/cover: fix prefix computation

* pkg/cover: Modify parsing logic
1. Remove prefix computation
2. Add a mgrconfig for kernel build directory

* pkg/report: shorten reports with kernelBuildSrc instead of kernelSrc

* pkg/report: Fix failing tests

* pkg/report: fix formating issues

* tools/syz-cover: Fix unintended redefinition

* make changes to fix failing ci build

* pkg/report: fix issues
---
 pkg/mgrconfig/config.go | 2 ++
 pkg/mgrconfig/load.go   | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'pkg/mgrconfig')

diff --git a/pkg/mgrconfig/config.go b/pkg/mgrconfig/config.go
index 48609d5c4..a023803ef 100644
--- a/pkg/mgrconfig/config.go
+++ b/pkg/mgrconfig/config.go
@@ -24,6 +24,8 @@ type Config struct {
 	KernelObj string `json:"kernel_obj"`
 	// Kernel source directory (if not set defaults to KernelObj).
 	KernelSrc string `json:"kernel_src,omitempty"`
+	// Location of the driectory where the kernel was built (if not set defaults to KernelSrc)
+	KernelBuildSrc string `json:"kernel_build_src"`
 	// Arbitrary optional tag that is saved along with crash reports (e.g. branch/commit).
 	Tag string `json:"tag,omitempty"`
 	// Location of the disk image file.
diff --git a/pkg/mgrconfig/load.go b/pkg/mgrconfig/load.go
index 1fdcc0155..a4cbc8914 100644
--- a/pkg/mgrconfig/load.go
+++ b/pkg/mgrconfig/load.go
@@ -111,6 +111,9 @@ func Complete(cfg *Config) error {
 		cfg.KernelSrc = cfg.KernelObj // assume in-tree build by default
 	}
 	cfg.KernelSrc = osutil.Abs(cfg.KernelSrc)
+	if cfg.KernelBuildSrc == "" {
+		cfg.KernelBuildSrc = cfg.KernelSrc
+	}
 	if cfg.HubClient != "" && (cfg.Name == "" || cfg.HubAddr == "" || cfg.HubKey == "") {
 		return fmt.Errorf("hub_client is set, but name/hub_addr/hub_key is empty")
 	}
-- 
cgit mrf-deployment