Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
drrtuy committed Jul 28, 2020
1 parent 6a70398 commit 2c5831b
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
2 changes: 0 additions & 2 deletions debian/control
Expand Up @@ -31,7 +31,6 @@ Build-Depends: bison,
libnuma-dev [!armhf],
libpam0g-dev,
libpcre2-dev,
libreadline-gplv2-dev [i386 amd64],
libsnappy-dev,
libssl-dev | libssl1.0-dev,
libsystemd-dev [linux-any],
Expand Down Expand Up @@ -662,7 +661,6 @@ Description: RocksDB storage engine for MariaDB
Package: mariadb-plugin-columnstore
Architecture: amd64 i386
Depends: binutils,
expect,
libjemalloc1 | libjemalloc2,
libsnappy1 | libsnappy1v5,
mariadb-server-10.5 (= ${binary:Version}),
Expand Down
2 changes: 1 addition & 1 deletion debian/mariadb-plugin-columnstore.postinst
Expand Up @@ -3,6 +3,6 @@
set -e

# Install ColumnStore
columnstore-post-install --rpmmode=install
columnstore-post-install install

#DEBHELPER#
2 changes: 1 addition & 1 deletion storage/columnstore/CMakeLists.txt
Expand Up @@ -22,7 +22,7 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
# Needed to bump the component changes up to the main scope
APPEND_FOR_CPACK(CPACK_COMPONENTS_ALL)
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_PACKAGE_CONFLICTS " thrift MariaDB-columnstore-platform MariaDB-columnstore-libs")
# these three don't have the list semantics, so no append here
Expand Down

0 comments on commit 2c5831b

Please sign in to comment.