Skip to content

Commit e68f0f0

Browse files
illuusioottok
authored andcommitted
MDEV-30502: Change lsb-base to sysvinit-utils
Scripts of lsb-base package are moved to sysvinit-utils in Debian 12. Commit removes deprecated lsb-base as dependency. It also make change autobake-debs.sh to be sure that there is backward compatibility with distro version that still use lsb-base: * Debian 10 and 11 * Ubuntu 18.04, 20.04, 22.04 and 22.10
1 parent 191821f commit e68f0f0

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

debian/autobake-deb.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,15 @@ remove_rocksdb_tools()
5555
fi
5656
}
5757

58+
add_lsb_base_depends()
59+
{
60+
# Make sure one can run this multiple times remove
61+
# lines 'sysvinit-utils' and 'lsb-base'.
62+
sed -e '/sysvinit-utils/d' -e '/lsb-base/d' -i debian/control
63+
# Add back lsb-base before lsof
64+
sed -e 's#lsof #lsb-base (>= 3.0-10),\n lsof #' -i debian/control
65+
}
66+
5867
replace_uring_with_aio()
5968
{
6069
sed 's/liburing-dev/libaio-dev/g' -i debian/control
@@ -105,6 +114,7 @@ case "${LSBNAME}"
105114
in
106115
# Debian
107116
buster)
117+
add_lsb_base_depends
108118
disable_libfmt
109119
replace_uring_with_aio
110120
if [ ! "$architecture" = amd64 ]
@@ -113,6 +123,11 @@ in
113123
fi
114124
;&
115125
bullseye|bookworm)
126+
if [[ "${LSBNAME}" == "bullseye" ]]
127+
then
128+
add_lsb_base_depends
129+
fi
130+
116131
# mariadb-plugin-rocksdb in control is 4 arches covered by the distro rocksdb-tools
117132
# so no removal is necessary.
118133
if [[ ! "$architecture" =~ amd64|arm64|ppc64el ]]
@@ -130,14 +145,17 @@ in
130145
;;
131146
# Ubuntu
132147
bionic)
148+
add_lsb_base_depends
133149
remove_rocksdb_tools
134150
[ "$architecture" != amd64 ] && disable_pmem
135151
;&
136152
focal)
153+
add_lsb_base_depends
137154
replace_uring_with_aio
138155
disable_libfmt
139156
;&
140157
impish|jammy|kinetic)
158+
add_lsb_base_depends
141159
# mariadb-plugin-rocksdb s390x not supported by us (yet)
142160
# ubuntu doesn't support mips64el yet, so keep this just
143161
# in case something changes.

debian/control

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,6 @@ Depends: galera-4 (>= 26.4),
682682
gawk,
683683
iproute2 [linux-any],
684684
libdbi-perl,
685-
lsb-base (>= 3.0-10),
686685
lsof [linux-any],
687686
mariadb-client (>= ${source:Version}),
688687
mariadb-server-core (>= ${source:Version}),

0 commit comments

Comments
 (0)