Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PS-5650 Add package version for 5.6 rpms #3494

Merged
merged 3 commits into from
Nov 1, 2019
Merged

PS-5650 Add package version for 5.6 rpms #3494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
487ced5
PS-5650 Add package version for 5.6 rpms
EvgeniyPatlan Oct 31, 2019
b7ce254
Update rpm patch
EvgeniyPatlan Oct 31, 2019
2083a74
FIx rpm spec
EvgeniyPatlan Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build-ps/percona-server-5.6_builder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ build_srpm(){
#
mv -fv ${TARFILE} ${WORKDIR}/rpmbuild/SOURCES

rpmbuild -bs --define "_topdir ${WORKDIR}/rpmbuild" --with tokudb --define "dist .generic" rpmbuild/SPECS/percona-server.spec
rpmbuild -bs --define "_topdir ${WORKDIR}/rpmbuild" --with tokudb --define "dist .generic" --define "pkg_ver .${RPM_RELEASE}" rpmbuild/SPECS/percona-server.spec
#

mkdir -p ${WORKDIR}/srpm
Expand Down Expand Up @@ -453,13 +453,13 @@ build_rpm(){
if [ ${RHEL} = 6 ]; then
if [ ${ARCH} = x86_64 ]; then
source /opt/percona-devtoolset/enable
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --with tokudb --define "dist .el${RHEL}" --rebuild rpmbuild/SRPMS/${SRC_RPM}
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --with tokudb --define "dist .el${RHEL}" --define "pkg_ver .${RPM_RELEASE}" --rebuild rpmbuild/SRPMS/${SRC_RPM}
else
source /opt/rh/devtoolset-2/enable
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --define "dist .el${RHEL}" --rebuild rpmbuild/SRPMS/${SRC_RPM}
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --define "dist .el${RHEL}" --define "pkg_ver .${RPM_RELEASE}" --rebuild rpmbuild/SRPMS/${SRC_RPM}
fi
else
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --with tokudb --define "dist .el${RHEL}" --rebuild rpmbuild/SRPMS/${SRC_RPM}
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --with tokudb --define "dist .el${RHEL}" --define "pkg_ver .${RPM_RELEASE}" --rebuild rpmbuild/SRPMS/${SRC_RPM}
fi

return_code=$?
Expand Down
8 changes: 5 additions & 3 deletions build-ps/percona-server.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
%define mysqld_group mysql
%define mysqldatadir /var/lib/mysql

%define release rel%{percona_server_version}%{?dist}
%define release rel%{percona_server_version}%{pkg_ver}%{?dist}

%if "%rhel" > "6"
%define shared_lib_pri_name libmysqlclient
Expand Down Expand Up @@ -245,8 +245,8 @@
%define license_files_server LICENSE.mysql
%define license_type Commercial
%else
%define license_files_server COPYING README
%define license_type GPL
%define license_files_server README
%define license_type GPLv2
%endif

##############################################################################
Expand Down Expand Up @@ -1286,7 +1286,9 @@ fi
%attr(755, root, root) %{_libdir}/mysql/plugin/test_udf_services.so
%attr(755, root, root) %{_libdir}/mysql/plugin/connection_control.so
%attr(755, root, root) %{_libdir}/mysql/plugin/udf_example.so
%attr(755, root, root) %{_libdir}/mysql/plugin/ha_example.so
# %attr(755, root, root) %{_libdir}/mysql/plugin/debug/*.so*
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/ha_example.so
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_pam.so
Expand Down
28 changes: 15 additions & 13 deletions build-ps/rpm/mysql-5.6-sharedlib-rename.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,25 @@ diff -rup old/client/CMakeLists.txt new/client/CMakeLists.txt
diff -rup old/libmysql/CMakeLists.txt new/libmysql/CMakeLists.txt
--- old/libmysql/CMakeLists.txt 2016-03-03 08:30:00.000000000 +0100
+++ new/libmysql/CMakeLists.txt 2016-03-03 14:07:22.625678083 +0100
@@ -179,12 +179,12 @@ IF(WIN32)
LIST(APPEND LIBS auth_win_client)
@@ -204,13 +204,13 @@
LIST(APPEND LIBS_TO_MERGE auth_win_client)
ENDIF()

-# Merge several convenience libraries into one big perconaserverclient
-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
-TARGET_LINK_LIBRARIES(perconaserverclient ${LIBS_TO_LINK})
+# Merge several convenience libraries into one big mysqlclient
+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
+TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})

# Visual Studio users need debug static library for debug projects
IF(MSVC)
- INSTALL_DEBUG_TARGET(perconaserverclient DESTINATION ${INSTALL_LIBDIR}/debug)
+ INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
- INSTALL_DEBUG_TARGET(perconaserverclient DESTINATION ${INSTALL_LIBDIR}/debug)
+ INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
ENDIF()

@@ -209,14 +209,14 @@ IF(UNIX)
@@ -235,14 +235,14 @@
ENDIF()

IF(UNIX)
Expand All @@ -99,21 +101,21 @@ diff -rup old/libmysql/CMakeLists.txt new/libmysql/CMakeLists.txt
- # Merge several convenience libraries into one big perconaserverclient
+ # Merge several convenience libraries into one big mysqlclient
# and link them together into shared library.
MERGE_LIBRARIES(libmysql SHARED ${LIBS}
MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE}
EXPORTS ${CLIENT_API_FUNCTIONS}
@@ -229,9 +229,9 @@
@@ -256,9 +256,9 @@
SET(OS_SHARED_LIB_VERSION
"${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0")
ENDIF()
- # Name of shared library is perconaserverclient on Unix
+ # Name of shared library is mysqlclient on Unix
SET_TARGET_PROPERTIES(libmysql PROPERTIES
- OUTPUT_NAME perconaserverclient
+ OUTPUT_NAME mysqlclient
+ OUTPUT_NAME mysqlclient
VERSION "${OS_SHARED_LIB_VERSION}"
SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
IF(WITH_SYMVER16)
@@ -254,13 +254,13 @@ IF(NOT DISABLE_SHARED)
@@ -285,13 +285,13 @@
PROPERTIES LINK_FLAGS "${libmysql_link_flags}")
ENDIF()
# clean direct output needs to be set several targets have the same name
Expand All @@ -131,7 +133,7 @@ diff -rup old/libmysql/CMakeLists.txt new/libmysql/CMakeLists.txt
"${CMAKE_SHARED_LIBRARY_SUFFIX}"
""
linkname)
@@ -274,7 +274,7 @@ IF(NOT DISABLE_SHARED)
@@ -305,7 +305,7 @@
LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS)
FOREACH(ver ${OS_SHARED_LIB_SYMLINKS})
GET_VERSIONED_LIBNAME(
Expand Down