Skip to content

PKG-730 psmdb.cd: add OL10 support for psmdb-70 #1521

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

Open
wants to merge 1 commit into
base: v7.0
Choose a base branch
from
Open

PKG-730 psmdb.cd: add OL10 support for psmdb-70 #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 6 additions & 30 deletions percona-packaging/redhat/percona-server-mongodb.spec.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,10 @@ Source6: mongod.pp
Source7: percona-server-mongodb-enable-auth.sh
Source999: call-home.sh

%if 0%{?amzn} == 2023 || 0%{?rhel} > 6
%if 0%{?amzn} == 2023 || 0%{?rhel} >= 7
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
%else
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
%endif


Expand Down Expand Up @@ -91,7 +87,7 @@ This metapackage will install the mongo shell, import/export tools, other client
%package mongos
Group: Applications/Databases
Summary: Percona Server for MongoDB sharded cluster query router
%if 0%{?amzn} == 2023 || 0%{?rhel} > 7
%if 0%{?amzn} == 2023 || 0%{?rhel} >= 8
Requires: percona-telemetry-agent
%endif
Conflicts: Percona-Server-MongoDB-mongos Percona-Server-MongoDB-32-mongos Percona-Server-MongoDB-34-mongos Percona-Server-MongoDB-36-mongos mongodb-org-mongos
Expand All @@ -103,7 +99,7 @@ Group: Applications/Databases
Summary: Percona Server for MongoDB database server
Requires: policycoreutils
Requires: percona-mongodb-mongosh
%if 0%{?amzn} == 2023 || 0%{?rhel} > 7
%if 0%{?amzn} == 2023 || 0%{?rhel} >= 8
Requires: percona-telemetry-agent
%endif
Conflicts: Percona-Server-MongoDB-server Percona-Server-MongoDB-32-server Percona-Server-MongoDB-34-server Percona-Server-MongoDB-36-server mongodb-org-server
Expand Down Expand Up @@ -143,6 +139,8 @@ export USE_SSE=1
export PATH=/usr/local/go/bin:$PATH
%if 0%{?amzn} == 2023
export OPT_LINKFLAGS="${LINKFLAGS} -Wl,--build-id=sha1"
%elif 0%{?rhel} == 10
export OPT_LINKFLAGS="${LINKFLAGS} -Wl,--build-id=sha1 -B/opt/mongodbtoolchain/v5/bin"
%else
export OPT_LINKFLAGS="${LINKFLAGS} -Wl,--build-id=sha1 -B/opt/mongodbtoolchain/v4/bin"
%endif
Expand All @@ -159,9 +157,6 @@ pushd $RPM_BUILD_DIR/%{src_dir}/aws-sdk-cpp
%if 0%{?amzn} == 2023 || 0%{?rhel} >= 7
cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_ONLY="s3;transfer" -DBUILD_SHARED_LIBS=OFF -DMINIMIZE_SIZE=ON -DCMAKE_INSTALL_PREFIX="${INSTALLDIR_AWS}" -DAUTORUN_UNIT_TESTS=OFF
cmake --build . --target install
%else
cmake3 CC=${CC} CXX=${CXX} .. -DCMAKE_BUILD_TYPE=Release -DBUILD_ONLY="s3;transfer" -DBUILD_SHARED_LIBS=OFF -DMINIMIZE_SIZE=ON -DCMAKE_INSTALL_PREFIX="${INSTALLDIR_AWS}" -DAUTORUN_UNIT_TESTS=OFF
cmake3 --build . --target install
%endif

popd
Expand Down Expand Up @@ -232,9 +227,6 @@ sed -i 's|/var/log/mongodb/mongod.log|/var/log/mongo/mongod.log|' %{buildroot}/%
%if 0%{?amzn} == 2023 || 0%{?rhel} >= 7
install -m 755 -d %{buildroot}/%{_unitdir}
install -m 644 %{SOURCE2} %{buildroot}/%{_unitdir}/mongod.service
%else
install -m 755 -d %{buildroot}/etc/rc.d/init.d
install -m 750 %{SOURCE5} %{buildroot}/etc/rc.d/init.d/mongod
%endif
#
install -m 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/mongod
Expand Down Expand Up @@ -268,8 +260,6 @@ install -m 644 $RPM_BUILD_DIR/%{src_dir}/manpages/* %{buildroot}/%{_mandir}/man1
%{_bindir}/percona-server-mongodb-enable-auth.sh
%if 0%{?amzn} == 2023 || 0%{?rhel} >= 7
%{_unitdir}/mongod.service
%else
/etc/rc.d/init.d/mongod
%endif
/etc/selinux/targeted/modules/active/modules/mongod.pp
%attr(0750,mongod,mongod) %dir %{mongo_home}
Expand Down Expand Up @@ -337,15 +327,9 @@ fi
if [ $1 == 1 ]; then
/usr/bin/systemctl enable mongod >/dev/null 2>&1 || :
fi
%else
if [ $1 == 1 ]; then
/sbin/chkconfig --add mongod
fi
%endif
%if 0%{?amzn} == 2023 || 0%{?rhel} > 5
%if 0%{?amzn} == 2023 || 0%{?rhel} >= 7
/usr/sbin/semodule -i /etc/selinux/targeted/modules/active/modules/mongod.pp
%else
/usr/sbin/semodule -i /etc/selinux/targeted/modules/active/modules/mongod.pp 2> /dev/null
%endif
echo " * To start the service, configure your engine and start mongod"
parse_yaml() {
Expand Down Expand Up @@ -404,10 +388,6 @@ if [ $1 -gt 1 ]; then
if [ $SERVER_TO_START == 1 ]; then
%if 0%{?amzn} == 2023 || 0%{?rhel} >= 7
/usr/sbin/service mongod restart
%else
if [ -x %{_sysconfdir}/init.d/mongod ] ; then
%{_sysconfdir}/init.d/mongod restart
fi
%endif
fi
fi
Expand All @@ -430,10 +410,6 @@ install -d -m 2775 -o mongod -g percona-telemetry /usr/local/percona/telemetry/p
%preun server
%if 0%{?amzn} == 2023 || 0%{?rhel} >= 7
%systemd_preun mongod.service
%else
if [ -x %{_sysconfdir}/init.d/mongod ] ; then
%{_sysconfdir}/init.d/mongod stop
fi
%endif

%postun server
Expand Down
62 changes: 40 additions & 22 deletions percona-packaging/scripts/psmdb_builder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ get_sources(){
git clean -xdf
git checkout 1.9.379
git submodule update --init --recursive
if [[ x"${RHEL}" =~ ^x(7|8|9|2023)$ ]]; then
if [[ x"${RHEL}" =~ ^x(7|8|9|10|2023)$ ]]; then
sed -i 's:v0.4.42:v0.6.10:' third-party/CMakeLists.txt
sed -i 's:"-Werror" ::' cmake/compiler_settings.cmake
fi
Expand Down Expand Up @@ -237,6 +237,11 @@ get_system(){
OS="deb"
fi
export GLIBC_VER=".glibc${GLIBC_VER_TMP}"
if [ "x${RHEL}" == "x10" ]; then
export TOOLCHAIN_PATH="/opt/mongodbtoolchain/v5"
else
export TOOLCHAIN_PATH="/opt/mongodbtoolchain/v4"
fi
return
}

Expand Down Expand Up @@ -308,15 +313,15 @@ install_gcc_deb(){

set_compiler(){
if [ x"$RHEL" != x2023 ]; then
export CC=/opt/mongodbtoolchain/v4/bin/gcc
export CXX=/opt/mongodbtoolchain/v4/bin/g++
export CC=${TOOLCHAIN_PATH}/bin/gcc
export CXX=${TOOLCHAIN_PATH}/bin/g++
fi
return
}

fix_rules(){
sed -i 's|CC = gcc-5|CC = /opt/mongodbtoolchain/v4/bin/gcc|' debian/rules
sed -i 's|CXX = g++-5|CXX = /opt/mongodbtoolchain/v4/bin/g++|' debian/rules
sed -i "s|CC = gcc-5|CC = ${TOOLCHAIN_PATH}/bin/gcc|" debian/rules
sed -i "s|CXX = g++-5|CXX = ${TOOLCHAIN_PATH}/bin/g++|" debian/rules
sed -i 's:release:release --disable-warnings-as-errors :g' debian/rules
if [ x"${FIPSMODE}" == x1 ]; then
sed -i 's:FIPSMODE=0:FIPSMODE=1:' debian/rules
Expand All @@ -332,7 +337,7 @@ aws_sdk_build(){
git clean -xdf
git checkout 1.9.379
git submodule update --init --recursive
if [[ x"${RHEL}" =~ ^x(7|8|9|2023)$ ]]; then
if [[ x"${RHEL}" =~ ^x(7|8|9|10|2023)$ ]]; then
sed -i 's:v0.4.42:v0.6.10:' third-party/CMakeLists.txt
sed -i 's:"-Werror" ::' cmake/compiler_settings.cmake
fi
Expand Down Expand Up @@ -397,7 +402,7 @@ install_deps() {
yum -y install devtoolset-9
yum -y install devtoolset-11-elfutils devtoolset-11-dwz

PATH=/opt/mongodbtoolchain/v4/bin/:$PATH
PATH=${TOOLCHAIN_PATH}/bin/:$PATH

pip install --upgrade pip
pip install --user setuptools --upgrade
Expand All @@ -414,7 +419,7 @@ install_deps() {
yum -y install gcc-toolset-11-dwz gcc-toolset-11-elfutils
ln -sf /usr/bin/scons-3 /usr/bin/scons

PATH=/opt/mongodbtoolchain/v4/bin/:$PATH
PATH=${TOOLCHAIN_PATH}/bin/:$PATH
/usr/bin/pip install --user typing pyyaml regex Cheetah3
elif [ x"$RHEL" = x9 -o x"$RHEL" = x2023 ]; then
dnf config-manager --enable ol9_codeready_builder
Expand All @@ -430,7 +435,20 @@ install_deps() {
yum -y install perl
/usr/bin/pip install --upgrade pip setuptools --ignore-installed
/usr/bin/pip install --user typing pyyaml==5.3.1 regex Cheetah3
elif [ x"$RHEL" = x10 ]; then
dnf config-manager --enable ol10_codeready_builder

yum -y install oracle-epel-release-el10
yum -y install bzip2-devel libpcap-devel snappy-devel gcc gcc-c++ rpm-build rpmlint
yum -y install cmake cyrus-sasl-devel make openssl-devel zlib-devel libcurl-devel git
yum -y install python3 python3-pip python3-devel
yum -y install python3-scons

yum -y install redhat-rpm-config which e2fsprogs-devel expat-devel lz4-devel
yum -y install openldap-devel krb5-devel xz-devel
yum -y install perl
/usr/bin/pip install --upgrade pip setuptools --ignore-installed
/usr/bin/pip install --user typing pyyaml==5.3.1 regex Cheetah3
fi
if [ x"$RHEL" = x2023 ]; then
/usr/bin/pip install scons --root-user-action=ignore
Expand Down Expand Up @@ -505,7 +523,7 @@ install_mongodbtoolchain(){
fi
export USER=$(whoami)
bash -x ./installer.sh -k --download-url https://downloads.percona.com/downloads/packaging/${OS_CODE_NAME}_mongodbtoolchain_${ARCH}.tar.gz || exit 1
export PATH=/opt/mongodbtoolchain/v4/bin/:$PATH
export PATH=${TOOLCHAIN_PATH}/bin/:$PATH
}

get_tar(){
Expand Down Expand Up @@ -685,7 +703,7 @@ build_rpm(){
source /opt/rh/gcc-toolset-9/enable
source /opt/rh/gcc-toolset-11/enable
fi
elif [ x"$RHEL" = x9 ]; then
elif [ x"$RHEL" = x9 -o x"$RHEL" = x10 ]; then
mv /usr/bin/python3 /usr/bin/python3_old
fi
if [ "x${RHEL}" == "x2023" ]; then
Expand All @@ -697,7 +715,7 @@ build_rpm(){
# export CC=/usr/bin/gcc
# export CXX=/usr/bin/g++
fi
PATH=/opt/mongodbtoolchain/v4/bin/:$PATH
PATH=${TOOLCHAIN_PATH}/bin/:$PATH
pip install --upgrade pip

# PyYAML pkg installation fix, more info: https://github.com/yaml/pyyaml/issues/724
Expand All @@ -710,8 +728,8 @@ build_rpm(){

if [ "x${RHEL}" != "x2023" ]; then
echo "CC and CXX should be modified once correct compiller would be installed on Centos"
export CC=/opt/mongodbtoolchain/v4/bin/gcc
export CXX=/opt/mongodbtoolchain/v4/bin/g++
export CC=${TOOLCHAIN_PATH}/bin/gcc
export CXX=${TOOLCHAIN_PATH}/bin/g++
fi
cd $WORKDIR
echo "RHEL=${RHEL}" >> percona-server-mongodb-70.properties
Expand All @@ -729,7 +747,7 @@ build_rpm(){
if [ "x${RHEL}" == "x2023" ]; then
export OPT_LINKFLAGS="${LINKFLAGS} -Wl,--build-id=sha1 "
else
export OPT_LINKFLAGS="${LINKFLAGS} -Wl,--build-id=sha1 -B/opt/mongodbtoolchain/v4/bin"
export OPT_LINKFLAGS="${LINKFLAGS} -Wl,--build-id=sha1 -B${TOOLCHAIN_PATH}/bin"
fi
if [[ "x${FIPSMODE}" == "x1" ]]; then
rpmbuild --define "_topdir ${WORKDIR}/rpmbuild" --define "dist .$OS_NAME" --define "enable_fipsmode 1" --rebuild rpmbuild/SRPMS/$SRC_RPM
Expand Down Expand Up @@ -796,7 +814,7 @@ build_source_deb(){
fi
cd ${BUILDDIR}

PATH=/opt/mongodbtoolchain/v4/bin/:$PATH
PATH=${TOOLCHAIN_PATH}/bin/:$PATH
pip install --upgrade pip

# PyYAML pkg installation fix, more info: https://github.com/yaml/pyyaml/issues/724
Expand Down Expand Up @@ -894,7 +912,7 @@ build_deb(){
else
cd ${PRODUCT}-${VERSION}
fi
PATH=/opt/mongodbtoolchain/v4/bin/:$PATH
PATH=${TOOLCHAIN_PATH}/bin/:$PATH

pip install --upgrade pip

Expand Down Expand Up @@ -928,7 +946,7 @@ build_deb(){
. ./mongo-tools/set_tools_revision.sh
dch -m -D "${DEBIAN}" --force-distribution -v "${VERSION}-${RELEASE}.${DEBIAN}" 'Update distribution'
export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
export OPT_LINKFLAGS="${LINKFLAGS} -Wl,--build-id=sha1 -B/opt/mongodbtoolchain/v4/bin"
export OPT_LINKFLAGS="${LINKFLAGS} -Wl,--build-id=sha1 -B${TOOLCHAIN_PATH}/bin"

cd debian/
wget https://raw.githubusercontent.com/Percona-Lab/telemetry-agent/phase-0/call-home.sh
Expand Down Expand Up @@ -1022,8 +1040,8 @@ build_tarball(){
fi
if [ "x${RHEL}" != "x2023" ]; then
echo "CC and CXX should be modified once correct compiller would be installed on Centos"
export CC=/opt/mongodbtoolchain/v4/bin/gcc
export CXX=/opt/mongodbtoolchain/v4/bin/g++
export CC=${TOOLCHAIN_PATH}/bin/gcc
export CXX=${TOOLCHAIN_PATH}/bin/g++
else
export CC=/usr/bin/gcc
export CXX=/usr/bin/g++
Expand Down Expand Up @@ -1059,7 +1077,7 @@ build_tarball(){
# Finally build Percona Server for MongoDB with SCons
cd ${PSMDIR_ABS}
if [ "x${RHEL}" != "x2023" ]; then
export PATH=/opt/mongodbtoolchain/v4/bin/:$PATH
export PATH=${TOOLCHAIN_PATH}/bin/:$PATH
pip install --upgrade pip
fi
# PyYAML pkg installation fix, more info: https://github.com/yaml/pyyaml/issues/724
Expand All @@ -1082,7 +1100,7 @@ build_tarball(){
git clean -xdf
git checkout 1.9.379
git submodule update --init --recursive
if [[ x"${RHEL}" =~ ^x(7|8|9|2023)$ ]]; then
if [[ x"${RHEL}" =~ ^x(7|8|9|10|2023)$ ]]; then
sed -i 's:v0.4.42:v0.6.10:' third-party/CMakeLists.txt
sed -i 's:"-Werror" ::' cmake/compiler_settings.cmake
fi
Expand Down Expand Up @@ -1116,7 +1134,7 @@ build_tarball(){
if [ "x${RHEL}" == "x2023" ]; then
export OPT_LINKFLAGS="${LINKFLAGS} -Wl,--build-id=sha1 "
else
export OPT_LINKFLAGS="${LINKFLAGS} -Wl,--build-id=sha1 -B/opt/mongodbtoolchain/v4/bin"
export OPT_LINKFLAGS="${LINKFLAGS} -Wl,--build-id=sha1 -B${TOOLCHAIN_PATH}/bin"
fi
if [ x"${DEBIAN}" = "xstretch" ]; then
CURL_LINKFLAGS=$(pkg-config libcurl --static --libs)
Expand Down