Skip to content

Commit 49fc3d5

Browse files
committed
[drbd-build-svr]: fix modules install
1 parent df9ad9d commit 49fc3d5

File tree

1 file changed

+22
-2
lines changed
  • images/drbd-build-server/cmd

1 file changed

+22
-2
lines changed

images/drbd-build-server/cmd/main.go

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,7 @@ func (s *server) buildDRBD(kernelVersion, kernelBuildDir, outputDir, drbdDir, jo
750750
fmt.Sprintf("KVER=%s", kernelVersion),
751751
fmt.Sprintf("KDIR=%s", kernelBuildDir),
752752
fmt.Sprintf("SPAAS_URL=%s", s.spaasURL),
753+
fmt.Sprintf("DESTDIR=%s", outputDir),
753754
"SPAAS=true",
754755
)
755756
s.logger.Debug("Environment variables set", "job_id", jobID, "KVER", kernelVersion, "KDIR", kernelBuildDir, "SPAAS_URL", s.spaasURL)
@@ -796,10 +797,29 @@ func (s *server) buildDRBD(kernelVersion, kernelBuildDir, outputDir, drbdDir, jo
796797
buildDuration := time.Since(startTime)
797798
s.logger.Debug("'make module' completed successfully", "job_id", jobID, "duration", buildDuration)
798799

800+
s.logger.Debug("MkdirAll", "job_id", jobID, "duration", buildDuration)
801+
if err := os.MkdirAll(outputDir, 0755); err != nil {
802+
return fmt.Errorf("failed to create outputDir: %v", err)
803+
}
804+
805+
//env = append(
806+
// env,
807+
// fmt.Sprintf("KVER=%s", kernelVersion),
808+
// fmt.Sprintf("KDIR=%s", kernelBuildDir),
809+
// fmt.Sprintf("SPAAS_URL=%s", s.spaasURL),
810+
// fmt.Sprintf("DESTDIR=%s", outputDir),
811+
// "SPAAS=true",
812+
//)
813+
//
799814
// Install modules to output directory
800815
s.logger.Debug("Installing modules to output directory", "job_id", jobID, "output_dir", outputDir)
801-
cmd = exec.Command("make", "install")
802-
env = append(env, fmt.Sprintf("DESTDIR=%s", outputDir))
816+
cmd = exec.Command(
817+
"make",
818+
"install",
819+
fmt.Sprintf("DESTDIR=%s", outputDir),
820+
fmt.Sprintf("KVER=%s", kernelVersion),
821+
fmt.Sprintf("KDIR=%s", kernelBuildDir),
822+
)
803823
cmd.Env = env
804824
cmd.Stdout = os.Stdout
805825
cmd.Stderr = os.Stderr

0 commit comments

Comments
 (0)