From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 10 Dec 2020 22:03:00 +0000 (+0000)
Subject: Update detect-raspbian.diff
X-Git-Tag: archive/raspbian/14.2.15-3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=456cf2cbe8bdb880aaa8c44b930784e5eab70e6e;p=ceph.git

Update detect-raspbian.diff
---

diff --git a/debian/patches/detect-raspbian.diff b/debian/patches/detect-raspbian.diff
index 26201e5b4..1ecc173d5 100644
--- a/debian/patches/detect-raspbian.diff
+++ b/debian/patches/detect-raspbian.diff
@@ -3,9 +3,11 @@ Description:  Add Raspbian to lists of "debian-like" distros.
  build failure in Raspbian.
 Author: Peter Michael Green <plugwash@raspbian.org>
 
---- ceph-14.2.5.orig/install-deps.sh
-+++ ceph-14.2.5/install-deps.sh
-@@ -268,7 +268,7 @@ else
+diff --git a/install-deps.sh b/install-deps.sh
+index 0fccd5b62..95c02c562 100755
+--- a/install-deps.sh
++++ b/install-deps.sh
+@@ -276,7 +276,7 @@ else
      fi
      source /etc/os-release
      case "$ID" in
@@ -14,8 +16,10 @@ Author: Peter Michael Green <plugwash@raspbian.org>
          echo "Using apt-get to install dependencies"
          $SUDO apt-get install -y devscripts equivs
          $SUDO apt-get install -y dpkg-dev
---- ceph-14.2.5.orig/qa/workunits/ceph-helpers-root.sh
-+++ ceph-14.2.5/qa/workunits/ceph-helpers-root.sh
+diff --git a/qa/workunits/ceph-helpers-root.sh b/qa/workunits/ceph-helpers-root.sh
+index dc81b2b3a..f0d061941 100755
+--- a/qa/workunits/ceph-helpers-root.sh
++++ b/qa/workunits/ceph-helpers-root.sh
 @@ -35,7 +35,7 @@ function install() {
  
  function install_one() {
@@ -25,10 +29,16 @@ Author: Peter Michael Green <plugwash@raspbian.org>
              sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y "$@"
              ;;
          centos|fedora|rhel)
---- ceph-14.2.5.orig/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
-+++ ceph-14.2.5/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
-@@ -21,3 +21,3 @@ CURRENT_PATH=`pwd`
+diff --git a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
+index 7099dafb3..64b9540f4 100755
+--- a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
++++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
+@@ -19,7 +19,7 @@ CURRENT_PATH=`pwd`
+ # install prerequisites
+ # for rocksdb
  case $(distro_id) in
 -	ubuntu|debian|devuan)
 +	ubuntu|debian|devuan|raspbian)
- 		install git g++ libsnappy-dev zlib1g-dev libbz2-dev libradospp-dev
+ 		install git g++ libsnappy-dev zlib1g-dev libbz2-dev libradospp-dev cmake
+ 		;;
+ 	centos|fedora|rhel)