From 338080c74ccfc18667fb3eca40518336521ab4df Mon Sep 17 00:00:00 2001 From: Zhijie Yang Date: Tue, 30 Jul 2024 12:28:31 +0200 Subject: [PATCH 1/3] feat(24.04): add mysql for 24.04 --- slices/libaio1t64.yaml | 15 +++++++ slices/libevent-core-2.1-7t64.yaml | 15 +++++++ slices/libevent-pthreads-2.1-7t64.yaml | 16 +++++++ slices/libmecab2.yaml | 19 +++++++++ slices/libprotobuf-lite32t64.yaml | 17 ++++++++ slices/mysql-client-8.0.yaml | 17 ++++++++ slices/mysql-client-core-8.0.yaml | 32 ++++++++++++++ slices/mysql-common.yaml | 15 +++++++ slices/mysql-server-8.0.yaml | 53 +++++++++++++++++++++++ slices/mysql-server-core-8.0.yaml | 58 ++++++++++++++++++++++++++ 10 files changed, 257 insertions(+) create mode 100644 slices/libaio1t64.yaml create mode 100644 slices/libevent-core-2.1-7t64.yaml create mode 100644 slices/libevent-pthreads-2.1-7t64.yaml create mode 100644 slices/libmecab2.yaml create mode 100644 slices/libprotobuf-lite32t64.yaml create mode 100644 slices/mysql-client-8.0.yaml create mode 100644 slices/mysql-client-core-8.0.yaml create mode 100644 slices/mysql-common.yaml create mode 100644 slices/mysql-server-8.0.yaml create mode 100644 slices/mysql-server-core-8.0.yaml diff --git a/slices/libaio1t64.yaml b/slices/libaio1t64.yaml new file mode 100644 index 000000000..385e43e1a --- /dev/null +++ b/slices/libaio1t64.yaml @@ -0,0 +1,15 @@ +package: libaio1t64 + +essential: + - libaio1t64_copyright + +slices: + libs: + essential: + - libc6_libs + contents: + /usr/lib/*-linux-*/libaio.so.1t64*: + + copyright: + contents: + /usr/share/doc/libaio1t64/copyright: diff --git a/slices/libevent-core-2.1-7t64.yaml b/slices/libevent-core-2.1-7t64.yaml new file mode 100644 index 000000000..ed55b4460 --- /dev/null +++ b/slices/libevent-core-2.1-7t64.yaml @@ -0,0 +1,15 @@ +package: libevent-core-2.1-7t64 + +essential: + - libevent-core-2.1-7t64_copyright + +slices: + libs: + essential: + - libc6_libs + contents: + /usr/lib/*-linux-*/libevent_core-2.1.so*: + + copyright: + contents: + /usr/share/doc/libevent-core-2.1-7t64/copyright: diff --git a/slices/libevent-pthreads-2.1-7t64.yaml b/slices/libevent-pthreads-2.1-7t64.yaml new file mode 100644 index 000000000..788de9842 --- /dev/null +++ b/slices/libevent-pthreads-2.1-7t64.yaml @@ -0,0 +1,16 @@ +package: libevent-pthreads-2.1-7t64 + +essential: + - libevent-pthreads-2.1-7t64_copyright + +slices: + libs: + essential: + - libc6_libs + - libevent-core-2.1-7t64_libs + contents: + /usr/lib/*-linux-*/libevent_pthreads-2.1.so.7*: + + copyright: + contents: + /usr/share/doc/libevent-pthreads-2.1-7t64/copyright: diff --git a/slices/libmecab2.yaml b/slices/libmecab2.yaml new file mode 100644 index 000000000..4240b4dd4 --- /dev/null +++ b/slices/libmecab2.yaml @@ -0,0 +1,19 @@ +package: libmecab2 +essential: + - libmecab2_copyright +slices: + libs: + essential: + - libc6_libs + - libgcc-s1_libs + - libstdc++6_libs + contents: + /usr/lib/*-linux-*/libmecab.so.2*: + + config: + contents: + /etc/mecabrc: + + copyright: + contents: + /usr/share/doc/libmecab2/copyright: diff --git a/slices/libprotobuf-lite32t64.yaml b/slices/libprotobuf-lite32t64.yaml new file mode 100644 index 000000000..7ce4db5df --- /dev/null +++ b/slices/libprotobuf-lite32t64.yaml @@ -0,0 +1,17 @@ +package: libprotobuf-lite32t64 + +essential: + - libprotobuf-lite32t64_copyright + +slices: + libs: + essential: + - libc6_libs + - libgcc-s1_libs + - libstdc++6_libs + contents: + /usr/lib/*-linux-*/libprotobuf-lite.so.32*: + + copyright: + contents: + /usr/share/doc/libprotobuf-lite32t64/copyright: diff --git a/slices/mysql-client-8.0.yaml b/slices/mysql-client-8.0.yaml new file mode 100644 index 000000000..9d070f1a7 --- /dev/null +++ b/slices/mysql-client-8.0.yaml @@ -0,0 +1,17 @@ +package: mysql-client-8.0 +essential: + - mysql-client-8.0_copyright +slices: + bins: + essential: + - mysql-client-core-8.0_bins + - mysql-common_config + contents: + /usr/bin/mysqlanalyze: + /usr/bin/mysqloptimize: + /usr/bin/mysqlrepair: + /usr/bin/mysqlreport: + + copyright: + contents: + /usr/share/doc/mysql-client-8.0/copyright: diff --git a/slices/mysql-client-core-8.0.yaml b/slices/mysql-client-core-8.0.yaml new file mode 100644 index 000000000..c4fe4cb1f --- /dev/null +++ b/slices/mysql-client-core-8.0.yaml @@ -0,0 +1,32 @@ +package: mysql-client-core-8.0 + +essential: + - mysql-client-core-8.0_copyright + +slices: + bins: + essential: + - libc6_libs + - libedit2_libs + - libgcc-s1_libs + - liblz4-1_libs + - libssl3t64_libs + - libstdc++6_libs + - libzstd1_libs + - zlib1g_libs + contents: + /usr/bin/myisam_ftdump: + /usr/bin/mysql: + /usr/bin/mysql_config_editor: + /usr/bin/mysqladmin: + /usr/bin/mysqlcheck: + /usr/bin/mysqldump: + /usr/bin/mysqldumpslow: + /usr/bin/mysqlimport: + /usr/bin/mysqlpump: + /usr/bin/mysqlshow: + /usr/bin/mysqlslap: + + copyright: + contents: + /usr/share/doc/mysql-client-core-8.0/copyright: diff --git a/slices/mysql-common.yaml b/slices/mysql-common.yaml new file mode 100644 index 000000000..9fbb74b19 --- /dev/null +++ b/slices/mysql-common.yaml @@ -0,0 +1,15 @@ +package: mysql-common + +essential: + - mysql-common_copyright + +slices: + config: + contents: + /etc/mysql/conf.d/*.cnf: + /etc/mysql/*.cnf.fallback: + /usr/share/mysql-common/configure-symlinks: + + copyright: + contents: + /usr/share/doc/mysql-common/copyright: diff --git a/slices/mysql-server-8.0.yaml b/slices/mysql-server-8.0.yaml new file mode 100644 index 000000000..b6ad223d7 --- /dev/null +++ b/slices/mysql-server-8.0.yaml @@ -0,0 +1,53 @@ +package: mysql-server-8.0 + +essential: + - mysql-server-8.0_copyright + +slices: + bins: + essential: + - lsb-base_bins + - mysql-client-8.0_bins + - mysql-common_config + - mysql-server-8.0_config + - mysql-server-8.0_data + - mysql-server-8.0_services + - mysql-server-8.0_tools + - mysql-server-core-8.0_bins + - passwd_bins + - perl_bins + + config: + contents: + /etc/app*or.d/usr.sbin.mysqld: + /etc/init.d/mysql: + /etc/init/mysql.conf: + /etc/mysql/debian-start: + /etc/mysql/mysql.cnf: + /etc/mysql/mysql.conf.d/mysql.cnf: + /etc/mysql/mysql.conf.d/mysqld.cnf: + + data: + contents: + /usr/share/mysql/debian_create_root_user.sql: + /usr/share/mysql/install_rewriter.sql: + /usr/share/mysql/uninstall_rewriter.sql: + + services: + contents: + # /etc/logcheck/ignore.d.paranoid/mysql-server-8_0: + # /etc/logcheck/ignore.d.server/mysql-server-8_0: + # /etc/logcheck/ignore.d.workstation/mysql-server-8_0: + # /etc/logrotate.d/mysql-server: + /usr/lib/systemd/system/mysql.service: + /usr/share/mysql/mysqld_multi.server: + + tools: + contents: + /usr/share/apport/package-hooks/source_mysql-8.0.py: + /usr/share/mysql/echo_stderr: + /usr/share/mysql/mysql-systemd-start: + + copyright: + contents: + /usr/share/doc/mysql-server-8.0/copyright: diff --git a/slices/mysql-server-core-8.0.yaml b/slices/mysql-server-core-8.0.yaml new file mode 100644 index 000000000..29aa678e2 --- /dev/null +++ b/slices/mysql-server-core-8.0.yaml @@ -0,0 +1,58 @@ +package: mysql-server-core-8.0 +essential: + - mysql-server-core-8.0_copyright +slices: + libs: + essential: + - libaio1t64_libs + - libc6_libs + - libevent-core-2.1-7t64_libs + - libevent-pthreads-2.1-7t64_libs + - libgcc-s1_libs + - libicu74_libs + - liblz4-1_libs + - libmecab2_libs + - libnuma1_libs + - libprotobuf-lite32t64_libs + - libssl3t64_libs + - libstdc++6_libs + - libtirpc3t64_libs + - libzstd1_libs + - mysql-server-core-8.0_data + - zlib1g_libs + contents: + /usr/lib/mysql/plugin/*.so: + /usr/lib/mysql/zlib_decompress: + + bins: + essential: + - mysql-server-core-8.0_libs + contents: + /usr/bin/ibd2sdi: + /usr/bin/innochecksum: + /usr/bin/my_print_defaults: + /usr/bin/myisamchk: + /usr/bin/myisamlog: + /usr/bin/myisampack: + /usr/bin/mysql_migrate_keyring: + /usr/bin/mysql_secure_installation: + /usr/bin/mysql_ssl_rsa_setup: + /usr/bin/mysql_tzinfo_to_sql: + /usr/bin/mysql_upgrade: + /usr/bin/mysqlbinlog: + /usr/bin/mysqld_multi: + /usr/bin/mysqld_safe: + /usr/bin/perror: + /usr/sbin/mysqld: + + data: + contents: + /usr/share/mysql/*/errmsg.sys: + /usr/share/mysql/charsets/*.xml: + /usr/share/mysql/dictionary.txt: + /usr/share/mysql/innodb_memcached_config.sql: + # /usr/share/mysql/mysql-log-rotate: + + copyright: + contents: + /usr/share/doc/mysql-server-core-8.0/copyright: From 768e9be86aa252d2cea8abe9d9d8b7bb4cb0de70 Mon Sep 17 00:00:00 2001 From: Zhijie Yang Date: Tue, 30 Jul 2024 12:33:47 +0200 Subject: [PATCH 2/3] chore(24.04): fix linting issue --- slices/libevent-core-2.1-7t64.yaml | 2 +- slices/mysql-server-8.0.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/slices/libevent-core-2.1-7t64.yaml b/slices/libevent-core-2.1-7t64.yaml index ed55b4460..9d95475f2 100644 --- a/slices/libevent-core-2.1-7t64.yaml +++ b/slices/libevent-core-2.1-7t64.yaml @@ -9,7 +9,7 @@ slices: - libc6_libs contents: /usr/lib/*-linux-*/libevent_core-2.1.so*: - + copyright: contents: /usr/share/doc/libevent-core-2.1-7t64/copyright: diff --git a/slices/mysql-server-8.0.yaml b/slices/mysql-server-8.0.yaml index b6ad223d7..f5f4a9f0b 100644 --- a/slices/mysql-server-8.0.yaml +++ b/slices/mysql-server-8.0.yaml @@ -47,7 +47,7 @@ slices: /usr/share/apport/package-hooks/source_mysql-8.0.py: /usr/share/mysql/echo_stderr: /usr/share/mysql/mysql-systemd-start: - + copyright: contents: /usr/share/doc/mysql-server-8.0/copyright: From 559d9588ce78b0219778fcdf01851544021c61b3 Mon Sep 17 00:00:00 2001 From: Zhijie Yang Date: Tue, 30 Jul 2024 12:36:44 +0200 Subject: [PATCH 3/3] chore(24.04): fix linting issue mysql-common.yaml --- slices/mysql-common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slices/mysql-common.yaml b/slices/mysql-common.yaml index 9fbb74b19..8eed45f5f 100644 --- a/slices/mysql-common.yaml +++ b/slices/mysql-common.yaml @@ -6,8 +6,8 @@ essential: slices: config: contents: - /etc/mysql/conf.d/*.cnf: /etc/mysql/*.cnf.fallback: + /etc/mysql/conf.d/*.cnf: /usr/share/mysql-common/configure-symlinks: copyright: