Skip to content

GitLab

C
ceph
Commit b117870c authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Fixed librbd_internal.a duplicate symbols

parent f1eb70af
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 0 deletions
Makefile
View file @ b117870c
......@@ -35,6 +35,7 @@ all: ceph-config
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_tests.patch
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_ceph-volume_systemd_unit.patch
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-no_git.patch
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_librbd_duplicate.patch
if [ `uname -m` = 'armv7l' ] ; then \
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-arm32_fix.patch ; \
fi
......
ceph-15.2.4-fix_librbd_duplicate.patch 0 → 100644
View file @ b117870c
diff -uNr ceph-15.2.4/src/librbd/image/OpenRequest.cc ceph-15.2.4-fix_librbd_duplicate/src/librbd/image/OpenRequest.cc
--- ceph-15.2.4/src/librbd/image/OpenRequest.cc 2020-06-30 15:40:51.000000000 +0000
+++ ceph-15.2.4-fix_librbd_duplicate/src/librbd/image/OpenRequest.cc 2020-09-30 07:58:38.979496776 +0000
@@ -9,7 +9,7 @@
#include "librbd/Utils.h"
#include "librbd/cache/ObjectCacherObjectDispatch.h"
#include "librbd/cache/WriteAroundObjectDispatch.h"
-#include "librbd/cache/ParentCacheObjectDispatch.cc"
+#include "librbd/cache/ParentCacheObjectDispatch.h"
#include "librbd/image/CloseRequest.h"
#include "librbd/image/RefreshRequest.h"
#include "librbd/image/SetSnapRequest.h"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment