Skip to content

Commit 97581e7

Browse files
author
qount25
committed
Fix: dpkg-buildpackage --build=source step in Pgpm::Deb::Builder should not require dependencies install inside podman
1 parent 4ac7c0f commit 97581e7

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

lib/pgpm/deb/builder.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,20 @@ def run_build
6161
# podman run options
6262
create_opts = " -v #{@pgpm_dir}:/root/pgpm"
6363
create_opts += ":z" if selinux_enabled?
64-
create_opts += " --privileged --annotation run.oci.keep_original_groups=1"
64+
create_opts += " --privileged"
6565
create_opts += " --name #{@container_name} #{image_name}"
6666

6767
dsc_fn = "#{@spec.package.name}-#{@spec.package.version.to_s}_0-1.dsc"
6868
deb_fn = "#{@spec.full_pkg_name}.deb"
6969

7070
# commands to run
7171
cmds = " /bin/bash -c 'cd /root/pgpm/source"
72-
cmds += " && dpkg-buildpackage --build=source"
72+
cmds += " && dpkg-buildpackage --build=source -d" # -d flag helps with dependencies error
7373
cmds += " && fakeroot pbuilder build ../#{dsc_fn}"
7474
cmds += " && mv /var/cache/pbuilder/result/#{deb_fn} /root/pgpm/out/'"
7575

7676
puts " Creating and starting container #{@container_name} & running pbuilder"
77+
puts "podman run -it #{create_opts} #{cmds}"
7778
system("podman run -it #{create_opts} #{cmds}")
7879
exit(1) if $?.to_i > 0
7980
end

packages/timescale/timescaledb.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def dependencies
3131
def build_dependencies
3232
deps = case @os
3333
when "debian", "ubunut"
34-
["openssl-dev", "cmake"]
34+
["libssl-dev", "cmake"]
3535
when "rocky", "redhat", "fedora"
3636
["openssl-devel", "cmake"]
3737
end
@@ -43,7 +43,7 @@ def build_info
4343
when "debian", "ubuntu"
4444
{
4545
rules: "override_dh_auto_configure:\n" +
46-
" dh_auto_configure -- -DCMAKE_BUILD_TYPE=\"Release\""
46+
"\tdh_auto_configure -- -DCMAKE_BUILD_TYPE=\"Release\""
4747
}
4848
when "rocky", "redhat", "fedora"
4949
{

0 commit comments

Comments
 (0)