1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MCOL-4166 The solution to the minor upgrade issue

Browse Source 
DEB package doesn't need expect and libreadline as dependencies

RPM packages now depends on jemalloc again
This commit is contained in:
Roman Nozdrin 2020-07-13 14:50:43 +00:00
parent 6a70398c7a
commit 2c5831b2c5
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -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],
@ -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}),

2
debian/mariadb-plugin-columnstore.postinst vendored
View File

@ -3,6 +3,6 @@
set -e
# Install ColumnStore
columnstore-post-install --rpmmode=install
columnstore-post-install install
#DEBHELPER#

2
storage/columnstore/CMakeLists.txt
View File

@ -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

2
storage/columnstore/columnstore

@ -1 +1 @@
Subproject commit cba638b3a52ca79a6bdbe187a6be46abb1806594
Subproject commit bca0d90d5537050951a6c2282411d955569a8c58