Marius Bakke <mbakke@fastmail.com> writes:

> * gnu/packages/storage.scm,
>   gnu/packages/patches/ceph-disable-cpu-optimizations.patch,
>   gnu/packages/patches/ceph-skip-collect-sys-info-test.patch,
>   gnu/packages/patches/ceph-skip-unittest_blockdev.patch: New files.
> * gnu/local.mk (GNU_SYSTEM_MODULES, dist_patch_DATA): Register it.
> ---
>  gnu/local.mk                                       |   4 +
>  .../patches/ceph-disable-cpu-optimizations.patch   |  37 +++
>  .../patches/ceph-skip-collect-sys-info-test.patch  |  29 ++
>  .../patches/ceph-skip-unittest_blockdev.patch      |  28 ++
>  gnu/packages/storage.scm                           | 352 +++++++++++++++++++++
>  5 files changed, 450 insertions(+)
>  create mode 100644 gnu/packages/patches/ceph-disable-cpu-optimizations.patch
>  create mode 100644 gnu/packages/patches/ceph-skip-collect-sys-info-test.patch
>  create mode 100644 gnu/packages/patches/ceph-skip-unittest_blockdev.patch
>  create mode 100644 gnu/packages/storage.scm
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 0bb2276a2..aa262d2f3 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -353,6 +353,7 @@ GNU_SYSTEM_MODULES =				\
>    %D%/packages/ssh.scm				\
>    %D%/packages/stalonetray.scm			\
>    %D%/packages/statistics.scm			\
> +  %D%/packages/storage.scm			\
>    %D%/packages/suckless.scm			\
>    %D%/packages/swig.scm				\
>    %D%/packages/sync.scm			\
> @@ -508,6 +509,9 @@ dist_patch_DATA =						\
>    %D%/packages/patches/calibre-drop-unrar.patch			\
>    %D%/packages/patches/calibre-no-updates-dialog.patch		\
>    %D%/packages/patches/cdparanoia-fpic.patch			\
> +  %D%/packages/patches/ceph-disable-cpu-optimizations.patch	\
> +  %D%/packages/patches/ceph-skip-collect-sys-info-test.patch	\
> +  %D%/packages/patches/ceph-skip-unittest_blockdev.patch	\
>    %D%/packages/patches/chicken-CVE-2017-6949.patch		\
>    %D%/packages/patches/chmlib-inttypes.patch			\
>    %D%/packages/patches/clang-libc-search-path.patch		\
> diff --git a/gnu/packages/patches/ceph-disable-cpu-optimizations.patch b/gnu/packages/patches/ceph-disable-cpu-optimizations.patch
> new file mode 100644
> index 000000000..88a16dde0
> --- /dev/null
> +++ b/gnu/packages/patches/ceph-disable-cpu-optimizations.patch
> @@ -0,0 +1,37 @@
> +Disable CPU optimizations not supported by the vast majority of
> +x86_64 systems. Also don't add anything for i686.

Ah, this patch was incomplete. Here is an updated ceph patch with
#:modules and this patch fixed.