diff options
| author | Daniel Black <daniel@mariadb.org> | 2021-12-30 16:45:37 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-12-30 19:48:26 +1100 |
| commit | 5d57e04b27d0e69081b63b9e382cc3d9dc4480c0 (patch) | |
| tree | 8c0cfb3faad264479106452a1529a280de0335da | |
| parent | 546520042f91e1b8ddc0af04a24629b3ceffbc87 (diff) | |
| download | mariadb-git-5d57e04b27d0e69081b63b9e382cc3d9dc4480c0.tar.gz | |
MDEV-27386: cpack rpm libsepol installed detects verison incorrectlybb-10.2-danielblack-MDEV-27386-libsepol-detection
... when two packages are installed.
(fc35 with i686 and x86_64 packages of libsepol installed).
$ rpm -q --qf "%{VERSION}" libsepol
3.33.3
Restricting the version to the current achitecture generates
a much more obtainable version dependency.
$ rpm -q --qf "%{VERSION}" libsepol.x86_64
3.3
This make dependency resolution easier preventing:
$ sudo dnf localinstall MariaDB-server-10.8.0-1.fc35.x86_64.rpm ...
Last metadata expiration check: 2:06:49 ago on Thu 30 Dec 2021 14:02:32.
Error:
Problem 1: conflicting requests
- nothing provides libsepol >= 3.33.3 needed by MariaDB-server-10.8.0-1.fc35.x86_64
The CMAKE_SYSTEM_PROCESSOR is used in the generation of architecture
filenames so its preduent to just use the same version.
| -rw-r--r-- | support-files/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 810e0127202..028201cb1b1 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -88,7 +88,7 @@ IF(UNIX) INSTALL(FILES ${out} DESTINATION ${inst_location}/policy/selinux COMPONENT SupportFiles) ENDFOREACH() IF(RPM) - EXECUTE_PROCESS(COMMAND rpm -q --qf "%{VERSION}" libsepol + EXECUTE_PROCESS(COMMAND rpm -q --qf "%{VERSION}" libsepol."${CMAKE_SYSTEM_PROCESSOR}" OUTPUT_VARIABLE LIBSEPOL_VERSION RESULT_VARIABLE err) IF (NOT err) SET(CPACK_RPM_server_PACKAGE_REQUIRES |