Skip to content

Commit 20f8237

Browse files
adivinhoadivinho
committed
PKG-1095 Packaging tasks for release - PS 8.0.44
1 parent c5623cb commit 20f8237

File tree

2 files changed

+31
-21
lines changed

2 files changed

+31
-21
lines changed

‎build-ps/percona-server-8.0_builder.sh‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,6 @@ install_deps() {
436436
CURPLACE=$(pwd)
437437

438438
if [ "x$OS" = "xrpm" ]; then
439-
RHEL=$(rpm --eval %rhel)
440-
ARCH=$(echo $(uname -m) | sed -e 's:i686:i386:g')
441439
if [ "x${RHEL}" = "x8" -o "x${RHEL}" = "x7" ]; then
442440
switch_to_vault_repo
443441
fi
@@ -449,12 +447,16 @@ install_deps() {
449447
# percona-release enable tools experimental
450448
else
451449
yum -y install yum-utils
452-
yum-config-manager --enable ol"${RHEL}"_codeready_builder
450+
if [ "x${RHEL}" != "x2023" ]; then
451+
yum-config-manager --enable ol"${RHEL}"_codeready_builder
452+
fi
453453
fi
454454
else
455-
if [ "x${RHEL}" = "x9" -o "x${RHEL}" = "x8" -o "x${RHEL}" = "x10" ]; then
455+
if [ "x${RHEL}" = "x9" -o "x${RHEL}" = "x8" -o "x${RHEL}" = "x2023" -o "x${RHEL}" = "x10" ]; then
456456
yum -y install yum-utils
457-
yum-config-manager --enable ol"${RHEL}"_codeready_builder
457+
if [ "x${RHEL}" != "x2023" ]; then
458+
yum-config-manager --enable ol"${RHEL}"_codeready_builder
459+
fi
458460
fi
459461
fi
460462
yum -y update
@@ -467,9 +469,12 @@ install_deps() {
467469
switch_to_vault_repo
468470
fi
469471
yum -y install git numactl-devel rpm-build gcc-c++ gperf ncurses-devel perl readline-devel openssl-devel jemalloc zstd
470-
yum -y install time zlib-devel libaio-devel bison cmake3 cmake pam-devel libeatmydata jemalloc-devel pkg-config
472+
yum -y install time zlib-devel libaio-devel bison cmake3 cmake pam-devel jemalloc-devel pkg-config
471473
yum -y install perl-Time-HiRes libcurl-devel openldap-devel unzip wget libcurl-devel patchelf systemd-devel
472474
yum -y install perl-Env perl-Data-Dumper perl-JSON perl-Digest perl-Digest-MD5 perl-Digest-Perl-MD5 || true
475+
if [ "x${RHEL}" != "x2023" ]; then
476+
yum -y install libeatmydata
477+
fi
473478
if [ "${RHEL}" -lt 8 ]; then
474479
until yum -y install centos-release-scl; do
475480
echo "waiting"
@@ -540,10 +545,16 @@ install_deps() {
540545
popd
541546
fi
542547
else
543-
yum -y install MySQL-python
544-
yum -y install libtirpc-devel
545-
yum -y install gflags-devel
546-
yum -y install libatomic
548+
if [ "x$RHEL" != "x2023" ]; then
549+
yum -y install MySQL-python
550+
yum -y install libtirpc-devel
551+
yum -y install gflags-devel
552+
yum -y install libatomic
553+
else
554+
yum -y install libtirpc-devel libatomic annobin-annocheck annobin-plugin-gcc
555+
yum -y install pip mariadb105-devel python3-devel
556+
pip install mysqlclient
557+
fi
547558
fi
548559
else
549560
until apt-get update; do
@@ -818,8 +829,6 @@ build_rpm(){
818829
mkdir -vp rpmbuild/{SOURCES,SPECS,BUILD,SRPMS,RPMS}
819830
cp $SRC_RPM rpmbuild/SRPMS/
820831

821-
RHEL=$(rpm --eval %rhel)
822-
ARCH=$(echo $(uname -m) | sed -e 's:i686:i386:g')
823832
#
824833
echo "RHEL=${RHEL}" >> percona-server-8.0.properties
825834
echo "ARCH=${ARCH}" >> percona-server-8.0.properties
@@ -851,22 +860,22 @@ build_rpm(){
851860
fi
852861
if [ ${ARCH} = x86_64 ]; then
853862
if [[ ${WITH_ZENFS} == "1" ]]; then
854-
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --define "dist .el${RHEL}" --define "with_mecab ${MECAB_INSTALL_DIR}/usr" --define "with_zenfs 1" --rebuild rpmbuild/SRPMS/${SRCRPM}
863+
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --define "dist .${OS_NAME}" --define "with_mecab ${MECAB_INSTALL_DIR}/usr" --define "with_zenfs 1" --rebuild rpmbuild/SRPMS/${SRCRPM}
855864
else
856865
if [[ ${RHEL} = 8 ]]; then
857866
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --define "dist .el${RHEL}" --define "with_mecab ${MECAB_INSTALL_DIR}/usr" --define '_dwz_max_die_limit 0' --rebuild rpmbuild/SRPMS/${SRCRPM}
858867
else
859-
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --define "dist .el${RHEL}" --define "with_mecab ${MECAB_INSTALL_DIR}/usr" --rebuild rpmbuild/SRPMS/${SRCRPM}
868+
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --define "dist .${OS_NAME}" --define "with_mecab ${MECAB_INSTALL_DIR}/usr" --rebuild rpmbuild/SRPMS/${SRCRPM}
860869
fi
861870
fi
862871
else
863872
if [[ ${WITH_ZENFS} == "1" ]]; then
864-
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --define "dist .el${RHEL}" --define "with_tokudb 0" --define "with_mecab ${MECAB_INSTALL_DIR}/usr" --define "with_zenfs 1" --rebuild rpmbuild/SRPMS/${SRCRPM}
873+
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --define "dist .${OS_NAME}" --define "with_tokudb 0" --define "with_mecab ${MECAB_INSTALL_DIR}/usr" --define "with_zenfs 1" --rebuild rpmbuild/SRPMS/${SRCRPM}
865874
else
866875
if [[ ${RHEL} = 8 ]]; then
867876
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --define "dist .el${RHEL}" --define "with_tokudb 0" --define "with_mecab ${MECAB_INSTALL_DIR}/usr" --define '_dwz_max_die_limit 0' --rebuild rpmbuild/SRPMS/${SRCRPM}
868877
else
869-
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --define "dist .el${RHEL}" --define "with_tokudb 0" --define "with_mecab ${MECAB_INSTALL_DIR}/usr" --rebuild rpmbuild/SRPMS/${SRCRPM}
878+
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --define "dist .${OS_NAME}" --define "with_tokudb 0" --define "with_mecab ${MECAB_INSTALL_DIR}/usr" --rebuild rpmbuild/SRPMS/${SRCRPM}
870879
fi
871880
fi
872881
fi

‎build-ps/percona-server.spec‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
%{!?compilation_comment_debug: %global compilation_comment_debug Percona Server - Debug (GPL), Release %{percona_server_version}, Revision %{revision}}
7070
%{!?src_base: %global src_base percona-server}
7171

72-
%if 0%{?rhel} >= 8
72+
%if 0%{?rhel} >= 8 || 0%{?amzn} >= 2023
7373
%global add_fido_plugins 1
7474
%else
7575
%global add_fido_plugins 0
@@ -94,7 +94,7 @@
9494
%endif
9595

9696
# On rhel 5/6 we still have renamed library to libperconaserverclient
97-
%if 0%{?rhel} > 6
97+
%if 0%{?rhel} > 6 || 0%{?amzn} >= 2023
9898
%global shared_lib_pri_name mysqlclient
9999
%global shared_lib_sec_name perconaserverclient
100100
%else
@@ -126,7 +126,7 @@
126126
%global __isa_bits 64
127127
%endif
128128

129-
%if 0%{?rhel} >= 8
129+
%if 0%{?rhel} >= 8 || 0%{?amzn} >= 2023
130130
%global ps_telemetry /usr/local/percona/telemetry/ps
131131
%endif
132132

@@ -166,6 +166,7 @@ BuildRequires: perl
166166
%{?el7:BuildRequires: perl(Env)}
167167
%{?el8:BuildRequires: perl(Env)}
168168
%{?el9:BuildRequires: perl(Env)}
169+
%{?amzn2023:BuildRequires: perl(Env)}
169170
BuildRequires: perl(Carp)
170171
BuildRequires: perl(Config)
171172
BuildRequires: perl(Cwd)
@@ -211,7 +212,7 @@ BuildRequires: pkgconfig(systemd)
211212
%endif
212213
BuildRequires: cyrus-sasl-devel
213214
BuildRequires: openldap-devel
214-
%if 0%{?rhel} >= 8
215+
%if 0%{?rhel} >= 8 || 0%{?amzn} >= 2023
215216
BuildRequires: cmake >= 3.6.1
216217
BuildRequires: gcc
217218
BuildRequires: gcc-c++
@@ -224,7 +225,7 @@ BuildRequires: devtoolset-8-gcc-c++
224225
%endif
225226
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
226227

227-
%if 0%{?rhel} > 6
228+
%if 0%{?rhel} > 6 || 0%{?amzn} >= 2023
228229
# For rpm => 4.9 only: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
229230
%global __requires_exclude ^perl\\((GD|hostnames|lib::mtr|lib::v1|mtr_|My::)
230231
%global __provides_exclude_from ^(/usr/share/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$

0 commit comments

Comments
 (0)