diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-10 22:47:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-12 12:46:34 +0100 |
| commit | 355ee6877beccf27bcd07d845c985fc1a2845aca (patch) | |
| tree | 121d859feb21130dbe22ac8e4ec976d6999baff4 /cmake | |
| parent | 2232784f0094ae7e81f5033fe8f3499e15224fed (diff) | |
| download | mariadb-git-355ee6877beccf27bcd07d845c985fc1a2845aca.tar.gz | |
MDEV-13946 Server RPMs have dependency on "which"
cleanup. use "command -v" instead of "which"
simplify some checks.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/cpack_rpm.cmake | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 513f3671b5d..e27206fc3b4 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -168,11 +168,6 @@ IF(WITH_WSREP) SETA(CPACK_RPM_server_PACKAGE_REQUIRES "galera" "rsync" "lsof" "grep" "gawk" "iproute" "coreutils" "findutils" "tar") - IF (RPM MATCHES "sles11") - SETA(CPACK_RPM_server_PACKAGE_REQUIRES "util-linux") - ELSE() - SETA(CPACK_RPM_server_PACKAGE_REQUIRES "which") - ENDIF() ENDIF() SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-prein.sh) @@ -292,4 +287,3 @@ IF(compat53 AND compat101) ENDIF() ENDIF(RPM) - |