Skip to content

Commit d4515d1

Browse files
committed
Deb: don't edit control file from inside rules file
It's too late. Might work or not (and on buster it doesn't).
1 parent 74f184a commit d4515d1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

debian/autobake-deb.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ then
8989
sed '/Package: mariadb-plugin-aws-key-management-10.2/,+12d' -i debian/control
9090
fi
9191

92+
# Don't build cassandra package if thrift is not installed
93+
if [[ ! -f /usr/local/include/thrift/Thrift.h && ! -f /usr/include/thrift/Thrift.h ]]
94+
then
95+
sed '/Package: mariadb-plugin-cassandra/,/^$/d' -i debian/control
96+
fi
9297

9398
# Adjust changelog, add new version
9499
echo "Incrementing changelog and starting build scripts"

debian/rules

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,6 @@ ifneq ($(ARCH), amd64)
120120
sed -i -e "/Package: mariadb-plugin-tokudb/,+16d" debian/control
121121
endif
122122

123-
# If libthrift-dev was available (manually installed, as it is
124-
# not in Debian) and ha_cassandra.so was thus built, create package,
125-
# otherwise skip it.
126-
[ -f $(BUILDDIR)/storage/cassandra/ha_cassandra.so ] || sed -i -e "/Package: mariadb-plugin-cassandra/,+18d" debian/control
127-
128123
# Copy systemd files to a location available for dh_installinit
129124
cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.2.mariadb.service
130125
cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.2.mariadb@.service

0 commit comments

Comments
 (0)