Skip to content

Commit d1b59df

Browse files
authored
Merge pull request syslog-ng#5039 from HofiOne/remove-hardcoded-dbld-python-vrsion-deps
Remove hardcoded dbld python version deps
2 parents 5a74ee1 + 32ca340 commit d1b59df

File tree

1 file changed

+16
-23
lines changed

1 file changed

+16
-23
lines changed

dbld/packages.manifest

+16-23
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ca-certificates [centos, almalinux, fedora, debian, ubuntu]
1010

1111
# criterion compilation
1212
cmake [centos, almalinux, fedora, debian, ubuntu]
13-
gcc-c++ [centos, almalinux, fedora]
13+
gcc-c++ [centos, almalinux, fedora]
1414

1515
# to unpack gradle binary package (zip file)
1616
unzip [centos, almalinux, fedora, debian, ubuntu]
@@ -21,7 +21,7 @@ bzip2 [centos, almalinux, fedora, debian, ubuntu]
2121
# Basic interactive tools
2222
less [centos, almalinux, fedora, debian, ubuntu]
2323
vim [centos, almalinux, fedora, debian, ubuntu]
24-
sudo [centos, almalinux, fedora, debian, ubuntu]
24+
sudo [centos, almalinux, fedora, debian, ubuntu]
2525

2626
#############################################################################
2727
# Essential build tools not explicitly referenced from
@@ -34,17 +34,17 @@ dh-autoreconf [debian, ubuntu]
3434
dh-exec [debian, ubuntu]
3535
dpkg-dev [debian, ubuntu]
3636
equivs [debian, ubuntu]
37-
libdistro-info-perl [debian, ubuntu]
37+
libdistro-info-perl [debian, ubuntu]
3838
make [centos, almalinux, fedora]
3939
rpm-build [centos, almalinux, fedora]
40-
which [fedora]
40+
which [fedora]
4141

4242
#############################################################################
4343
# eBPF related tools
4444
#############################################################################
45-
clang [tarball]
46-
libbpf-dev [tarball]
47-
bpftool [tarball]
45+
clang [tarball]
46+
libbpf-dev [tarball]
47+
bpftool [tarball]
4848

4949
#############################################################################
5050
# Tarball related tools
@@ -74,9 +74,9 @@ ccache [centos, almalinux, fedora, debian, ubuntu]
7474
# lines, so we don't need to list them here.
7575
#############################################################################
7676

77-
autoconf [centos, almalinux, fedora]
78-
autoconf-archive [centos, fedora]
79-
automake [centos, almalinux, fedora]
77+
autoconf [centos, almalinux, fedora]
78+
autoconf-archive [centos, fedora]
79+
automake [centos, almalinux, fedora]
8080

8181
#############################################################################
8282
# syslog-ng core dependencies
@@ -90,24 +90,17 @@ automake [centos, almalinux, fedora]
9090
#
9191
# We are now using the same version for both.
9292

93-
python3-dev [debian-sid]
94-
python3-devel [fedora]
95-
python3-dev [ubuntu-focal]
93+
python3-dev [debian-sid, ubuntu-focal, devshell]
94+
python3-devel [fedora]
9695
python3-pip [debian, ubuntu]
97-
python3-venv [debian, ubuntu, devshell]
98-
99-
# python 3.10 has issues on Debian Testing
100-
# Nevertheless we should only downgrade for Light style-check tests, which uses pre-commit
101-
python3.12 [devshell]
102-
python3.12-dev [devshell]
103-
python3.12-venv [devshell]
96+
python3-venv [debian, ubuntu, devshell]
10497

10598
# libmongoc and libbson packages on various platforms
10699
# Because we are using fixed version of libmongoc on Bionic, we need to
107100
# specify non versioned packages on other platforms to continiously support
108101

109-
libbson-dev [debian]
110-
libmongoc-dev [debian]
102+
libbson-dev [debian]
103+
libmongoc-dev [debian]
111104

112105

113106
#############################################################################
@@ -170,4 +163,4 @@ openssh-client [devshell]
170163
astyle [devshell]
171164
snmptrapd [devshell]
172165
dwarves [devshell]
173-
jq [devshell]
166+
jq [devshell]

0 commit comments

Comments
 (0)