17170: Merge branch 'master'

[arvados.git] / cmd / arvados-package / build.go

diff --git a/cmd/arvados-package/build.go b/cmd/arvados-package/build.go
index c859792686db25af5f2e262c39c38aa4b84f5614..1437f4b772afe6bfec17fe5622615fb6fbb6f754 100644 (file)
--- a/cmd/arvados-package/build.go
+++ b/cmd/arvados-package/build.go
@@ -108,11 +108,13 @@ func build(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Wr
                "-v", selfbin+":/arvados-package:ro",
                "-v", opts.SourceDir+":/arvados:ro",
                buildImageName,
-               "eatmydata", "/arvados-package", "fpm",
+               "eatmydata", "/arvados-package", "_fpm",
                "-source", "/arvados",
                "-package-version", opts.PackageVersion,
                "-package-dir", "/pkg",
                "-package-chown", opts.PackageChown,
+               "-package-maintainer", opts.Maintainer,
+               "-package-vendor", opts.Vendor,
        )
        cmd.Stdout = stdout
        cmd.Stderr = stderr
@@ -126,15 +128,6 @@ func build(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Wr
                return err
        }
 
-       cmd = exec.CommandContext(ctx, "bash", "-c", "dpkg-scanpackages . | gzip > Packages.gz.tmp && mv Packages.gz.tmp Packages.gz")
-       cmd.Stdout = stdout
-       cmd.Stderr = stderr
-       cmd.Dir = opts.PackageDir
-       err = cmd.Run()
-       if err != nil {
-               return fmt.Errorf("dpkg-scanpackages: %w", err)
-       }
-
        return nil
 }