From: Peter Michael Green <plugwash@raspbian.org>
Date: Sun, 12 Jan 2020 01:43:36 +0000 (+0000)
Subject: Fix raspbian patch to match upstream tree.
X-Git-Tag: archive/raspbian/14.2.5-3+rpi1~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5d0ebe93336e6a2a1a83e200ccb1ee7701ce8810;p=ceph.git

Fix raspbian patch to match upstream tree.
---

diff --git a/debian/patches/detect-raspbian.diff b/debian/patches/detect-raspbian.diff
index 346541f02..26201e5b4 100644
--- a/debian/patches/detect-raspbian.diff
+++ b/debian/patches/detect-raspbian.diff
@@ -3,45 +3,32 @@ Description:  Add Raspbian to lists of "debian-like" distros.
  build failure in Raspbian.
 Author: Peter Michael Green <plugwash@raspbian.org>
 
---- ceph-12.2.10+dfsg1.orig/install-deps.sh
-+++ ceph-12.2.10+dfsg1/install-deps.sh
-@@ -114,7 +114,7 @@ if [ x`uname`x = xFreeBSDx ]; then
- else
+--- ceph-14.2.5.orig/install-deps.sh
++++ ceph-14.2.5/install-deps.sh
+@@ -268,7 +268,7 @@ else
+     fi
      source /etc/os-release
-     case $ID in
+     case "$ID" in
 -    debian|ubuntu|devuan)
 +    debian|ubuntu|devuan|raspbian)
          echo "Using apt-get to install dependencies"
-         $SUDO apt-get install -y lsb-release devscripts equivs
-         $SUDO apt-get install -y dpkg-dev gcc
---- ceph-12.2.10+dfsg1.orig/qa/workunits/ceph-helpers-root.sh
-+++ ceph-12.2.10+dfsg1/qa/workunits/ceph-helpers-root.sh
-@@ -26,7 +26,7 @@ function install() {
+         $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
+@@ -35,7 +35,7 @@ function install() {
  
  function install_one() {
-     case $(lsb_release -si) in
--        Ubuntu|Debian|Devuan)
-+        Ubuntu|Debian|Devuan|Raspbian)
-             sudo apt-get install -y "$@"
+     case $(distro_id) in
+-        ubuntu|debian|devuan)
++        ubuntu|debian|devuan|raspbian)
+             sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y "$@"
              ;;
-         CentOS|Fedora|RedHatEnterpriseServer)
---- ceph-12.2.10+dfsg1.orig/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
-+++ ceph-12.2.10+dfsg1/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
-@@ -11,7 +11,7 @@ function install() {
- 
- function install_one() {
-     case $(lsb_release -si) in
--        Ubuntu|Debian|Devuan)
-+        Ubuntu|Debian|Devuan|Raspbian)
-             sudo apt-get install -y --force-yes "$@"
-             ;;
-         CentOS|Fedora|RedHatEnterpriseServer)
-@@ -39,7 +39,7 @@ CURRENT_PATH=`pwd`
- # install prerequisites
- # for rocksdb
- case $(lsb_release -si) in
--	Ubuntu|Debian|Devuan)
-+	Ubuntu|Debian|Devuan|Raspbian)
- 		install g++-4.7 libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev librados-dev
- 		;;
- 	CentOS|Fedora|RedHatEnterpriseServer)
+         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`
+ case $(distro_id) in
+-	ubuntu|debian|devuan)
++	ubuntu|debian|devuan|raspbian)
+ 		install git g++ libsnappy-dev zlib1g-dev libbz2-dev libradospp-dev