Commit 2c5831b2 authored by Roman Nozdrin's avatar Roman Nozdrin

MCOL-4166 The solution to the minor upgrade issue

DEB package doesn't need expect and libreadline as dependencies

RPM packages now depends on jemalloc again
parent 6a70398c
...@@ -31,7 +31,6 @@ Build-Depends: bison, ...@@ -31,7 +31,6 @@ Build-Depends: bison,
libnuma-dev [!armhf], libnuma-dev [!armhf],
libpam0g-dev, libpam0g-dev,
libpcre2-dev, libpcre2-dev,
libreadline-gplv2-dev [i386 amd64],
libsnappy-dev, libsnappy-dev,
libssl-dev | libssl1.0-dev, libssl-dev | libssl1.0-dev,
libsystemd-dev [linux-any], libsystemd-dev [linux-any],
...@@ -662,7 +661,6 @@ Description: RocksDB storage engine for MariaDB ...@@ -662,7 +661,6 @@ Description: RocksDB storage engine for MariaDB
Package: mariadb-plugin-columnstore Package: mariadb-plugin-columnstore
Architecture: amd64 i386 Architecture: amd64 i386
Depends: binutils, Depends: binutils,
expect,
libjemalloc1 | libjemalloc2, libjemalloc1 | libjemalloc2,
libsnappy1 | libsnappy1v5, libsnappy1 | libsnappy1v5,
mariadb-server-10.5 (= ${binary:Version}), mariadb-server-10.5 (= ${binary:Version}),
......
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
set -e set -e
# Install ColumnStore # Install ColumnStore
columnstore-post-install --rpmmode=install columnstore-post-install install
#DEBHELPER# #DEBHELPER#
...@@ -22,7 +22,7 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "i686") ...@@ -22,7 +22,7 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
# Needed to bump the component changes up to the main scope # Needed to bump the component changes up to the main scope
APPEND_FOR_CPACK(CPACK_COMPONENTS_ALL) APPEND_FOR_CPACK(CPACK_COMPONENTS_ALL)
IF (RPM) IF (RPM)
APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES " binutils net-tools python3") APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES " binutils jemalloc net-tools python3")
APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_USER_FILELIST ";%ignore /var/lib;%ignore /var") APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_USER_FILELIST ";%ignore /var/lib;%ignore /var")
APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_PACKAGE_CONFLICTS " thrift MariaDB-columnstore-platform MariaDB-columnstore-libs") APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_PACKAGE_CONFLICTS " thrift MariaDB-columnstore-platform MariaDB-columnstore-libs")
# these three don't have the list semantics, so no append here # these three don't have the list semantics, so no append here
......
Subproject commit cba638b3a52ca79a6bdbe187a6be46abb1806594 Subproject commit bca0d90d5537050951a6c2282411d955569a8c58
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment