diff options
| author | Roman Nozdrin <roman.nozdrin@mariadb.com> | 2020-07-13 14:50:43 +0000 |
|---|---|---|
| committer | Roman Nozdrin <roman.nozdrin@mariadb.com> | 2020-07-28 09:48:17 +0000 |
| commit | 2c5831b2c5348edf19a4c3c91ebed21c6e8412b9 (patch) | |
| tree | 1342e87b1e60445f8b1a3d0392bc224c8adb5e44 | |
| parent | 6a70398c7ae396283f1342dee1fa4de7eb2e441d (diff) | |
| download | mariadb-git-2c5831b2c5348edf19a4c3c91ebed21c6e8412b9.tar.gz | |
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
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/mariadb-plugin-columnstore.postinst | 2 | ||||
| -rw-r--r-- | storage/columnstore/CMakeLists.txt | 2 | ||||
| m--------- | storage/columnstore/columnstore | 0 |
4 files changed, 2 insertions, 4 deletions
diff --git a/debian/control b/debian/control index a3bc3b91c6e..75a50a9b133 100644 --- a/debian/control +++ b/debian/control @@ -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}), diff --git a/debian/mariadb-plugin-columnstore.postinst b/debian/mariadb-plugin-columnstore.postinst index 07da2b9ee46..97a1bba22c8 100644 --- a/debian/mariadb-plugin-columnstore.postinst +++ b/debian/mariadb-plugin-columnstore.postinst @@ -3,6 +3,6 @@ set -e # Install ColumnStore -columnstore-post-install --rpmmode=install +columnstore-post-install install #DEBHELPER# diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt index 34a4255b2c5..f71cce38bd8 100644 --- a/storage/columnstore/CMakeLists.txt +++ b/storage/columnstore/CMakeLists.txt @@ -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 diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore -Subproject cba638b3a52ca79a6bdbe187a6be46abb180659 +Subproject bca0d90d5537050951a6c2282411d955569a8c5 |