Accepting request 1129562 from home:jirislaby:branches:server:database
- Fix location of unwanted binaries (which are deleted) - Fix location in rpmlintrc - Disable LTO on ppc64le due to error - constraints: increase memory to 16G on ppc64le, 10G is no longer enough (perhaps a linker bug?) OBS-URL: https://build.opensuse.org/request/show/1129562 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=315
This commit is contained in:
parent
7d99c13497
commit
bcc2df9745
12
_constraints
12
_constraints
@ -13,7 +13,6 @@
|
|||||||
<arch>i586</arch>
|
<arch>i586</arch>
|
||||||
<arch>x86_64</arch>
|
<arch>x86_64</arch>
|
||||||
<arch>aarch64</arch>
|
<arch>aarch64</arch>
|
||||||
<arch>ppc64le</arch>
|
|
||||||
<arch>ppc</arch>
|
<arch>ppc</arch>
|
||||||
</conditions>
|
</conditions>
|
||||||
<hardware>
|
<hardware>
|
||||||
@ -22,4 +21,15 @@
|
|||||||
</physicalmemory>
|
</physicalmemory>
|
||||||
</hardware>
|
</hardware>
|
||||||
</overwrite>
|
</overwrite>
|
||||||
|
|
||||||
|
<overwrite>
|
||||||
|
<conditions>
|
||||||
|
<arch>ppc64le</arch>
|
||||||
|
</conditions>
|
||||||
|
<hardware>
|
||||||
|
<physicalmemory>
|
||||||
|
<size unit="G">16</size>
|
||||||
|
</physicalmemory>
|
||||||
|
</hardware>
|
||||||
|
</overwrite>
|
||||||
</constraints>
|
</constraints>
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# Zero-length
|
# Zero-length
|
||||||
# Some test results can be zero-length files
|
# Some test results can be zero-length files
|
||||||
addFilter(r'(zero-length|pem-certificate) /usr/share/mysql-test/*')
|
addFilter(r'(zero-length|pem-certificate) /usr/share/mariadb-test/*')
|
||||||
|
|
||||||
# Permissions
|
# Permissions
|
||||||
# wsrep_sst_common
|
# wsrep_sst_common
|
||||||
@ -15,11 +15,11 @@ addFilter(r'script-without-shebang /usr/bin/wsrep_sst_common')
|
|||||||
# Support both rpmlint 1.x and 2.x
|
# Support both rpmlint 1.x and 2.x
|
||||||
# Wrong location
|
# Wrong location
|
||||||
# wsrep_check_version is a wsrep version check utility. Used in testing only.
|
# wsrep_check_version is a wsrep version check utility. Used in testing only.
|
||||||
addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mysql-test/lib/My/SafeProcess/wsrep_check_version')
|
addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mariadb-test/lib/My/SafeProcess/wsrep_check_version')
|
||||||
addFilter(r'arch-dependent-file-in-usr-share /usr/share/mysql-test/lib/My/SafeProcess/wsrep_check_version')
|
addFilter(r'arch-dependent-file-in-usr-share /usr/share/mariadb-test/lib/My/SafeProcess/wsrep_check_version')
|
||||||
# my_safe_process is an utility that encapsulates process creation, monitoring and cleanup. Used in testing only.
|
# my_safe_process is an utility that encapsulates process creation, monitoring and cleanup. Used in testing only.
|
||||||
addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mysql-test/lib/My/SafeProcess/my_safe_process')
|
addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mariadb-test/lib/My/SafeProcess/my_safe_process')
|
||||||
addFilter(r'arch-dependent-file-in-usr-share /usr/share/mysql-test/lib/My/SafeProcess/my_safe_process')
|
addFilter(r'arch-dependent-file-in-usr-share /usr/share/mariadb-test/lib/My/SafeProcess/my_safe_process')
|
||||||
# pam_mariadb_mtr.so is a pam module to test pam authentication plugin. Used in pam.test only.
|
# pam_mariadb_mtr.so is a pam module to test pam authentication plugin. Used in pam.test only.
|
||||||
addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so')
|
addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mariadb-test/suite/plugins/pam/pam_mariadb_mtr.so')
|
||||||
addFilter(r'arch-dependent-file-in-usr-share /usr/share/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so')
|
addFilter(r'arch-dependent-file-in-usr-share /usr/share/mariadb-test/suite/plugins/pam/pam_mariadb_mtr.so')
|
||||||
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Nov 27 13:28:45 UTC 2023 - Jiri Slaby <jslaby@suse.cz>
|
||||||
|
|
||||||
|
- Fix location of unwanted binaries (which are deleted)
|
||||||
|
- Fix location in rpmlintrc
|
||||||
|
- Disable LTO on ppc64le due to error
|
||||||
|
- constraints: increase memory to 16G on ppc64le, 10G is no longer enough
|
||||||
|
(perhaps a linker bug?)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Oct 17 15:27:14 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
|
Tue Oct 17 15:27:14 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
|
||||||
|
|
||||||
|
@ -535,12 +535,12 @@ rm %{buildroot}%{_libdir}/*.a
|
|||||||
rm -f %{buildroot}%{_datadir}/mysql/{errmsg-utf8.txt,mysql-log-rotate}
|
rm -f %{buildroot}%{_datadir}/mysql/{errmsg-utf8.txt,mysql-log-rotate}
|
||||||
rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
|
rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
|
||||||
# binary-configure creates the MySQL system tables and starts the server (not used)
|
# binary-configure creates the MySQL system tables and starts the server (not used)
|
||||||
rm -f %{buildroot}%{_datadir}/mysql/binary-configure
|
rm -f %{buildroot}%{_datadir}/%{name}/binary-configure
|
||||||
# FS files first-bytes recoginiton (not updated by upstream since nobody realy use that)
|
# FS files first-bytes recoginiton (not updated by upstream since nobody realy use that)
|
||||||
rm -f %{buildroot}%{_datadir}/mysql/magic
|
rm -f %{buildroot}%{_datadir}/%{name}/magic
|
||||||
# Upstream ships them because of MDEV-10797 (we don't need them as we use our own systemd scripts)
|
# Upstream ships them because of MDEV-10797 (we don't need them as we use our own systemd scripts)
|
||||||
rm -f %{buildroot}%{_datadir}/mysql/mysql.server
|
rm -f %{buildroot}%{_datadir}/%{name}/mysql.server
|
||||||
rm -f %{buildroot}%{_datadir}/mysql/mysqld_multi.server
|
rm -f %{buildroot}%{_datadir}/%{name}/mysqld_multi.server
|
||||||
# upstream installs links for mysql
|
# upstream installs links for mysql
|
||||||
unlink %{buildroot}%{_datadir}/%{name}/systemd/mysql.service
|
unlink %{buildroot}%{_datadir}/%{name}/systemd/mysql.service
|
||||||
unlink %{buildroot}%{_datadir}/%{name}/systemd/mysqld.service
|
unlink %{buildroot}%{_datadir}/%{name}/systemd/mysqld.service
|
||||||
|
Loading…
Reference in New Issue
Block a user