Merge lp:~tplavcic/percona-server/bug1290087-5.6 into lp:percona-server/5.6

Proposed by Tomislav Plavcic
Status: Merged
Approved by: Tomislav Plavcic
Approved revision: 649
Merged at revision: 653
Proposed branch: lp:~tplavcic/percona-server/bug1290087-5.6
Merge into: lp:percona-server/5.6
Diff against target: 185 lines (+77/-1)
3 files modified
build-ps/debian/percona-server-server-5.6.files (+1/-0)
build-ps/debian/rules (+37/-0)
build-ps/debian/rules.tokudb (+39/-1)
To merge this branch: bzr merge lp:~tplavcic/percona-server/bug1290087-5.6
Reviewer Review Type Date Requested Status
Tomislav Plavcic Approve
Review via email: mp+232225@code.launchpad.net

This proposal supersedes a proposal from 2014-08-25.

Description of the change

Build for mysqld-debug and plugin/debug has been added to debian packages.
Test was done by building packages and inspecting content to see if files are in place.
Note that in the jenkins links first job for 5.6 has failed on ubuntu-precise but that is because
of the older version of cmake on that host (JEN-256 has been opened for this).
If param job needs to be runned for this change please notify me.

5.5 packages
http://jenkins.percona.com/view/TEST/job/percona-server-5.5-debian-binary-test/

5.6 packages
http://jenkins.percona.com/view/TEST/job/percona-server-5.6-debian-binary-test/
http://jenkins.percona.com/view/TEST/job/percona-server-5.6-debian-binary-32-test/

To post a comment you must log in.
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Same comment as for 5.5.

review: Needs Fixing
Tomislav Plavcic (tplavcic) wrote : Posted in a previous version of this proposal

As discussed over IRC opened https://bugs.launchpad.net/percona-server/+bug/1361658
for -DWITH_DEBUG=ON as this MP will be merged without it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build-ps/debian/percona-server-server-5.6.files'
2--- build-ps/debian/percona-server-server-5.6.files 2014-04-25 10:55:01 +0000
3+++ build-ps/debian/percona-server-server-5.6.files 2014-08-26 14:07:09 +0000
4@@ -23,6 +23,7 @@
5 usr/bin/resolve_stack_dump
6 usr/bin/resolveip
7 usr/sbin/mysqld
8+usr/sbin/mysqld-debug
9 usr/share/man/man1/msql2mysql.1
10 usr/share/man/man1/myisamchk.1
11 usr/share/man/man1/myisamlog.1
12
13=== modified file 'build-ps/debian/rules'
14--- build-ps/debian/rules 2014-07-03 13:07:28 +0000
15+++ build-ps/debian/rules 2014-08-26 14:07:09 +0000
16@@ -7,8 +7,10 @@
17 PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'
18 REVISION = '@@REVISION@@'
19 COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
20+COMPILATION_COMMENT_DEBUG = "Percona Server - Debug (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
21
22 TMP=$(CURDIR)/debian/tmp/
23+TMPD=$(CURDIR)/debian/tmp-debug/
24 prefix=/usr
25
26 ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
27@@ -49,6 +51,7 @@
28 endif
29
30 builddir = builddir
31+builddebug = debug
32
33 configure: patch configure-stamp
34
35@@ -62,6 +65,34 @@
36
37 [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml
38
39+ifeq ($(SKIP_DEBUG_BINARY),)
40+ ( test -d $(builddebug) || mkdir $(builddebug) ) && cd $(builddebug) && \
41+ sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
42+ CC=$${MYSQL_BUILD_CC:-gcc} \
43+ CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -g -fno-strict-aliasing"} \
44+ CXX=$${MYSQL_BUILD_CXX:-g++} \
45+ CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -g -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing"} \
46+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
47+ \
48+ -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
49+ -DCMAKE_BUILD_TYPE=Debug \
50+ -DWITH_LIBWRAP=ON \
51+ -DWITH_ZLIB=system \
52+ -DWITH_SSL=system \
53+ -DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_DEBUG) \
54+ -DSYSTEM_TYPE="debian-linux-gnu" \
55+ -DINSTALL_LAYOUT=RPM \
56+ -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
57+ -DINSTALL_PLUGINDIR=lib/mysql/plugin/debug \
58+ -DWITH_EMBEDDED_SERVER=OFF \
59+ -DWITH_INNODB_MEMCACHED=ON \
60+ -DWITH_ARCHIVE_STORAGE_ENGINE=ON \
61+ -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
62+ -DWITH_FEDERATED_STORAGE_ENGINE=ON \
63+ -DWITH_PAM=ON \
64+ -DWITH_EXTRA_CHARSETS=all ..'
65+endif
66+
67 ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
68 sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
69 CC=$${MYSQL_BUILD_CC:-gcc} \
70@@ -101,6 +132,10 @@
71 --exclude=debian . \
72 --transform="s,^\./,percona-server-5.6/,"
73
74+ifeq ($(SKIP_DEBUG_BINARY),)
75+ cd $(builddebug) && $(MAKE) -j$(NCPU)
76+endif
77+
78 cd $(builddir) && $(MAKE) -j$(NCPU) VERBOSE=1
79
80 ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
81@@ -135,6 +170,7 @@
82 [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml
83
84 rm -rf $(builddir)
85+ rm -rf $(builddebug)
86
87 debconf-updatepo
88 # rm -f $(EXPORTED_SOURCE_TARBALL)
89@@ -149,6 +185,7 @@
90 dh_installdirs
91
92 # make install (trailing slash needed for innobase)
93+ (cd $(builddebug) && $(MAKE) install DESTDIR=$(TMPD)/)
94 (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)
95
96 # After installing, remove rpath to make lintian happy.
97
98=== modified file 'build-ps/debian/rules.tokudb'
99--- build-ps/debian/rules.tokudb 2014-07-03 13:07:28 +0000
100+++ build-ps/debian/rules.tokudb 2014-08-26 14:07:09 +0000
101@@ -7,8 +7,10 @@
102 PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'
103 REVISION = '@@REVISION@@'
104 COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
105+COMPILATION_COMMENT_DEBUG = "Percona Server - Debug (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
106
107 TMP=$(CURDIR)/debian/tmp/
108+TMPD=$(CURDIR)/debian/tmp-debug/
109 prefix=/usr
110
111 ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
112@@ -49,6 +51,7 @@
113 endif
114
115 builddir = builddir
116+builddebug = debug
117
118 configure: patch configure-stamp
119
120@@ -62,6 +65,35 @@
121
122 [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml
123
124+ifeq ($(SKIP_DEBUG_BINARY),)
125+ ( test -d $(builddebug) || mkdir $(builddebug) ) && cd $(builddebug) && \
126+ sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
127+ CC=$${MYSQL_BUILD_CC:-gcc} \
128+ CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -g -fno-strict-aliasing"} \
129+ CXX=$${MYSQL_BUILD_CXX:-g++} \
130+ CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -g -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing"} \
131+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
132+ \
133+ -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
134+ -DCMAKE_BUILD_TYPE=Debug \
135+ -DWITH_LIBWRAP=ON \
136+ -DWITH_ZLIB=system \
137+ -DWITH_SSL=system \
138+ -DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_DEBUG) \
139+ -DSYSTEM_TYPE="debian-linux-gnu" \
140+ -DINSTALL_LAYOUT=RPM \
141+ -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
142+ -DINSTALL_PLUGINDIR=lib/mysql/plugin/debug \
143+ -DWITH_EMBEDDED_SERVER=OFF \
144+ -DWITH_INNODB_MEMCACHED=ON \
145+ -DWITH_ARCHIVE_STORAGE_ENGINE=ON \
146+ -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
147+ -DWITH_FEDERATED_STORAGE_ENGINE=ON \
148+ -DWITH_PAM=ON -DWITH_EXTRA_CHARSETS=all \
149+ -DWITH_VALGRIND=OFF -DUSE_VALGRIND=OFF -DDEBUG_EXTNAME=OFF -DBUILD_TESTING=OFF -DUSE_GTAGS=OFF \
150+ -DUSE_CTAGS=OFF -DUSE_ETAGS=OFF -DUSE_CSCOPE=OFF -DTOKU_DEBUG_PARANOID=ON ..'
151+endif
152+
153 ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
154 sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
155 CC=$${MYSQL_BUILD_CC:-gcc} \
156@@ -103,6 +135,10 @@
157 --exclude=debian . \
158 --transform="s,^\./,percona-server-5.6/,"
159
160+ifeq ($(SKIP_DEBUG_BINARY),)
161+ cd $(builddebug) && $(MAKE) -j$(NCPU)
162+endif
163+
164 cd $(builddir) && $(MAKE) -j$(NCPU) VERBOSE=1
165
166 ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
167@@ -137,6 +173,7 @@
168 [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml
169
170 rm -rf $(builddir)
171+ rm -rf $(builddebug)
172
173 debconf-updatepo
174 # rm -f $(EXPORTED_SOURCE_TARBALL)
175@@ -151,8 +188,9 @@
176 dh_installdirs
177
178 # make install (trailing slash needed for innobase)
179+ (cd $(builddebug) && $(MAKE) install DESTDIR=$(TMPD)/)
180 (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)
181-
182+
183 # After installing, remove rpath to make lintian happy.
184 set +e; \
185 find ./debian/tmp/ -type f -print0 \

Subscribers

People subscribed via source and target branches