X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-virt%2Frecipes-extended%2Fceph%2Fceph-13.2.2%2F0004-ceph-detect-init-correct-the-installation-for-OE.patch;fp=meta-starlingx%2Fmeta-stx-virt%2Frecipes-extended%2Fceph%2Fceph-13.2.2%2F0004-ceph-detect-init-correct-the-installation-for-OE.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=875501bf22340922bd1cfa12522c966e5b11fadc;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-virt/recipes-extended/ceph/ceph-13.2.2/0004-ceph-detect-init-correct-the-installation-for-OE.patch b/meta-starlingx/meta-stx-virt/recipes-extended/ceph/ceph-13.2.2/0004-ceph-detect-init-correct-the-installation-for-OE.patch
deleted file mode 100644
index 875501b..0000000
--- a/meta-starlingx/meta-stx-virt/recipes-extended/ceph/ceph-13.2.2/0004-ceph-detect-init-correct-the-installation-for-OE.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6aaf04036f0affbeddda123bff111990c4d5fd72 Mon Sep 17 00:00:00 2001
-From: Dengke Du <dengke.du@windriver.com>
-Date: Fri, 26 Oct 2018 14:31:10 +0800
-Subject: [PATCH] ceph-detect-init: correct the installation for OE
-
-Signed-off-by: Dengke Du <dengke.du@windriver.com>
-Upstream-Status: Inappropriate [oe specific]
----
- cmake/modules/Distutils.cmake | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
-index 3091d97..c50fe77 100644
---- a/cmake/modules/Distutils.cmake
-+++ b/cmake/modules/Distutils.cmake
-@@ -16,15 +16,8 @@ function(distutils_install_module name)
-   cmake_parse_arguments(DU "" INSTALL_SCRIPT "" ${ARGN})
-   install(CODE "
-     set(options --prefix=${CMAKE_INSTALL_PREFIX})
--    if(DEFINED ENV{DESTDIR})
--      if(EXISTS /etc/debian_version)
--        list(APPEND options --install-layout=deb)
--      endif()
--      list(APPEND options --root=\$ENV{DESTDIR})
--      if(NOT \"${DU_INSTALL_SCRIPT}\" STREQUAL \"\")
--        list(APPEND options --install-script=${DU_INSTALL_SCRIPT})
--      endif()
--    endif()
-+    list(APPEND options --root=${CMAKE_DESTDIR})
-+    list(APPEND options --install-lib=${PYTHON_SITEPACKAGES_DIR})
-     execute_process(
-     COMMAND ${PYTHON${PYTHON_VERSION}_EXECUTABLE}
-         setup.py install \${options}
--- 
-2.7.4
-