mariadb: package executables named with mariadb

After mariadb upgrades to 10.5.x, the below commit introduced:
9e1b3af4a49 MDEV-21303 Make executables MariaDB named

Before the above commit:
 $ ls -l tmp-glibc/work/core2-64-wrs-linux/mariadb/10.4.12-r0/build/scripts/mysql_install_db
 -rwxr-xr-x 1 myu users 21649 Aug 20 10:36 tmp-glibc/work/core2-64-wrs-linux/mariadb/10.4.12-r0/build/scripts/mysql_install_db
 $ ls -l tmp-glibc/work/core2-64-wrs-linux/mariadb/10.4.12-r0/build/scripts/mariadb-install-db
 lrwxrwxrwx 1 myu users 16 Aug 20 10:36 tmp-glibc/work/core2-64-wrs-linux/mariadb/10.4.12-r0/build/scripts/mariadb-install-db -> mysql_install_db

After the above commit:
 $ ls -l tmp-glibc/work/corei7-64-wrs-linux/mariadb/10.5.4-r0/build/scripts/mysql_install_db
 lrwxrwxrwx 1 myu users 18 Aug 19 15:02 tmp-glibc/work/corei7-64-wrs-linux/mariadb/10.5.4-r0/build/scripts/mysql_install_db -> mariadb-install-db
 $ ls -l tmp-glibc/work/corei7-64-wrs-linux/mariadb/10.5.4-r0/build/scripts/mariadb-install-db
 -rwxr-xr-x 1 myu users 21630 Aug 19 15:02 tmp-glibc/work/corei7-64-wrs-linux/mariadb/10.5.4-r0/build/scripts/mariadb-install-db

So package the corresponding mariadb named executables to -server and
-client packages and also correct MULTILIB_SCRIPTS part accordingly.

Also cleanup some deprecated files defined for mariadb-server
and mariadb-client.

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Mingli Yu
2020-08-20 00:32:28 -07:00
committed by Khem Raj
parent ae39f2e711
commit e6d770e0f2
+31 -21
View File
@@ -31,7 +31,8 @@ BINCONFIG_GLOB = "mysql_config"
inherit cmake gettext binconfig update-rc.d useradd systemd multilib_script inherit cmake gettext binconfig update-rc.d useradd systemd multilib_script
MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mysql_install_db ${PN}-server:${bindir}/mysqld_safe" MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \
${PN}-server:${bindir}/mariadb-install-db"
INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb"
INITSCRIPT_NAME_${PN}-server = "mysqld" INITSCRIPT_NAME_${PN}-server = "mysqld"
@@ -243,69 +244,78 @@ FILES_libmysqld-dev = "\
FILES_${PN}-client = "\ FILES_${PN}-client = "\
${bindir}/myisam_ftdump \ ${bindir}/myisam_ftdump \
${bindir}/mysql \ ${bindir}/mysql \
${bindir}/mariadb \
${bindir}/mysql_client_test \ ${bindir}/mysql_client_test \
${bindir}/mariadb-client-test \
${bindir}/mysql_client_test_embedded \ ${bindir}/mysql_client_test_embedded \
${bindir}/mariadb-client-test-embedded \
${bindir}/mysql_find_rows \ ${bindir}/mysql_find_rows \
${bindir}/mariadb-find-rows \
${bindir}/mysql_fix_extensions \ ${bindir}/mysql_fix_extensions \
${bindir}/mariadb-fix-extensions \
${bindir}/mysql_waitpid \ ${bindir}/mysql_waitpid \
${bindir}/mariadb-waitpid \
${bindir}/mysqlaccess \ ${bindir}/mysqlaccess \
${bindir}/mariadb-access \
${bindir}/mysqladmin \ ${bindir}/mysqladmin \
${bindir}/mysqlbug \ ${bindir}/mariadb-admin \
${bindir}/mysqlcheck \ ${bindir}/mysqlcheck \
${bindir}/mariadb-check \
${bindir}/mysqldump \ ${bindir}/mysqldump \
${bindir}/mariadb-dump \
${bindir}/mysqldumpslow \ ${bindir}/mysqldumpslow \
${bindir}/mariadb-dumpslow \
${bindir}/mysqlimport \ ${bindir}/mysqlimport \
${bindir}/mariadb-import \
${bindir}/mysqlshow \ ${bindir}/mysqlshow \
${bindir}/mariadb-show \
${bindir}/mysqlslap \ ${bindir}/mysqlslap \
${bindir}/mariadb-slap \
${bindir}/mysqltest_embedded \ ${bindir}/mysqltest_embedded \
${bindir}/mariadb-test-embedded \
${libexecdir}/mysqlmanager \ ${libexecdir}/mysqlmanager \
${sysconfdir}/my.cnf.d/mysql-clients.cnf" ${sysconfdir}/my.cnf.d/mysql-clients.cnf"
FILES_${PN}-server = "\ FILES_${PN}-server = "\
${bindir}/comp_err \
${bindir}/isamchk \
${bindir}/isamlog \
${bindir}/msql2mysql \ ${bindir}/msql2mysql \
${bindir}/my_print_defaults \ ${bindir}/my_print_defaults \
${bindir}/myisamchk \ ${bindir}/myisamchk \
${bindir}/myisamlog \ ${bindir}/myisamlog \
${bindir}/myisampack \ ${bindir}/myisampack \
${bindir}/mysql_convert_table_format \ ${bindir}/mysql_convert_table_format \
${bindir}/mysql_fix_privilege_tables \ ${bindir}/mariadb-convert-table-format \
${bindir}/mysql_install_db \ ${bindir}/mysql_install_db \
${bindir}/mariadb-install-db \
${bindir}/mysql_secure_installation \ ${bindir}/mysql_secure_installation \
${bindir}/mariadb-secure-installation \
${bindir}/mysql_setpermission \ ${bindir}/mysql_setpermission \
${bindir}/mariadb-setpermission \
${bindir}/mysql-systemd-start \ ${bindir}/mysql-systemd-start \
${bindir}/mysql_tzinfo_to_sql \ ${bindir}/mysql_tzinfo_to_sql \
${bindir}/mariadb-tzinfo-to-sql \
${bindir}/mysql_upgrade \ ${bindir}/mysql_upgrade \
${bindir}/mariadb-upgrade \
${bindir}/mysql_plugin \ ${bindir}/mysql_plugin \
${bindir}/mysql_zap \ ${bindir}/mariadb-plugin \
${bindir}/mysqlbinlog \ ${bindir}/mysqlbinlog \
${bindir}/mariadb-binlog \
${bindir}/mysqld_multi \ ${bindir}/mysqld_multi \
${bindir}/mariadbd-multi \
${bindir}/mariadbd-safe \
${bindir}/mysqld_safe \ ${bindir}/mysqld_safe \
${bindir}/mysqld_safe_helper \ ${bindir}/mysqld_safe_helper \
${bindir}/mariadbd-safe-helper \
${bindir}/mysqlhotcopy \ ${bindir}/mysqlhotcopy \
${bindir}/mariadb-hotcopy \
${bindir}/mysqltest \ ${bindir}/mysqltest \
${bindir}/ndb_delete_all \ ${bindir}/mariadb-test \
${bindir}/ndb_desc \
${bindir}/ndb_drop_index \
${bindir}/ndb_drop_table \
${bindir}/ndb_mgm \
${bindir}/ndb_restore \
${bindir}/ndb_select_all \
${bindir}/ndb_select_count \
${bindir}/ndb_show_tables \
${bindir}/ndb_waiter \
${bindir}/pack_isam \
${bindir}/perror \ ${bindir}/perror \
${bindir}/replace \ ${bindir}/replace \
${bindir}/resolve_stack_dump \ ${bindir}/resolve_stack_dump \
${bindir}/resolveip \ ${bindir}/resolveip \
${libexecdir}/mysqld \ ${libexecdir}/mysqld \
${sbindir}/mysqld \ ${sbindir}/mysqld \
${sbindir}/ndb_cpcd \ ${sbindir}/mariadbd \
${sbindir}/ndbd \
${sbindir}/ndb_mgmd \
${libdir}/plugin/*.so \ ${libdir}/plugin/*.so \
${libdir}/security/*.so \ ${libdir}/security/*.so \
${libdir}/plugin/auth_pam_tool_dir/auth_pam_tool \ ${libdir}/plugin/auth_pam_tool_dir/auth_pam_tool \