Percona Server moved to https://jira.percona.com/projects/PS

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

  1. bug1290087-5.6
  2. Merge into 5.6
Proposed by Tomislav Plavcic
Status: Merged
Approved by: Tomislav Plavcic
Approved revision: no longer in the source branch.
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.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Same comment as for 5.5.

review: Needs Fixing
Revision history for this message
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.

Revision history for this message
Tomislav Plavcic (tplavcic) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'build-ps/debian/percona-server-server-5.6.files'
--- build-ps/debian/percona-server-server-5.6.files 2014-04-25 10:55:01 +0000
+++ build-ps/debian/percona-server-server-5.6.files 2014-08-26 14:07:09 +0000
@@ -23,6 +23,7 @@
23usr/bin/resolve_stack_dump23usr/bin/resolve_stack_dump
24usr/bin/resolveip24usr/bin/resolveip
25usr/sbin/mysqld25usr/sbin/mysqld
26usr/sbin/mysqld-debug
26usr/share/man/man1/msql2mysql.127usr/share/man/man1/msql2mysql.1
27usr/share/man/man1/myisamchk.128usr/share/man/man1/myisamchk.1
28usr/share/man/man1/myisamlog.129usr/share/man/man1/myisamlog.1
2930
=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules 2014-07-03 13:07:28 +0000
+++ build-ps/debian/rules 2014-08-26 14:07:09 +0000
@@ -7,8 +7,10 @@
7PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'7PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'
8REVISION = '@@REVISION@@'8REVISION = '@@REVISION@@'
9COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"9COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
10COMPILATION_COMMENT_DEBUG = "Percona Server - Debug (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
1011
11TMP=$(CURDIR)/debian/tmp/12TMP=$(CURDIR)/debian/tmp/
13TMPD=$(CURDIR)/debian/tmp-debug/
12prefix=/usr14prefix=/usr
1315
14ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)16ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
@@ -49,6 +51,7 @@
49endif51endif
5052
51builddir = builddir53builddir = builddir
54builddebug = debug
5255
53configure: patch configure-stamp56configure: patch configure-stamp
5457
@@ -62,6 +65,34 @@
6265
63 [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml66 [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml
6467
68ifeq ($(SKIP_DEBUG_BINARY),)
69 ( test -d $(builddebug) || mkdir $(builddebug) ) && cd $(builddebug) && \
70 sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
71 CC=$${MYSQL_BUILD_CC:-gcc} \
72 CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -g -fno-strict-aliasing"} \
73 CXX=$${MYSQL_BUILD_CXX:-g++} \
74 CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -g -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing"} \
75 cmake -DCMAKE_INSTALL_PREFIX=/usr \
76 \
77 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
78 -DCMAKE_BUILD_TYPE=Debug \
79 -DWITH_LIBWRAP=ON \
80 -DWITH_ZLIB=system \
81 -DWITH_SSL=system \
82 -DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_DEBUG) \
83 -DSYSTEM_TYPE="debian-linux-gnu" \
84 -DINSTALL_LAYOUT=RPM \
85 -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
86 -DINSTALL_PLUGINDIR=lib/mysql/plugin/debug \
87 -DWITH_EMBEDDED_SERVER=OFF \
88 -DWITH_INNODB_MEMCACHED=ON \
89 -DWITH_ARCHIVE_STORAGE_ENGINE=ON \
90 -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
91 -DWITH_FEDERATED_STORAGE_ENGINE=ON \
92 -DWITH_PAM=ON \
93 -DWITH_EXTRA_CHARSETS=all ..'
94endif
95
65 ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \96 ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
66 sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \97 sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
67 CC=$${MYSQL_BUILD_CC:-gcc} \98 CC=$${MYSQL_BUILD_CC:-gcc} \
@@ -101,6 +132,10 @@
101 --exclude=debian . \132 --exclude=debian . \
102 --transform="s,^\./,percona-server-5.6/,"133 --transform="s,^\./,percona-server-5.6/,"
103134
135ifeq ($(SKIP_DEBUG_BINARY),)
136 cd $(builddebug) && $(MAKE) -j$(NCPU)
137endif
138
104 cd $(builddir) && $(MAKE) -j$(NCPU) VERBOSE=1139 cd $(builddir) && $(MAKE) -j$(NCPU) VERBOSE=1
105140
106ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)141ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
@@ -135,6 +170,7 @@
135 [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml170 [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml
136 171
137 rm -rf $(builddir)172 rm -rf $(builddir)
173 rm -rf $(builddebug)
138174
139 debconf-updatepo175 debconf-updatepo
140 # rm -f $(EXPORTED_SOURCE_TARBALL)176 # rm -f $(EXPORTED_SOURCE_TARBALL)
@@ -149,6 +185,7 @@
149 dh_installdirs185 dh_installdirs
150186
151 # make install (trailing slash needed for innobase)187 # make install (trailing slash needed for innobase)
188 (cd $(builddebug) && $(MAKE) install DESTDIR=$(TMPD)/)
152 (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)189 (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)
153190
154 # After installing, remove rpath to make lintian happy.191 # After installing, remove rpath to make lintian happy.
155192
=== modified file 'build-ps/debian/rules.tokudb'
--- build-ps/debian/rules.tokudb 2014-07-03 13:07:28 +0000
+++ build-ps/debian/rules.tokudb 2014-08-26 14:07:09 +0000
@@ -7,8 +7,10 @@
7PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'7PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'
8REVISION = '@@REVISION@@'8REVISION = '@@REVISION@@'
9COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"9COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
10COMPILATION_COMMENT_DEBUG = "Percona Server - Debug (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
1011
11TMP=$(CURDIR)/debian/tmp/12TMP=$(CURDIR)/debian/tmp/
13TMPD=$(CURDIR)/debian/tmp-debug/
12prefix=/usr14prefix=/usr
1315
14ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)16ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
@@ -49,6 +51,7 @@
49endif51endif
5052
51builddir = builddir53builddir = builddir
54builddebug = debug
5255
53configure: patch configure-stamp56configure: patch configure-stamp
5457
@@ -62,6 +65,35 @@
6265
63 [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml66 [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml
6467
68ifeq ($(SKIP_DEBUG_BINARY),)
69 ( test -d $(builddebug) || mkdir $(builddebug) ) && cd $(builddebug) && \
70 sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
71 CC=$${MYSQL_BUILD_CC:-gcc} \
72 CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -g -fno-strict-aliasing"} \
73 CXX=$${MYSQL_BUILD_CXX:-g++} \
74 CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -g -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing"} \
75 cmake -DCMAKE_INSTALL_PREFIX=/usr \
76 \
77 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
78 -DCMAKE_BUILD_TYPE=Debug \
79 -DWITH_LIBWRAP=ON \
80 -DWITH_ZLIB=system \
81 -DWITH_SSL=system \
82 -DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_DEBUG) \
83 -DSYSTEM_TYPE="debian-linux-gnu" \
84 -DINSTALL_LAYOUT=RPM \
85 -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
86 -DINSTALL_PLUGINDIR=lib/mysql/plugin/debug \
87 -DWITH_EMBEDDED_SERVER=OFF \
88 -DWITH_INNODB_MEMCACHED=ON \
89 -DWITH_ARCHIVE_STORAGE_ENGINE=ON \
90 -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
91 -DWITH_FEDERATED_STORAGE_ENGINE=ON \
92 -DWITH_PAM=ON -DWITH_EXTRA_CHARSETS=all \
93 -DWITH_VALGRIND=OFF -DUSE_VALGRIND=OFF -DDEBUG_EXTNAME=OFF -DBUILD_TESTING=OFF -DUSE_GTAGS=OFF \
94 -DUSE_CTAGS=OFF -DUSE_ETAGS=OFF -DUSE_CSCOPE=OFF -DTOKU_DEBUG_PARANOID=ON ..'
95endif
96
65 ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \97 ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
66 sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \98 sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
67 CC=$${MYSQL_BUILD_CC:-gcc} \99 CC=$${MYSQL_BUILD_CC:-gcc} \
@@ -103,6 +135,10 @@
103 --exclude=debian . \135 --exclude=debian . \
104 --transform="s,^\./,percona-server-5.6/,"136 --transform="s,^\./,percona-server-5.6/,"
105137
138ifeq ($(SKIP_DEBUG_BINARY),)
139 cd $(builddebug) && $(MAKE) -j$(NCPU)
140endif
141
106 cd $(builddir) && $(MAKE) -j$(NCPU) VERBOSE=1142 cd $(builddir) && $(MAKE) -j$(NCPU) VERBOSE=1
107143
108ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)144ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
@@ -137,6 +173,7 @@
137 [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml173 [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml
138 174
139 rm -rf $(builddir)175 rm -rf $(builddir)
176 rm -rf $(builddebug)
140177
141 debconf-updatepo178 debconf-updatepo
142 # rm -f $(EXPORTED_SOURCE_TARBALL)179 # rm -f $(EXPORTED_SOURCE_TARBALL)
@@ -151,8 +188,9 @@
151 dh_installdirs188 dh_installdirs
152189
153 # make install (trailing slash needed for innobase)190 # make install (trailing slash needed for innobase)
191 (cd $(builddebug) && $(MAKE) install DESTDIR=$(TMPD)/)
154 (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)192 (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)
155 193
156 # After installing, remove rpath to make lintian happy.194 # After installing, remove rpath to make lintian happy.
157 set +e; \195 set +e; \
158 find ./debian/tmp/ -type f -print0 \196 find ./debian/tmp/ -type f -print0 \

Subscribers

People subscribed via source and target branches