Skip to content

Commit ef444e7

Browse files
committed
MDEV-28153: Debian autobake to generate control
Without doing the full build. Autobake now includes a dependency on lsb-release. As the BB CI images (https://github.com/MariaDB/mariadb.org-tools/blob/master/buildbot.mariadb.org/ci_build_images/debian.Dockerfile) have explicit dependencies, there's no point maintaining them in two places. We don't want do the full autobake-deb.sh there, just enough to have the control file containing the correct dependencies. Helps: MariaDB/mariadb.org-tools#130
1 parent fd6a464 commit ef444e7

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

debian/autobake-deb.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ then
3030
# build is not running on Travis or Gitlab-CI
3131
sed '/-DPLUGIN_COLUMNSTORE=NO/d' -i debian/rules
3232
# Take the files and part of control from MCS directory
33-
cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
34-
echo >> debian/control
35-
cat storage/columnstore/columnstore/debian/control >> debian/control
33+
if [ ! -f debian/mariadb-plugin-columnstore.install ]
34+
then
35+
cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
36+
echo >> debian/control
37+
cat storage/columnstore/columnstore/debian/control >> debian/control
38+
fi
3639
fi
3740

3841
# Look up distro-version specific stuff
@@ -91,6 +94,11 @@ case "${CODENAME}" in
9194
exit 1
9295
esac
9396

97+
if [ -n "${AUTOBAKE_PREP_CONTROL_RULES_ONLY:-}" ]
98+
then
99+
exit 0
100+
fi
101+
94102
# Adjust changelog, add new version
95103
echo "Incrementing changelog and starting build scripts"
96104

debian/salsa-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ build:
3434
- mv ${CCACHE_WORK_DIR} ${CCACHE_TMP_DIR}
3535
# Run Salsa-CI .build-script equivalent, with extra devscripts so autobake-deb.sh can run 'dch'
3636
- export CCACHE_DIR=${CCACHE_TMP_DIR}
37-
- apt-get update && eatmydata apt-get install --no-install-recommends -y ccache fakeroot build-essential devscripts
37+
- apt-get update && eatmydata apt-get install --no-install-recommends -y ccache fakeroot build-essential devscripts lsb-release
3838
- cd ${WORKING_DIR}/${SOURCE_DIR}
3939
- eatmydata apt-get build-dep --no-install-recommends -y .
4040
- update-ccache-symlinks; ccache -z # Zero out ccache counters

0 commit comments

Comments
 (0)