database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

remove boost from deps, add procsps, due without ps installation halts (#3063)

Browse Source
This commit is contained in:
Leonid Fedorov
2023-12-26 14:46:05 +03:00
committed by GitHub
parent e5385fdde7
commit 4fa937c086
4 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.drone.jsonnet
View File

@ -837,8 +837,8 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
commands: [ commands: [
"echo -e '\\e]8;;" + publish_pkg_url + '\\e\\\\' + publish_pkg_url + "\\e]8;;\\e\\\\'", "echo -e '\\e]8;;" + publish_pkg_url + '\\e\\\\' + publish_pkg_url + "\\e]8;;\\e\\\\'",
"echo 'for installation run:'", "echo 'for installation run:'",
"export OS="+result, "echo 'export OS="+result+"'",
"export PACKAGES_URL="+packages_url, "echo 'export PACKAGES_URL="+packages_url+"'",
], ],
}, },
] + ] +

9
cmake/cpackEngineDEB.cmake
View File

@ -55,13 +55,8 @@ if (EXISTS "/etc/debian_version")
string(REGEX MATCH "([0-9]+).[0-9]+" DEBIAN "${DEBIAN_VERSION}") string(REGEX MATCH "([0-9]+).[0-9]+" DEBIAN "${DEBIAN_VERSION}")
set(DEBIAN_VERSION_NUMBER "${CMAKE_MATCH_1}") set(DEBIAN_VERSION_NUMBER "${CMAKE_MATCH_1}")
endif () endif ()
if ("${DEBIAN_VERSION_NUMBER}" EQUAL "8")
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, rsync, net-tools, libboost-all-dev, libsnappy1, MariaDB-server, python3") SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, rsync, libsnappy1v5, net-tools, MariaDB-server, python3, procps")
elseif ("${DEBIAN_VERSION_NUMBER}" EQUAL "9")
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, rsync, net-tools, libboost-all-dev, libsnappy1v5, MariaDB-server, python3")
else()
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, libboost-all-dev, rsync, libsnappy1v5, net-tools, MariaDB-server, python3")
endif ()
set(CPACK_DEBIAN_COLUMNSTORE-ENGINE_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/build/debian/storageEngine/postinst;${CMAKE_CURRENT_SOURCE_DIR}/build/debian/storageEngine/prerm;") set(CPACK_DEBIAN_COLUMNSTORE-ENGINE_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/build/debian/storageEngine/postinst;${CMAKE_CURRENT_SOURCE_DIR}/build/debian/storageEngine/prerm;")

14
cmake/cpackEngineRPM.cmake
View File

@ -46,7 +46,7 @@ It is GPL v2 licensed, which means you can use the it free of charge under the
conditions of the GNU General Public License Version 2 (http://www.gnu.org/licenses/). conditions of the GNU General Public License Version 2 (http://www.gnu.org/licenses/).
MariaDB documentation can be found at https://mariadb.com/kb MariaDB documentation can be found at https://mariadb.com/kb
MariaDB bug reports should be submitted through https://jira.mariadb.org MariaDB bug reports should be submitted through https://jira.mariadb.org
") ")
@ -71,20 +71,14 @@ IF (EXISTS "/etc/redhat-release")
string(REGEX MATCH "release ([0-9]+)" CENTOS "${REDHAT_VERSION}") string(REGEX MATCH "release ([0-9]+)" CENTOS "${REDHAT_VERSION}")
set(REDHAT_VERSION_NUMBER "${CMAKE_MATCH_1}") set(REDHAT_VERSION_NUMBER "${CMAKE_MATCH_1}")
ENDIF () ENDIF ()
IF (EXISTS "/etc/SuSE-release") IF (EXISTS "/etc/SuSE-release")
file (READ "/etc/SuSE-release" SUSE_VERSION) file (READ "/etc/SuSE-release" SUSE_VERSION)
string(REGEX MATCH "VERSION = ([0-9]+)" SUSE "${SUSE_VERSION}") string(REGEX MATCH "VERSION = ([0-9]+)" SUSE "${SUSE_VERSION}")
set(SUSE_VERSION_NUMBER "${CMAKE_MATCH_1}") set(SUSE_VERSION_NUMBER "${CMAKE_MATCH_1}")
ENDIF () ENDIF ()
if (${REDHAT_VERSION_NUMBER} EQUAL 6)
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "MariaDB-columnstore-shared" "snappy" "net-tools" "MariaDB-server" "python3") SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "snappy" "net-tools" "MariaDB-server" "python3" "jemalloc" "procps-ng")
# Disable auto require as this will also try to pull Boost via RPM
SET(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
elseif (${SUSE_VERSION_NUMBER} EQUAL 12)
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "boost-devel >= 1.54.0" "libsnappy1" "net-tools" "MariaDB-server" "python3" "jemalloc")
else ()
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "boost >= 1.53.0" "snappy" "net-tools" "MariaDB-server" "python3" "jemalloc")
endif()
SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preInstall_storage_engine.sh) SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preInstall_storage_engine.sh)
SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_storage_engine.sh) SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_storage_engine.sh)

1
debian/control vendored
View File

@ -8,6 +8,7 @@ Depends: binutils,
libmariadb3 (= ${server:Version}), libmariadb3 (= ${server:Version}),
net-tools, net-tools,
python3, python3,
procps,
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Breaks: mariadb-columnstore-libs, Breaks: mariadb-columnstore-libs,