Skip to content

Commit dd981f9

Browse files
ltangvaldltangvald
committed
Bug#29702765 DEBIAN MYSQL-COMMUNITY-SERVER PACKAGE CONTAINS DEBUG BINARIES
Moved debug binaries for server and test suite to separate packages Change-Id: I90fbc8b87dd212d2206090fe7bec1b179fcfee32
1 parent 46c4a60 commit dd981f9

20 files changed

+175
-43
lines changed

‎packaging/deb-in/CMakeLists.txt‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -77,33 +77,12 @@ usr/lib/mysql/plugin/thread_pool.so
7777
usr/lib/mysql/plugin/firewall.so
7878
usr/lib/mysql/plugin/component_test_page_track_component.so
7979
")
80-
# Add debug versions of commercial plugins, if enabled
81-
IF (DEFINED DEB_WITH_DEBUG)
82-
SET (DEB_INSTALL_SERVER_PLUGINS "${DEB_INSTALL_SERVER_PLUGINS}
83-
usr/lib/mysql/plugin/debug/audit_log.so
84-
usr/lib/mysql/plugin/debug/authentication_pam.so
85-
usr/lib/mysql/plugin/debug/authentication_ldap_sasl.so
86-
usr/lib/mysql/plugin/debug/authentication_ldap_simple.so
87-
usr/lib/mysql/plugin/debug/data_masking.so
88-
usr/lib/mysql/plugin/debug/keyring_okv.so
89-
usr/lib/mysql/plugin/debug/keyring_encrypted_file.so
90-
usr/lib/mysql/plugin/debug/openssl_udf.so
91-
usr/lib/mysql/plugin/debug/thread_pool.so
92-
usr/lib/mysql/plugin/debug/firewall.so
93-
usr/lib/mysql/plugin/debug/component_test_page_track_component.so
94-
")
95-
ENDIF()
9680

9781
IF (DEB_AWS_SDK)
9882
SET (DEB_CMAKE_EXTRAS "${DEB_CMAKE_EXTRAS} -DWITH_AWS_SDK=${DEB_AWS_SDK} -DDEB_AWS_SDK=${DEB_AWS_SDK}")
9983
SET (DEB_INSTALL_SERVER_PLUGINS "${DEB_INSTALL_SERVER_PLUGINS}
10084
usr/lib/mysql/plugin/keyring_aws.so
10185
")
102-
IF (DEFINED DEB_WITH_DEBUG)
103-
SET (DEB_INSTALL_SERVER_PLUGINS "${DEB_INSTALL_SERVER_PLUGINS}
104-
usr/lib/mysql/plugin/debug/keyring_aws.so
105-
")
106-
ENDIF()
10786
ENDIF()
10887

10988
IF (WITH_CURL)
@@ -131,8 +110,10 @@ override_dh_strip:
131110
dh_strip -pmysql-${DEB_PRODUCTNAME}-server-core --dbg-package=mysql-${DEB_PRODUCTNAME}-server-core-dbgsym
132111
dh_strip -pmysql-${DEB_PRODUCTNAME}-client-core --dbg-package=mysql-${DEB_PRODUCTNAME}-client-core-dbgsym
133112
dh_strip -pmysql-${DEB_PRODUCTNAME}-server --dbg-package=mysql-${DEB_PRODUCTNAME}-server-dbgsym
113+
dh_strip -pmysql-${DEB_PRODUCTNAME}-server-debug --dbg-package=mysql-${DEB_PRODUCTNAME}-server-debug-dbgsym
134114
dh_strip -pmysql-${DEB_PRODUCTNAME}-client --dbg-package=mysql-${DEB_PRODUCTNAME}-client-dbgsym
135115
dh_strip -pmysql-${DEB_PRODUCTNAME}-test --dbg-package=mysql-${DEB_PRODUCTNAME}-test-dbgsym
116+
dh_strip -pmysql-${DEB_PRODUCTNAME}-test-debug --dbg-package=mysql-${DEB_PRODUCTNAME}-test-debug-dbgsym
136117
dh_strip -pmysql-server
137118
dh_strip -pmysql-client
138119
dh_strip -pmysql-testsuite
@@ -153,6 +134,12 @@ Section: debug
153134
Depends: mysql-${DEB_PRODUCTNAME}-test (= \${binary:Version}), \${misc:Depends}
154135
Description: Debugging symbols for test suite
155136
137+
Package: mysql-${DEB_PRODUCTNAME}-test-debug-dbgsym
138+
Architecture: any
139+
Section: debug
140+
Depends: mysql-${DEB_PRODUCTNAME}-test-debug (= \${binary:Version}), \${misc:Depends}
141+
Description: Debugging symbols for test suite debug binaries
142+
156143
Package: mysql-${DEB_PRODUCTNAME}-client-core-dbgsym
157144
Architecture: any
158145
Section: debug
@@ -171,6 +158,12 @@ Section: debug
171158
Depends: mysql-${DEB_PRODUCTNAME}-server (= \${binary:Version}), \${misc:Depends}
172159
Description: Debugging symbols for server
173160
161+
Package: mysql-${DEB_PRODUCTNAME}-server-debug-dbgsym
162+
Architecture: any
163+
Section: debug
164+
Depends: mysql-${DEB_PRODUCTNAME}-server-debug (= \${binary:Version}), \${misc:Depends}
165+
Description: Debugging symbols for server debug binaries
166+
174167
Package: mysql-${DEB_PRODUCTNAME}-client-dbgsym
175168
Architecture: any
176169
Section: debug

‎packaging/deb-in/control.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ Description: MySQL Test Run MTR - The MySQL testsuite
300300
Oracle. This package contains the MySQL regression test suite for MySQL
301301
database server.
302302

303+
@DEB_CONTROL_DEBUG@
303304
@DEB_CONTROL_DBGSYM@
304305
@DEB_CONTROL_ROUTER@
305306
@DEB_NDB_CONTROL_DBGSYM@

‎packaging/deb-in/deb_debug.cmake‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SET (DEB_RULES_DEBUG_CMAKE
3333
-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \\
3434
-DINSTALL_MANDIR=share/man \\
3535
-DINSTALL_MYSQLTESTDIR=lib/mysql-test \\
36-
-DINSTALL_PLUGINDIR=lib/mysql/plugin \\
36+
-DINSTALL_PLUGINDIR=lib/mysql/plugin/debug \\
3737
-DINSTALL_SBINDIR=sbin \\
3838
-DSYSCONFDIR=/etc/mysql \\
3939
-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \\
@@ -177,3 +177,41 @@ usr/lib/mysql/plugin/debug/component_pfs_example.so
177177
usr/lib/mysql/plugin/debug/component_mysqlx_global_reset.so
178178
usr/lib/mysql/plugin/debug/component_test_audit_api_message.so
179179
")
180+
181+
IF (DEB_PRODUCT STREQUAL "commercial")
182+
# Add debug versions of commercial plugins, if enabled
183+
IF (DEFINED DEB_WITH_DEBUG)
184+
SET (DEB_INSTALL_DEBUG_SERVER_PLUGINS "${DEB_INSTALL_DEBUG_SERVER_PLUGINS}
185+
usr/lib/mysql/plugin/debug/audit_log.so
186+
usr/lib/mysql/plugin/debug/authentication_pam.so
187+
usr/lib/mysql/plugin/debug/authentication_ldap_sasl.so
188+
usr/lib/mysql/plugin/debug/authentication_ldap_simple.so
189+
usr/lib/mysql/plugin/debug/data_masking.so
190+
usr/lib/mysql/plugin/debug/keyring_okv.so
191+
usr/lib/mysql/plugin/debug/keyring_encrypted_file.so
192+
usr/lib/mysql/plugin/debug/openssl_udf.so
193+
usr/lib/mysql/plugin/debug/thread_pool.so
194+
usr/lib/mysql/plugin/debug/firewall.so
195+
usr/lib/mysql/plugin/debug/component_test_page_track_component.so
196+
")
197+
ENDIF()
198+
IF (DEB_AWS_SDK)
199+
SET (DEB_INSTALL_DEBUG_SERVER_PLUGINS "${DEB_INSTALL_DEBUG_SERVER_PLUGINS}
200+
usr/lib/mysql/plugin/debug/keyring_aws.so
201+
")
202+
ENDIF()
203+
ENDIF()
204+
SET (DEB_CONTROL_DEBUG
205+
"
206+
Package: mysql-${DEB_PRODUCTNAME}-server-debug
207+
Architecture: any
208+
Section: debug
209+
Depends: \${misc:Depends}
210+
Description: Debug binaries for MySQL Server
211+
212+
Package: mysql-${DEB_PRODUCTNAME}-test-debug
213+
Architecture: any
214+
Section: debug
215+
Depends: mysql-${DEB_PRODUCTNAME}-test, \${misc:Depends}
216+
Description: Debug binaries for MySQL Testsuite
217+
")

‎packaging/deb-in/libmysqlclient21-dbgsym.install.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License, version 2.0,
@@ -21,5 +21,5 @@
2121
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2222

2323
# legal
24-
usr/share/mysql-@MYSQL_BASE_VERSION@/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/libmysqlclient21-dbgsym/
24+
usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/libmysqlclient21-dbgsym/
2525
usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient21-dbgsym/

‎packaging/deb-in/mysql-packagesource-client-core-dbgsym.install.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License, version 2.0,
@@ -21,5 +21,5 @@
2121
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2222

2323
# legal
24-
usr/share/mysql-@MYSQL_BASE_VERSION@/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-core-dbgsym/
24+
usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-core-dbgsym/
2525
usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-core-dbgsym/

‎packaging/deb-in/mysql-packagesource-client-dbgsym.install.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License, version 2.0,
@@ -21,6 +21,6 @@
2121
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2222

2323
# legal
24-
usr/share/mysql-@MYSQL_BASE_VERSION@/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-dbgsym/
24+
usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-dbgsym/
2525
usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-dbgsym/
2626

‎packaging/deb-in/mysql-packagesource-data-node-dbgsym.install.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
# legal
17-
usr/share/mysql-@MYSQL_BASE_VERSION@/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-data-node-dbgsym/
17+
usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-data-node-dbgsym/
1818
usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-data-node-dbgsym/
1919

‎packaging/deb-in/mysql-packagesource-management-server-dbgsym.install.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
# legal
17-
usr/share/mysql-@MYSQL_BASE_VERSION@/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-management-server-dbgsym/
17+
usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-management-server-dbgsym/
1818
usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-management-server-dbgsym/
1919

‎packaging/deb-in/mysql-packagesource-memcached-dbgsym.install.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
# legal
17-
usr/share/mysql-@MYSQL_BASE_VERSION@/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-memcached-dbgsym/
17+
usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-memcached-dbgsym/
1818
usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-memcached-dbgsym/
1919

‎packaging/deb-in/mysql-packagesource-nodejs-dbgsym.install.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
# legal
17-
usr/share/mysql-@MYSQL_BASE_VERSION@/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-nodejs-dbgsym/
17+
usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-nodejs-dbgsym/
1818
usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-nodejs-dbgsym/
1919

0 commit comments

Comments
 (0)