Am 16.03.2017 um 09:42 schrieb Sergei Golubchik:
On Mar 16, Reindl Harald wrote:
Am 16.03.2017 um 00:21 schrieb Sergei Golubchik:
On Mar 15, Reindl Harald wrote:
> > if it only would build any longer...............
/home/builduser/rpmbuild/BUILD/mariadb-10.1.22/include/my_sys.h:649:43: error: unknown type name 'PSI_file_key' extern int my_handler_delete_with_symlink(PSI_file_key key, const char *name,
Sorry. I'm fixing it.
will follow a 10.1.23 release shortly or can we have at least a unified difdf which can be applied by rpmbuild?
This is the commit I've pushed: https://github.com/mariadb/server/commit/2c2bd8c1556b081fccd0fc3e010dc3ea2c3...
I don't think there will be a new release shortly... :(
how do i get that to a unified diff so it can be used in rpmbuilds %prep section?
%patch1 -p1
https://github.com/mariadb/server/commit/2c2bd8c1556b081fccd0fc3e010dc3ea2c3... or https://github.com/mariadb/server/commit/2c2bd8c1556b081fccd0fc3e010dc3ea2c3...
That's something I find quite silly in github. Instead of putting a [Download patch] link on the commit page they expect people to just *know* that one can add .diff or .patch to the commit url to download it as a diff. They have quite a few "hidden urls" like that...
i never got what people drives to github all the years, however, that don't work, see build outputs [builduser@buildserver:/rpmbuild/SPECS]$ rpmbuild -bb mariadb.spec Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.oVCNOI + umask 022 + cd /home/builduser/rpmbuild/BUILD + cd /home/builduser/rpmbuild/BUILD + rm -rf mariadb-10.1.22 + /usr/bin/gzip -dc /home/builduser/rpmbuild/SOURCES/mariadb-10.1.22.tar.gz + /usr/bin/tar -xof - + STATUS=0 + '[' 0 -ne 0 ']' + cd mariadb-10.1.22 + /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w . + echo 'Patch #1 (mariadb-2c2bd8c1556b081fccd0fc3e010dc3ea2c38fffb.patch):' Patch #1 (mariadb-2c2bd8c1556b081fccd0fc3e010dc3ea2c38fffb.patch): + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file include/my_sys.h Hunk #1 succeeded at 646 (offset 49 lines). patching file include/mysql/psi/mysql_file.h patching file mysys/my_symlink2.c patching file sql/handler.cc Hunk #1 succeeded at 3840 (offset -10 lines). patching file sql/sql_db.cc Hunk #1 succeeded at 846 (offset 31 lines). Hunk #2 succeeded at 1152 (offset 33 lines). Hunk #3 succeeded at 1268 (offset 33 lines). patching file sql/table.cc Hunk #1 succeeded at 571 (offset 2 lines). patching file storage/maria/ma_delete_table.c Hunk #1 FAILED at 86. 1 out of 1 hunk FAILED -- saving rejects to file storage/maria/ma_delete_table.c.rej patching file storage/myisam/mi_delete_table.c error: Bad exit status from /var/tmp/rpm-tmp.oVCNOI (%prep) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.oVCNOI (%prep)