Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d4515d13
Commit
d4515d13
authored
Jan 25, 2019
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deb: don't edit control file from inside rules file
It's too late. Might work or not (and on buster it doesn't).
parent
74f184af
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
debian/autobake-deb.sh
debian/autobake-deb.sh
+5
-0
debian/rules
debian/rules
+0
-5
No files found.
debian/autobake-deb.sh
View file @
d4515d13
...
...
@@ -89,6 +89,11 @@ then
sed
'/Package: mariadb-plugin-aws-key-management-10.2/,+12d'
-i
debian/control
fi
# Don't build cassandra package if thrift is not installed
if
[[
!
-f
/usr/local/include/thrift/Thrift.h
&&
!
-f
/usr/include/thrift/Thrift.h
]]
then
sed
'/Package: mariadb-plugin-cassandra/,/^$/d'
-i
debian/control
fi
# Adjust changelog, add new version
echo
"Incrementing changelog and starting build scripts"
...
...
debian/rules
View file @
d4515d13
...
...
@@ -120,11 +120,6 @@ ifneq ($(ARCH), amd64)
sed -i -e "/Package: mariadb-plugin-tokudb/,+16d" debian/control
endif
# If libthrift-dev was available (manually installed, as it is
# not in Debian) and ha_cassandra.so was thus built, create package,
# otherwise skip it.
[ -f $(BUILDDIR)/storage/cassandra/ha_cassandra.so ] || sed -i -e "/Package: mariadb-plugin-cassandra/,+18d" debian/control
# Copy systemd files to a location available for dh_installinit
cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.2.mariadb.service
cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.2.mariadb@.service
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment