mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
MDEV-28419 subsequent runs of debian/autobake-deb.sh are not idempotent
While a -f debian/mariadb-plugin-columnstore.install idempotent check existed, the tying of the install file to the control file has some weaknesses. Used sed as an alternative to replace the debian/control mariadb-plugin-columnstore package defination and replace it with the one from the columnstore submodule.
This commit is contained in:
parent
3907345e22
commit
c0f6c4bd40
1 changed files with 5 additions and 6 deletions
11
debian/autobake-deb.sh
vendored
11
debian/autobake-deb.sh
vendored
|
@ -31,12 +31,11 @@ then
|
|||
# build is not running on Gitlab-CI.
|
||||
sed '/-DPLUGIN_COLUMNSTORE=NO/d' -i debian/rules
|
||||
# Take the files and part of control from MCS directory
|
||||
if [ ! -f debian/mariadb-plugin-columnstore.install ]
|
||||
then
|
||||
cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
|
||||
echo >> debian/control
|
||||
cat storage/columnstore/columnstore/debian/control >> debian/control
|
||||
fi
|
||||
cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
|
||||
# idempotent, except for the blank line, but that can be tolerated.
|
||||
sed -e '/Package: mariadb-plugin-columnstore/,/^$/d' -i debian/control
|
||||
echo >> debian/control
|
||||
cat storage/columnstore/columnstore/debian/control >> debian/control
|
||||
fi
|
||||
|
||||
# Look up distro-version specific stuff
|
||||
|
|
Loading…
Reference in a new issue