nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: ceph: Update to 12.0.1. 

* gnu/packages/storage.scm (ceph): Update to 12.0.1.
[arguments]: Disable one new test.
* gnu/packages/patches/ceph-disable-cpu-optimizations.patch: Adjust context.
This commit is contained in:
Marius Bakke 2017-03-30 13:44:46 +02:00
parent 2657fb6381
commit c3c25082e8
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/patches/ceph-disable-cpu-optimizations.patch
View File

@ -14,16 +14,16 @@ x86_64 systems. Also don't add anything for i686.
# #
# SIMD_COMPILE_FLAGS # SIMD_COMPILE_FLAGS
# #
@@ -41,7 +37,7 @@ @@ -56,7 +53,7 @@
if(HAVE_ARM_NEON) if(HAVE_ARM_NEON)
set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mfpu=neon") set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mfpu=neon")
endif() endif()
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64") -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
set(HAVE_INTEL 1) set(HAVE_INTEL 1)
CHECK_C_COMPILER_FLAG(-msse HAVE_INTEL_SSE) CHECK_C_COMPILER_FLAG(-msse HAVE_INTEL_SSE)
if(HAVE_INTEL_SSE) if(HAVE_INTEL_SSE)
@@ -55,20 +51,4 @@ @@ -70,20 +67,4 @@
if(HAVE_INTEL_SSE3) if(HAVE_INTEL_SSE3)
set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3") set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3")
endif() endif()

8
gnu/packages/storage.scm
View File

@ -48,14 +48,14 @@
(define-public ceph (define-public ceph
(package (package
(name "ceph") (name "ceph")
(version "12.0.0") (version "12.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.ceph.com/tarballs/ceph-" (uri (string-append "https://download.ceph.com/tarballs/ceph-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0yzvwlwg85w04q4d9ac73vfpxjnl72dl6kc857ihv5k1lqbpp5d0")) "1mgd7iqx9zgwims2bb8dbzhzv0p6z9vjxavbv8dampa34fzac3xc"))
(patches (patches
(search-patches "ceph-skip-unittest_blockdev.patch" (search-patches "ceph-skip-unittest_blockdev.patch"
"ceph-skip-collect-sys-info-test.patch" "ceph-skip-collect-sys-info-test.patch"
@ -204,6 +204,10 @@
;; Also remove from the set_property block. ;; Also remove from the set_property block.
(("run-tox-ceph-disk") "") (("run-tox-ceph-disk") "")
(("run-tox-ceph-detect-init") "")) (("run-tox-ceph-detect-init") ""))
;; TODO: This also seems to fail because of /etc/os-release.
;; How to make src/common/util.cc behave without it.
(substitute* "src/test/crush/CMakeLists.txt"
(("^add_ceph_test\\(crush-classes\\.sh.*$") "\n"))
;; More 'ceph-disk' issues here.. :-( ;; More 'ceph-disk' issues here.. :-(
(substitute* "src/test/erasure-code/CMakeLists.txt" (substitute* "src/test/erasure-code/CMakeLists.txt"
(("^add_ceph_test\\(test-erasure-code-plugins\\.sh.*$") "\n") (("^add_ceph_test\\(test-erasure-code-plugins\\.sh.*$") "\n")