fix(kconfig): Correctly execute shell commands in working directory

Signed-off-by: Alexander Jung <[email protected]>
unikraft · Aug 21, 2024 · c321a9c · c321a9c
1 parent 2f89be2
commit c321a9c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/kconfig/kconfig.go b/kconfig/kconfig.go
@@ -172,7 +172,7 @@ func ParseData(data []byte, file string, extra ...*KeyValue) (*KConfigFile, erro
 		env[kcv.Key] = kcv
 	}
 	kp := &kconfigParser{
-		parser:  newParser(data, file, env),
+		parser:  newParser(data, filepath.Dir(file), file, env),
 		baseDir: filepath.Dir(file),
 	}
 
@@ -426,7 +426,7 @@ func (kp *kconfigParser) includeSource(file string) {
 	}
 
 	kp.includes = append(kp.includes, kp.parser)
-	kp.parser = newParser(data, file, kp.env)
+	kp.parser = newParser(data, kp.baseDir, file, kp.env)
 	kp.parseFile()
 	err = kp.err
 	kp.parser = kp.includes[len(kp.includes)-1]

diff --git a/kconfig/parser.go b/kconfig/parser.go
@@ -23,13 +23,15 @@ type parser struct {
 	line    int
 	err     error
 	env     KeyValueMap
+	baseDir string
 }
 
-func newParser(data []byte, file string, env KeyValueMap) *parser {
+func newParser(data []byte, baseDir, file string, env KeyValueMap) *parser {
 	return &parser{
-		data: data,
-		file: file,
-		env:  env,
+		data:    data,
+		file:    file,
+		env:     env,
+		baseDir: baseDir,
 	}
 }
 
@@ -211,6 +213,7 @@ func (p *parser) interpolate(b []byte) string {
 
 		var buf bytes.Buffer
 		cmd := exec.Command(args[0], args[1:]...)
+		cmd.Dir = p.baseDir
 		cmd.Stdout = bufio.NewWriter(&buf)
 		if err := cmd.Run(); err != nil {
 			p.failf("could not execute shell: %s", err.Error())